Commit graph

1160 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Richard Peter
6d4c39f5e3 Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: b087cac180 [formerly e150a51871] [formerly e52295b07065a9723da62e04d0bd89a3ddba7ec9 [formerly 7a02b90690]]
Former-commit-id: 53002a55063a4431fa52fbab2658eaf5b6b9bf4c [formerly 6660e05379]
Former-commit-id: 3d65441ec4
2013-05-23 10:10:51 -05:00
Nate Jensen
94c13665a9 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: b8e6b1a083 [formerly 882296f823] [formerly c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]]
Former-commit-id: ec0257ca11e61995af3a0f051f104254321c312f [formerly 0f319b9721]
Former-commit-id: 73290b1bb6
2013-05-23 10:06:28 -05:00
Greg Armendariz
f0f31d2c81 Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]]
Former-commit-id: a4457f8c83
Former-commit-id: 806a417f0f [formerly 7c97422501] [formerly 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e [formerly 270269219c]]
Former-commit-id: 1cc75374aa871e0feaf7158e22e192dd600ac395 [formerly 28475200b6]
Former-commit-id: b0e11947dd
2013-05-23 09:10:11 -05:00
Matt Nash
497b73eda1 Issue #1871 fix for 64 bit ints from Python to Java
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae

Former-commit-id: 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly bd64f70d1a [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]]]
Former-commit-id: 30c7ca8d36
Former-commit-id: e9735dc410 [formerly 230e3d149e] [formerly 98364944a63f530252908f2eab510fc15f4a9823 [formerly ca208f913c]]
Former-commit-id: d5ca4e682343b0d9d3563f3267a259d7b0dc4c84 [formerly 1bfa549b40]
Former-commit-id: 63a4dd32c0
2013-05-23 09:07:56 -05:00
Roger Ferrel
1282bbbe35 Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]]]
Former-commit-id: d35424df4f
Former-commit-id: 3aa439216d [formerly 760b0f3366] [formerly 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d]]
Former-commit-id: 4b447312fbfd772bb147bae920d49ac18c6c401c [formerly 6d3604e629]
Former-commit-id: 3ac1658261
2013-05-23 07:36:15 -05:00
Bryan Kowal
c08dd6be23 Issue #1927 - patch ant includegen task
Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]]
Former-commit-id: 24c0728db9
Former-commit-id: 0f23a3a390 [formerly e6cfad1759] [formerly 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83]]
Former-commit-id: 6660f13270d1f9b3caee0a5a45c859ddb79247bd [formerly 897c70d90c]
Former-commit-id: 58b7ec2195
2013-05-22 18:00:43 -05:00
Nate Jensen
ff379da23c Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]]
Former-commit-id: a6d525ec96
Former-commit-id: 1aa7bda4f9 [formerly 5525412779] [formerly b2203d5e824a80b3594b409d049bc1148ae5c2d7 [formerly 431e97742d]]
Former-commit-id: 935206237ecf216154eb0bf6a019586fdbd80f9a [formerly f1bef6a3ac]
Former-commit-id: 0b6011bc36
2013-05-22 16:39:24 -05:00
Steve Harris
6a5b97e11e Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]]
Former-commit-id: 3590310f17
Former-commit-id: d477564678 [formerly 389eefd1f9] [formerly 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]]
Former-commit-id: 95db422c792e933bcfe1e19c2b8955eb8698bece [formerly c184d31779]
Former-commit-id: 61debd93bf
2013-05-22 16:13:08 -05:00
Steve Harris
32c2d3e5e9 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]]
Former-commit-id: 462652e31e
Former-commit-id: a6bb8b38dd [formerly 026674d0b2] [formerly 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202]]
Former-commit-id: 1b7b8110c512177341c86e9272a2b79f0ae52bbb [formerly bd9b2e493e]
Former-commit-id: 6dbe80b1af
2013-05-22 16:10:04 -05:00
Steve Harris
cf67535a3a 13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981 [formerly b745b332ae] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2]
Former-commit-id: 71e13c4d4d
2013-05-22 16:42:39 -04:00
Benjamin Phillippe
761156f3f5 Issue #2022 Removed data delivery project from feature
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd

Former-commit-id: feeb6126bb [formerly 0308f217d6] [formerly 4d1252523e] [formerly feeb6126bb [formerly 0308f217d6] [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 4d1252523e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]]]
Former-commit-id: 3e9fe9892e
Former-commit-id: 09126056a6 [formerly 8cae1b56f1] [formerly fa6325803c190e9467895d087ac2f99cbe7f7004 [formerly ce20ead9e7]]
Former-commit-id: f4b732e2020a95440bd16d9cd4a0fd83e7cf107f [formerly c77d747199]
Former-commit-id: 1b42f5d177
2013-05-22 12:49:46 -05:00
David Gillingham
77ccf79293 Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 511098fffd [formerly 2555cf9819] [formerly 5cba0f5e40] [formerly 511098fffd [formerly 2555cf9819] [formerly 5cba0f5e40] [formerly 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]]
Former-commit-id: 801c659108
Former-commit-id: 60850d6f8a [formerly 1471a7fa34] [formerly 7464c78970ff1efe18387d6d2105db0eb2e2d4ad [formerly 60aeb71652]]
Former-commit-id: d28086240a58a1bd453231bbbeda47190441083b [formerly dca867b77c]
Former-commit-id: 016ea4ec14
2013-05-22 11:42:08 -05:00
Benjamin Phillippe
fbab80357b Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]]]
Former-commit-id: c3a376475b
Former-commit-id: 99ed99e6d3 [formerly 1c50a8b9d3] [formerly 97b5016d0f29b44e02a2e20c7079fd9348e0adf5 [formerly ad039bae0c]]
Former-commit-id: 03832c7f7c90364359c090a1dfa92e3b5d3e065f [formerly 5fe0928121]
Former-commit-id: bb8c38e9c0
2013-05-22 11:38:42 -05:00
Richard Peter
c7eba20f0a Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]]
Former-commit-id: b4344d3c04
Former-commit-id: b3c32889b1 [formerly 1bbddf8fdf] [formerly 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]]
Former-commit-id: a7440882bd726d94a23b78fb9f3b0850a75ef7d5 [formerly b3688d78d1]
Former-commit-id: 7d73a32b0a
2013-05-21 13:07:51 -05:00
Richard Peter
c8484145dd Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]]
Former-commit-id: 930ff50fb8
Former-commit-id: ffe0b35085 [formerly 76f11f00ae] [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]]
Former-commit-id: ec9c4ee8853532d468f5912a752730400ce59ccd [formerly 046de916fd]
Former-commit-id: 7966576f23
2013-05-21 12:11:21 -05:00
Richard Peter
27c6d6f318 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 8e252f89f0 [formerly 21b87e9ea7] [formerly 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]]
Former-commit-id: 7abbd80f0599361a183f199c4e0c507ff370195e [formerly 69e6ea4847]
Former-commit-id: 2a8115770f
2013-05-21 10:35:00 -05:00
Dustin Johnson
7dc0125c17 Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]]
Former-commit-id: 8fcc958d84
Former-commit-id: bf3f162fc9 [formerly bd65447c9f] [formerly 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]]
Former-commit-id: fda3573ffd9d2ba70777c5464631155544a07d85 [formerly 566273cf69]
Former-commit-id: 2cf8ffac1a
2013-05-21 08:19:34 -05:00
Steve Harris
603bc2535a 13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 5db95cce55 [formerly 4d88863515] [formerly d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]]
Former-commit-id: b076884dd48bff50b64587e186d178820fa5b5cf [formerly 2767fd893c]
Former-commit-id: d9f967c811
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
20d086140b Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]]
Former-commit-id: 931e76ae59
Former-commit-id: bd89419f5e [formerly 30eb486e45] [formerly b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]]
Former-commit-id: 2c5b16494b7aca40f1b0a8f7493dcb483fd2f2cf [formerly 9bac8c566c]
Former-commit-id: 4687ddcd62
2013-05-20 18:00:32 -05:00
Richard Peter
e797da83e1 Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 5efe58df0b [formerly 72206676ee] [formerly 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8]]
Former-commit-id: 53ab371d1386f1626ee68b7d6007336d6c3b7dc8 [formerly 1418dbf556]
Former-commit-id: a664883d97
2013-05-20 17:49:22 -05:00
Roger Ferrel
51f7ee1219 Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]]]
Former-commit-id: dfd586fca6
Former-commit-id: 0db7741ce5 [formerly 4a5073902f] [formerly 4c43796fabb9d77c96bd1af9250c9c7f64374a79 [formerly c9e6e367fe]]
Former-commit-id: 8cdd9bb974d0abf9d1ed8790138a767f823d702a [formerly 7bf7c508b0]
Former-commit-id: 84b75ff489
2013-05-20 17:43:47 -05:00