Commit graph

2845 commits

Author SHA1 Message Date
Dustin Johnson
347845bc52 Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
Former-commit-id: 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 87605571b2 [formerly 2687ebafd6 [formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]]]
Former-commit-id: 87605571b2
Former-commit-id: 26517c1a95 [formerly 0d77acbff2] [formerly 1373c0b90f4a7aaa2a16437bb66461f4bae2c498 [formerly 1214f5e3ea]]
Former-commit-id: ada7c8e7993ab7276cb65bc026f9c40651ed9c08 [formerly 46ec793d11]
Former-commit-id: 7d59d10204
2013-05-31 12:43:49 -05:00
Dustin Johnson
ecde125343 Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
Former-commit-id: 7e68af0531 [formerly 0bfcf4e9df] [formerly 3d8de9e9f3] [formerly 7e68af0531 [formerly 0bfcf4e9df] [formerly 3d8de9e9f3] [formerly 1d06883d7a [formerly 3d8de9e9f3 [formerly 493d8a02f516023a5c0c3620da75e5466c44ede2]]]]
Former-commit-id: 1d06883d7a
Former-commit-id: 5931027de7 [formerly d61d518bdc] [formerly 52ab987a84e9614c5e4516479c934f07c0f6a2b0 [formerly 72d95aac0d]]
Former-commit-id: 5c99ceaa394302743d45f5d6a685c955a489a6d0 [formerly 1027b218f2]
Former-commit-id: d2295a24fe
2013-05-31 12:32:23 -05:00
Dustin Johnson
8ae74786c1 Issue #2038 Change datadelivery retrieval to be plugin contributable
Amend: Fix class name resolution, no arguments to metadata adapter constructors

Change-Id: I2c08563499a34996502d22f0f9685602b8897139

Former-commit-id: 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 55aeff3422 [formerly 4a8adeb80a [formerly fc6effe4993694944d5331038d24310dec44a5d8]]]]
Former-commit-id: 55aeff3422
Former-commit-id: d1552d578f [formerly 7ec3c6c09a] [formerly fc670c4505d46445bdd5ffc292571b65c25bcbdf [formerly 075c53763d]]
Former-commit-id: 8852d0761a2b6648b34348793d38aa751867d797 [formerly f9ba7dc5ab]
Former-commit-id: d62a0b863a
2013-05-31 12:19:07 -05:00
Richard Peter
b13c28ea9e Merge "Issue #2054 Minor changes to 2 grib patterns in the pqact template." into development
Former-commit-id: dffd58a7ce [formerly a9e1fa602e] [formerly 8e06328905] [formerly dffd58a7ce [formerly a9e1fa602e] [formerly 8e06328905] [formerly 6ec966e39e [formerly 8e06328905 [formerly 9b0bed97ebab78c585efe2ffec3e25d896817e6e]]]]
Former-commit-id: 6ec966e39e
Former-commit-id: ef5e42fd6d [formerly 08fea26653] [formerly fd1fb4b26da9a8acbc61d829b897fd491990760d [formerly dd5b0c4caf]]
Former-commit-id: a08984f9423a8bbfa37dfb5b9cd3dee08ebf2c78 [formerly 7cfa594b44]
Former-commit-id: 48f501d72a
2013-05-31 10:36:27 -05:00
Dustin Johnson
27f47006a3 Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly 05bd3e113d [formerly fc807288a7 [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]]
Former-commit-id: 05bd3e113d
Former-commit-id: 8df55423f5 [formerly 3f4b010b84] [formerly e9924f52a848d24038a0a3fb3705c0ff67f9a02e [formerly 42d1d74b04]]
Former-commit-id: d226711a5e279ef4eee9fd981a46da15d8fdd405 [formerly 62131327ed]
Former-commit-id: b122700fed
2013-05-31 09:29:44 -05:00
Richard Peter
fe51c7a559 Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
Former-commit-id: a25207c4f5 [formerly 6a19a0074f] [formerly 6487cd6578] [formerly a25207c4f5 [formerly 6a19a0074f] [formerly 6487cd6578] [formerly 0e4782aea5 [formerly 6487cd6578 [formerly a8f4dced2e1a5ed2851291627d2349b818da239d]]]]
Former-commit-id: 0e4782aea5
Former-commit-id: dcee8de5bf [formerly 9675eb9b1e] [formerly 94f8dd7cc2d9448c67b8b2be7d600c1f56ec5379 [formerly c81610b720]]
Former-commit-id: 7fd0de4ebc2d6c64e6e122c31801bc918f26a647 [formerly 6d07981ce3]
Former-commit-id: 7ccdaf58ad
2013-05-30 17:17:23 -05:00
Dustin Johnson
2e8d964866 Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: f3835a5670 [formerly 54045d6b9b] [formerly c01ea33d5b] [formerly f3835a5670 [formerly 54045d6b9b] [formerly c01ea33d5b] [formerly e4ecae9e7e [formerly c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]]]
Former-commit-id: e4ecae9e7e
Former-commit-id: 5d995a726f [formerly 353630fcca] [formerly f7a467f666496a4ca4ff1bd58f5061cc1b7eb62c [formerly 58b11e075c]]
Former-commit-id: 0a802f6e1b921fb3e8dd770fb896e6f40227ef97 [formerly 89d71040c6]
Former-commit-id: f8d7eaa98b
2013-05-30 17:11:19 -05:00
Dave Hladky
29bc32e4f8 Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 7393abfc91 [formerly c292bf1b55] [formerly 1608d407d1] [formerly 7393abfc91 [formerly c292bf1b55] [formerly 1608d407d1] [formerly 83dae4fe01 [formerly 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]]]
Former-commit-id: 83dae4fe01
Former-commit-id: e28331d3bb [formerly 64596d3468] [formerly 724bfb742a41ede685551f3df79514daaee58c8b [formerly 90e6d184e7]]
Former-commit-id: 840b99ef71d98ebb1214419884d5f21e71aa53dd [formerly 8c0c235087]
Former-commit-id: 1b07bcea0c
2013-05-30 17:04:16 -05:00
Roger Ferrel
aa8e3ff5c4 Issue #1966 Changes to make manger stateless and updates for Case Creation.
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387

Former-commit-id: cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly 3c875a6f44 [formerly c6cddc605d [formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]]]
Former-commit-id: 3c875a6f44
Former-commit-id: 9ef53f18b9 [formerly 36b8cbcd5d] [formerly bf07997d68cd2a97eb874705475caf9100eded09 [formerly eaca117b9c]]
Former-commit-id: 050e3efc0fa52bd630915bd8ae54d58f55ec3c52 [formerly 3dc84dbe80]
Former-commit-id: f6c557904d
2013-05-30 16:35:11 -05:00
Nate Jensen
f572e69f0e Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
Former-commit-id: 03833d148d [formerly 10dd7ea61f] [formerly 4aa3657d1a] [formerly 03833d148d [formerly 10dd7ea61f] [formerly 4aa3657d1a] [formerly e4578ca7ba [formerly 4aa3657d1a [formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]]]
Former-commit-id: e4578ca7ba
Former-commit-id: 09215e6dbb [formerly 698d793e9c] [formerly 86618d2ea904ba85327447d5180c4eef0264924d [formerly c0bca7ec27]]
Former-commit-id: fd247f05a5ed4a76a913decd848faabf0606a30a [formerly cdd438d3e2]
Former-commit-id: f6d958a18b
2013-05-30 14:50:39 -05:00
Roger Ferrel
8dcbb421f2 Issue #2054 Minor changes to 2 grib patterns in the pqact template.
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf

Former-commit-id: 3bd85138cf [formerly 3c4b351c75] [formerly 85b9d9dea9] [formerly 3bd85138cf [formerly 3c4b351c75] [formerly 85b9d9dea9] [formerly 2f2c553089 [formerly 85b9d9dea9 [formerly 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4]]]]
Former-commit-id: 2f2c553089
Former-commit-id: 7353c052ed [formerly 13543ac79e] [formerly d3eddf23547cafc9eba0b328fea23856199aef10 [formerly 593055e6c2]]
Former-commit-id: 88704fa3ce68cd5636cafb9ed871898d548e3451 [formerly f2b4dd8aa1]
Former-commit-id: 65c96bcaf4
2013-05-30 14:34:54 -05:00
Steve Harris
617bfcfc26 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]]
Former-commit-id: 26bf27c70d
Former-commit-id: e83fa33a36 [formerly 629e76e0ff] [formerly 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c]]
Former-commit-id: 3f4447bcb9d22cc2cdec3a061500d9497c6a3d38 [formerly 9704fd6a82]
Former-commit-id: 4d8d9354e7
2013-05-30 14:33:24 -05:00
Ron Anderson
90b02d376c Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
Former-commit-id: 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]]]
Former-commit-id: 7f41d701be
Former-commit-id: d3a25be20d [formerly 5858e8fc19] [formerly 29d381fcafb440df8bee454e31c8b3d99cccd467 [formerly d2f617a49c]]
Former-commit-id: 49ac9580799a6f8e8e6f9ed09976978c1289bb2c [formerly 9e3809d6cd]
Former-commit-id: 9579b62577
2013-05-30 13:08:26 -05:00
Everett Kladstrup
fb8b21d92d Issue #2052 Fix FeatureExplorer feature comparison
* fixes complaint when feature A includes features B and C
  which both include feature D.
  Used to get error that plugin X is in feature D and feature D
* Updated FeatureExplorer jar in build.edex to reflect change

Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7

Former-commit-id: 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]]
Former-commit-id: 4621271329
Former-commit-id: f78c5c3640 [formerly 282ec3b45f] [formerly 0783e1b2908b365b45911f9fff3604f64d2ddbc5 [formerly 9ad045d141]]
Former-commit-id: 489e03a0b245e5971ba19c2513ffe3674df9905d [formerly 83adbb8545]
Former-commit-id: 033b8bae36
2013-05-30 13:02:49 -05:00
Dustin Johnson
fe81c4ee08 Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
Former-commit-id: b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly 9c9caf00d1 [formerly 7e6bdb7b70 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]]]
Former-commit-id: 9c9caf00d1
Former-commit-id: bf277cb980 [formerly 48c37c972a] [formerly 14f966873ac8e545bcc3b5a381d244edc0c40df1 [formerly 0bdf7d614c]]
Former-commit-id: fca2cc5ff4cf78409f8465237e7f299f93b4a6db [formerly a82e3aa078]
Former-commit-id: b59dbc5553
2013-05-30 11:32:09 -05:00
Dustin Johnson
ca4a64dee5 Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: ac8c2784ae [formerly 74d985af51] [formerly 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450]]
Former-commit-id: d6fa7618e1d515d026b04f58e34f197cb54bf5be [formerly 3dbb682493]
Former-commit-id: 03cbf9a455
2013-05-30 09:49:09 -05:00
Brad Gonzales
0870b96276 Issue #1965 Commit for purge and archive with tests.
A lot of this ended up being duplication of Roger's code. Roger's changes should go first,
and then this commit will be merged and refactored with his code in an amend.

Amend: better test coverage, fixes to old other pattern
       integrated with Roger's changes.
       added header comments, deleted FileArchiveElement.
       removed search and filter code.

Change-Id: I4e48842a75b9da27062349fee01099e1ea13f59e

Former-commit-id: 778cf6542c [formerly 6243f1f789] [formerly aa76f81b3c] [formerly 778cf6542c [formerly 6243f1f789] [formerly aa76f81b3c] [formerly 321f153547 [formerly aa76f81b3c [formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]]]
Former-commit-id: 321f153547
Former-commit-id: c8811ff347 [formerly cb69ca7e93] [formerly 34d580ade00224baada454c96f672dc4ee914ab2 [formerly bbc15413d4]]
Former-commit-id: 0776fffd932d7c3db19f10d0311c62bc31aa040e [formerly 34707fe272]
Former-commit-id: 5a66a33017
2013-05-30 09:34:18 -05:00
Bryan Kowal
6121ed1ea5 Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14

Former-commit-id: 3c98d835bf [formerly 52a1addb29] [formerly 7b24cd293a] [formerly 3c98d835bf [formerly 52a1addb29] [formerly 7b24cd293a] [formerly bd9251eba0 [formerly 7b24cd293a [formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]]]
Former-commit-id: bd9251eba0
Former-commit-id: cad451315d [formerly 5ee9c9f6a1] [formerly 12f6e2d4de44a38803b3d5a550206ae1507ca67f [formerly 4eb7d951e4]]
Former-commit-id: 2e12ac548fa59c066072d6a9c53eaa4c78cab888 [formerly 28bbbfefef]
Former-commit-id: d6ce03a31d
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
bebd2c0459 Issue #1869 ensure all uses ofdataURI in PDO use getter.
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f

Former-commit-id: 05e7e0551f [formerly b3865f4efc] [formerly 268ee5ce30] [formerly 05e7e0551f [formerly b3865f4efc] [formerly 268ee5ce30] [formerly 191f93653d [formerly 268ee5ce30 [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]]]
Former-commit-id: 191f93653d
Former-commit-id: c6150879d5 [formerly 9c415e2f19] [formerly e05811b6ef35d30d860c10a4de489276bfcbbd43 [formerly 50c5c5edfa]]
Former-commit-id: 0fd3a99bb649f24420d64a4e6e8887e7a5aff825 [formerly bc19b816c4]
Former-commit-id: f73b0b551e
2013-05-29 17:50:50 -05:00
Richard Peter
6588e18b91 Merge "Issue #1989 remove unused schemas" into development
Former-commit-id: a88b17b125 [formerly 47b95286ad] [formerly d563ae4eb8] [formerly a88b17b125 [formerly 47b95286ad] [formerly d563ae4eb8] [formerly 800c7dd9a6 [formerly d563ae4eb8 [formerly d024f084f303bf6020ef7208cad249ac83f4d748]]]]
Former-commit-id: 800c7dd9a6
Former-commit-id: 29a1c468f3 [formerly 4788532b86] [formerly 39176b198c944580b580ade837ef1dd8fbe25836 [formerly c8c5be650c]]
Former-commit-id: 81196ecd9bd1708bc73bfa7b5b8b51edb0f4b096 [formerly d546fcf734]
Former-commit-id: 7d8ebdbfde
2013-05-29 16:54:51 -05:00
Nate Jensen
0ede6b8bc5 Merge "Issue #1869 fix plot updates, broken by earlier commit." into development
Former-commit-id: 07009bf650 [formerly df5945a8e2] [formerly 4f3ea80cd9] [formerly 07009bf650 [formerly df5945a8e2] [formerly 4f3ea80cd9] [formerly 532d3ee899 [formerly 4f3ea80cd9 [formerly 534a1d6d9cb2366d875f5361c2a30fce54b7f786]]]]
Former-commit-id: 532d3ee899
Former-commit-id: 70eca967a3 [formerly 545fe43c1e] [formerly c5cdb4c1995968d035037728d9402432a84f1606 [formerly f95037a9bf]]
Former-commit-id: 23ad6fee0427a3a51c00345ed973e058245ccc55 [formerly d354b67dd3]
Former-commit-id: 15894e477c
2013-05-29 16:20:17 -05:00
Nate Jensen
cf843cfa42 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]]
Former-commit-id: fc691cbb2f
Former-commit-id: fde771fa01 [formerly ab10e0072d] [formerly 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]]
Former-commit-id: 73458acdcd0744f3e4a6cc7ea7fac5b0d28ee6a0 [formerly 3588ed1899]
Former-commit-id: 528ab65a66
2013-05-29 16:19:28 -05:00
Dustin Johnson
d005d517a8 Merge "Issue #2038 Fix deleting of multiple subscription types Update test Spring configurations" into development
Former-commit-id: de43cbb63d [formerly 8ae3e74339] [formerly b0348bc056] [formerly de43cbb63d [formerly 8ae3e74339] [formerly b0348bc056] [formerly 2554ff9602 [formerly b0348bc056 [formerly 5716e1dbbbbe67cdde980eab6b60a70e22283ee9]]]]
Former-commit-id: 2554ff9602
Former-commit-id: dc87184caf [formerly 4741aca6b1] [formerly f5be6d72f3c14e4ac4a2a46ab2fcccc186c6ab49 [formerly 05d5a08497]]
Former-commit-id: 87b296192355c6f2be6bb2e9e716b4af9922e929 [formerly f2686f4475]
Former-commit-id: 5ad7ca03a7
2013-05-29 16:02:55 -05:00
Dustin Johnson
79e77cdf45 Issue #2038 Fix deleting of multiple subscription types
Update test Spring configurations

Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e

Former-commit-id: 63ccc2c133 [formerly 21b8f03b1f] [formerly d2d50e7d8b] [formerly 63ccc2c133 [formerly 21b8f03b1f] [formerly d2d50e7d8b] [formerly ecf3f2e300 [formerly d2d50e7d8b [formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]]]
Former-commit-id: ecf3f2e300
Former-commit-id: efd95f253e [formerly d467832855] [formerly 1540347e93b929ac41c7a779cb0a5461b2ed43ed [formerly 151df64a6e]]
Former-commit-id: 28364827cdbe6dc84528a852dec840509418fd01 [formerly 94c4247617]
Former-commit-id: 1047ef53b3
2013-05-29 15:54:06 -05:00
Nate Jensen
f038e1ac31 Issue #1989 fix for webpages
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7

Former-commit-id: fb9ca3cbc5 [formerly c0e93d192c] [formerly 1a34067182] [formerly fb9ca3cbc5 [formerly c0e93d192c] [formerly 1a34067182] [formerly 0d495f9759 [formerly 1a34067182 [formerly 7880f21755384540d3bca4ac15b04932455b8fd8]]]]
Former-commit-id: 0d495f9759
Former-commit-id: c641738561 [formerly 839e9fc76d] [formerly 0657d80aa35f0603c65e07b37e2a945da508ec20 [formerly 8da746cde6]]
Former-commit-id: fa506b70632951333c8f122a255a275d250a8370 [formerly a2417f0d9b]
Former-commit-id: 2d5e05ceea
2013-05-29 15:21:10 -05:00
Ben Steffensmeier
554e1183f8 Issue #1869 fix plot updates, broken by earlier commit.
Former-commit-id: a3b2efc2b4 [formerly b32a5b1c00] [formerly d2e01ee1f2] [formerly a3b2efc2b4 [formerly b32a5b1c00] [formerly d2e01ee1f2] [formerly cbc3b0a9a4 [formerly d2e01ee1f2 [formerly a9240b60e4643b43880d2be76580dc85999eb897]]]]
Former-commit-id: cbc3b0a9a4
Former-commit-id: 4555ef990c [formerly 6b7958c834] [formerly 060cda1b75778126734603e80699b9f5cae37ac8 [formerly d90ca1696e]]
Former-commit-id: fe301abd5674c07e7a298d2109bed20421ccea2a [formerly 47dba49e8d]
Former-commit-id: 75b800be90
2013-05-29 15:00:04 -05:00
Nate Jensen
88f9c45cf0 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4 [formerly b025262dc1] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb]
Former-commit-id: e4bbe70d57
2013-05-29 14:49:43 -05:00
Nate Jensen
8e02ecb717 Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]]
Former-commit-id: 148b20f57c
Former-commit-id: 043cc9f661 [formerly 47d2bf99b9] [formerly 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3]]
Former-commit-id: 3a1b89b6c0c6710bbfe86ce98af9d45d855ff058 [formerly 1fe16c9553]
Former-commit-id: 121dd032bf
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
719500006d Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: ec9881b914 [formerly e16dc02a54] [formerly 4747f7d319] [formerly ec9881b914 [formerly e16dc02a54] [formerly 4747f7d319] [formerly d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]]
Former-commit-id: d5263b2b75
Former-commit-id: a05a910ef9 [formerly c6af8b4d7c] [formerly c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794]]
Former-commit-id: 3ac8fa77e8866587dc197078d335aef507c7d6d8 [formerly c441b20ddb]
Former-commit-id: a75821e0a6
2013-05-29 10:34:22 -05:00
Dustin Johnson
73f483ef24 Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]]
Former-commit-id: ac292f1242
Former-commit-id: 6567c1b6ef [formerly b6c87f42b1] [formerly af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56]]
Former-commit-id: 85655b09cdfa7dd8699c15134ee1a6d4eba5b722 [formerly bae8a2436d]
Former-commit-id: 233d827c9c
2013-05-29 09:27:30 -05:00
Richard Peter
bd1fa68c70 Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
Former-commit-id: 16c3723df8 [formerly 6dd22b6dfa] [formerly bc0f1c88fc] [formerly 16c3723df8 [formerly 6dd22b6dfa] [formerly bc0f1c88fc] [formerly 19272c9f28 [formerly bc0f1c88fc [formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]]]
Former-commit-id: 19272c9f28
Former-commit-id: 6d11397746 [formerly d26eac7bdf] [formerly f547c20d9919ea9e58a5d840b157b5c4ea811426 [formerly 4be6514b57]]
Former-commit-id: e604a80cdf0185bf15c4ef6b7329f0b34fd6b9fb [formerly 3550d07a9c]
Former-commit-id: 6ceeb324e1
2013-05-29 09:26:10 -05:00
Nate Jensen
8777604fdd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: 768a7dad60 [formerly 452858b86f] [formerly db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]]
Former-commit-id: 4de98fe7068aa6e779321f9fb2a37687751247da [formerly 74081dd140]
Former-commit-id: f9d85ac8a9
2013-05-29 09:20:53 -05:00
Mike Duff
b1c0253e8e Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 5919687484 [formerly afbe294f4a [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]]
Former-commit-id: 5919687484
Former-commit-id: d292cfcca0 [formerly d9fd9d297b] [formerly 22647bf8f0aa609c257a8ef84d9b763053337b5e [formerly 66f4e6fe87]]
Former-commit-id: 1b3ef4bdb7d3f5414dce0f0a4ed51881857a7fc6 [formerly 5e3fa8852b]
Former-commit-id: 4d43e81158
2013-05-29 09:15:46 -05:00
Dustin Johnson
30ef11dc35 Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: fb15a3e115 [formerly fff0172786] [formerly c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef]]
Former-commit-id: 5348c297fe02bf4aac1eac5eff84f944b168cb83 [formerly 1fab733472]
Former-commit-id: 4ac1c2cbdb
2013-05-29 09:02:47 -05:00
Nate Jensen
05bb7decb3 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: d7391928f9 [formerly ba5e69c7ff] [formerly 7c1e6e8b09] [formerly d7391928f9 [formerly ba5e69c7ff] [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 7c1e6e8b09 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]]
Former-commit-id: 256a67a9f9
Former-commit-id: 8c756705c5 [formerly ac838f62dd] [formerly 729de173162ed2d04e927cd7b463d674c8aac59e [formerly 2fe1960ebb]]
Former-commit-id: 27996a676d65d2e64694d96a7b8e1865cf87f9f7 [formerly 99a1938d36]
Former-commit-id: 4ac4250fe3
2013-05-28 15:43:31 -05:00
Nate Jensen
7327ed122e Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: 5748201316 [formerly cba08666e6] [formerly 053e37ee76] [formerly 5748201316 [formerly cba08666e6] [formerly 053e37ee76] [formerly e846e539fb [formerly 053e37ee76 [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]]
Former-commit-id: e846e539fb
Former-commit-id: 74bce32a88 [formerly 607e980d45] [formerly 00638cbac9800172a1c3e7bb571d3fdb66dc2446 [formerly 5c60582df2]]
Former-commit-id: fe04e5e5a3405d946477333c1198d488a6c68690 [formerly f1b34d9fdd]
Former-commit-id: 95ddeeb10a
2013-05-28 15:43:23 -05:00
Max Schenkelberg
11ea3ffd90 Issue #1638 Fixed text box drawn to be correct size with padding around text
Amend: Fixed format string issues with topo resource and colorbar labels

Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114

Former-commit-id: 98bdd5f786 [formerly a88ca5e983] [formerly 13ff44fdee] [formerly 98bdd5f786 [formerly a88ca5e983] [formerly 13ff44fdee] [formerly 3175563336 [formerly 13ff44fdee [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]]
Former-commit-id: 3175563336
Former-commit-id: b2a9cba9c7 [formerly 4e8d25b317] [formerly dd33ea8ed195002c13b9b3e4e8d6d9dda70e2d8e [formerly 9932114218]]
Former-commit-id: 67c399b32ce88eaaf485b0b76683adab982ff78e [formerly b3bae339be]
Former-commit-id: 062c4e90cd
2013-05-28 15:00:59 -05:00
Nate Jensen
ee18f936c4 Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: e94a5b5494 [formerly f7817d7c41] [formerly 755dd253bb4939ea763815cd0328c8e0a0f2daca [formerly 0b48f54f47]]
Former-commit-id: cffae6c820b21f70627ccef42419758b373339fc [formerly e7f6bee025]
Former-commit-id: 4469346bc5
2013-05-28 14:30:26 -05:00
Roger Ferrel
c893efdf90 Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]]
Former-commit-id: 9263b54845
Former-commit-id: 618feeda6d [formerly 838eacc802] [formerly e443885c0974b7dc457a2ea698d05b926b780848 [formerly fce5c2ca1e]]
Former-commit-id: fbce5d830fc8e98edbac0da24e3e7e58b05c38b0 [formerly a5db5a53b3]
Former-commit-id: 60820cf776
2013-05-28 13:21:08 -05:00
Max Schenkelberg
12b0f3078f Issue #1638 Added support for null search constraints for updates
Amend: Fixed comment, added SW history

Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515

Former-commit-id: a91db9c1e3 [formerly 21693d6913] [formerly 1bc4437154] [formerly a91db9c1e3 [formerly 21693d6913] [formerly 1bc4437154] [formerly 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]]]
Former-commit-id: 807e4501c8
Former-commit-id: ae669fec59 [formerly 6c9fedb312] [formerly 1bee1ded94bdf16e7d08cd81e11f8d384dfa0585 [formerly 036b11c84e]]
Former-commit-id: a51945ee16e3a4a8b670aff1110506b34f67e638 [formerly bafad63987]
Former-commit-id: 0cb45bc6c9
2013-05-28 12:59:27 -05:00
Nate Jensen
08d1a83933 Issue #2037 made imageMap concurrent to fix memory leak
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: e3caafe7ad [formerly 84444b6ba9] [formerly f77f350eb3] [formerly e3caafe7ad [formerly 84444b6ba9] [formerly f77f350eb3] [formerly 68eba61c28 [formerly f77f350eb3 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]]]
Former-commit-id: 68eba61c28
Former-commit-id: 4cb8b766b5 [formerly 50d981285d] [formerly 6b1d9083d66d59225023a96ec8b6bbd68b7d1d44 [formerly af7fcf7e8e]]
Former-commit-id: 6a5f643fac33b5f7beb703ca7155c5d62a9013c2 [formerly 95371e7ec0]
Former-commit-id: 1ee22de2db
2013-05-28 09:21:57 -05:00
Dustin Johnson
52d6561920 Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]]
Former-commit-id: 197a5cef1b
Former-commit-id: d8cdc3c8c5 [formerly 8d00ba1978] [formerly 5e3e07d672821d4ad14f8aa22c072b6f5438ab36 [formerly a8fc7295ef]]
Former-commit-id: a12b5f91e880cf22814f5ee0a449226094f531ec [formerly 19274fb903]
Former-commit-id: 834ffed160
2013-05-28 06:43:35 -05:00
Ben Steffensmeier
43e8012ad5 Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: c2ca1551f6 [formerly cdf8e7daaa] [formerly 3b6156843e] [formerly c2ca1551f6 [formerly cdf8e7daaa] [formerly 3b6156843e] [formerly 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]]]
Former-commit-id: 7be9ad1f8b
Former-commit-id: 84eac56ea0 [formerly c71afc4198] [formerly dc6540df2c7c7dee778134e44e92281971fe7bb5 [formerly 2a8a87e564]]
Former-commit-id: f8a90ff9e375e3bc4319eb7bf4480153d66af25d [formerly b7014d1570]
Former-commit-id: c0e3037695
2013-05-24 16:40:21 -05:00
Mike Duff
c99170b497 Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: e3804d48ec [formerly 80b1f95f0c] [formerly 192ce891d0] [formerly e3804d48ec [formerly 80b1f95f0c] [formerly 192ce891d0] [formerly b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]]
Former-commit-id: b6b01c3e81
Former-commit-id: e7790088ac [formerly 6ee0ef55ff] [formerly bbd9728434e2386f696b8016882158b60232d706 [formerly a9004667b7]]
Former-commit-id: 1a67b61c05159bc4081f57926a9ff0be90dec414 [formerly 53ca005836]
Former-commit-id: 5b21a6cfa4
2013-05-24 09:20:55 -05:00
Nate Jensen
cc2e4f8295 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Former-commit-id: 29b3e508e2 [formerly 631567ced9] [formerly 7d1fc954f6] [formerly 29b3e508e2 [formerly 631567ced9] [formerly 7d1fc954f6] [formerly 7d233ff590 [formerly 7d1fc954f6 [formerly ef313253ec669167b9e1deb2562170c117123937]]]]
Former-commit-id: 7d233ff590
Former-commit-id: 7fa0ba3069 [formerly e976a4c94e] [formerly 6b94d7fe2342db507b4bed04b7cd4e98b8e66316 [formerly 9e37d21dc6]]
Former-commit-id: f01b8647daca1eedd6ca3dbbfa015814e459bd93 [formerly 543e0c7746]
Former-commit-id: afcf650681
2013-05-24 09:13:10 -05:00
Bryan Kowal
af765c36fa Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline
Amend: do not run the clean task after building any wa features

Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a

Former-commit-id: 45c9e4d203 [formerly b3d40951ba] [formerly 8145305580] [formerly 45c9e4d203 [formerly b3d40951ba] [formerly 8145305580] [formerly a2148650b4 [formerly 8145305580 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]]]
Former-commit-id: a2148650b4
Former-commit-id: 1f0ad9a4a0 [formerly c658131c84] [formerly ee8cf990b046e62c310f31e4215068b2761e859e [formerly 66cf28ab84]]
Former-commit-id: c6d3e0b25cd254abf0cfcea7aeb19ca4159340f6 [formerly 9392da9041]
Former-commit-id: 8998e5cb8f
2013-05-23 23:52:35 -05:00
Lee Venable
05f50370b4 Issue #1964 - inital GUI creation
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: 082df6ccd5 [formerly 4ecb65e4a2] [formerly ae020d3960] [formerly 082df6ccd5 [formerly 4ecb65e4a2] [formerly ae020d3960] [formerly c3328077c8 [formerly ae020d3960 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]]]
Former-commit-id: c3328077c8
Former-commit-id: dea017445b [formerly 041d612ea2] [formerly b12a8641a04e64e274355ad4f613a4d32ce96f80 [formerly 9a72abf083]]
Former-commit-id: ee98709e56d28c656d560d652d14192e6decadef [formerly eb7c8a4d93]
Former-commit-id: 9a6c295b62
2013-05-23 17:16:31 -05:00
Roger Ferrel
771cc43fb9 Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

Former-commit-id: ff1dac4143 [formerly 75a2fc4723] [formerly 9533bb686d] [formerly ff1dac4143 [formerly 75a2fc4723] [formerly 9533bb686d] [formerly e5867cbb79 [formerly 9533bb686d [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]]]
Former-commit-id: e5867cbb79
Former-commit-id: 2e54bc5af6 [formerly ef14a57411] [formerly 3c4155b82503781781c7dbf83bdca26072bfdbec [formerly bdecc2f309]]
Former-commit-id: 03eae2560300f6bba7f282d4697b6083e00a4da8 [formerly 9b90237bcf]
Former-commit-id: a5378d6ba7
2013-05-23 13:43:53 -05:00
Nate Jensen
de2f575c94 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970 [formerly a84a6fe6ae] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192]
Former-commit-id: eaaf8d1b8a
2013-05-23 11:20:40 -05:00
Nate Jensen
b9d9474e7f Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: d7f5eea402 [formerly 876d741ab8] [formerly b8f3307f50] [formerly d7f5eea402 [formerly 876d741ab8] [formerly b8f3307f50] [formerly 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]]]
Former-commit-id: 3b058175fe
Former-commit-id: a9a2c23e23 [formerly 3287b6ace2] [formerly 8e6e7a123de7f2be6cbdd2bdeddbc88cf44a27ef [formerly 71d9076fe2]]
Former-commit-id: fc20512c805a4b562e8fb3e489335250c0a21817 [formerly 41403a55ed]
Former-commit-id: 7843d83e0d
2013-05-23 10:43:15 -05:00