Commit graph

2840 commits

Author SHA1 Message Date
Dustin Johnson
f3835a5670 Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: e4ecae9e7e [formerly c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]
Former-commit-id: c01ea33d5b
Former-commit-id: 54045d6b9b
2013-05-30 17:11:19 -05:00
Dave Hladky
7393abfc91 Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 83dae4fe01 [formerly 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]
Former-commit-id: 1608d407d1
Former-commit-id: c292bf1b55
2013-05-30 17:04:16 -05:00
Nate Jensen
03833d148d Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
Former-commit-id: e4578ca7ba [formerly 4aa3657d1a [formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]
Former-commit-id: 4aa3657d1a
Former-commit-id: 10dd7ea61f
2013-05-30 14:50:39 -05:00
Steve Harris
4e0ce194d9 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]
Former-commit-id: 3745089239
Former-commit-id: 3e66acde96
2013-05-30 14:33:24 -05:00
Ron Anderson
7d2d162be4 Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
Former-commit-id: 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]
Former-commit-id: dd10af4a8a
Former-commit-id: 79a8cd1b6f
2013-05-30 13:08:26 -05:00
Everett Kladstrup
7d7e276e2a 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: 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]
Former-commit-id: 0b2839fd43
Former-commit-id: 9541c93640
2013-05-30 13:02:49 -05:00
Dustin Johnson
b7d7d66727 Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
Former-commit-id: 9c9caf00d1 [formerly 7e6bdb7b70 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]
Former-commit-id: 7e6bdb7b70
Former-commit-id: 80309d6a4e
2013-05-30 11:32:09 -05:00
Dustin Johnson
0ac058008d Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]
Former-commit-id: efc3c6a2f2
Former-commit-id: 463bed7647
2013-05-30 09:49:09 -05:00
Brad Gonzales
778cf6542c 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: 321f153547 [formerly aa76f81b3c [formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]
Former-commit-id: aa76f81b3c
Former-commit-id: 6243f1f789
2013-05-30 09:34:18 -05:00
Bryan Kowal
3c98d835bf Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14

Former-commit-id: bd9251eba0 [formerly 7b24cd293a [formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]
Former-commit-id: 7b24cd293a
Former-commit-id: 52a1addb29
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
05e7e0551f Issue #1869 ensure all uses ofdataURI in PDO use getter.
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f

Former-commit-id: 191f93653d [formerly 268ee5ce30 [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]
Former-commit-id: 268ee5ce30
Former-commit-id: b3865f4efc
2013-05-29 17:50:50 -05:00
Richard Peter
a88b17b125 Merge "Issue #1989 remove unused schemas" into development
Former-commit-id: 800c7dd9a6 [formerly d563ae4eb8 [formerly d024f084f303bf6020ef7208cad249ac83f4d748]]
Former-commit-id: d563ae4eb8
Former-commit-id: 47b95286ad
2013-05-29 16:54:51 -05:00
Nate Jensen
07009bf650 Merge "Issue #1869 fix plot updates, broken by earlier commit." into development
Former-commit-id: 532d3ee899 [formerly 4f3ea80cd9 [formerly 534a1d6d9cb2366d875f5361c2a30fce54b7f786]]
Former-commit-id: 4f3ea80cd9
Former-commit-id: df5945a8e2
2013-05-29 16:20:17 -05:00
Nate Jensen
00fbfbe7e5 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: f3258e77f7
Former-commit-id: 740237c317
2013-05-29 16:19:28 -05:00
Dustin Johnson
de43cbb63d Merge "Issue #2038 Fix deleting of multiple subscription types Update test Spring configurations" into development
Former-commit-id: 2554ff9602 [formerly b0348bc056 [formerly 5716e1dbbbbe67cdde980eab6b60a70e22283ee9]]
Former-commit-id: b0348bc056
Former-commit-id: 8ae3e74339
2013-05-29 16:02:55 -05:00
Dustin Johnson
63ccc2c133 Issue #2038 Fix deleting of multiple subscription types
Update test Spring configurations

Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e

Former-commit-id: ecf3f2e300 [formerly d2d50e7d8b [formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]
Former-commit-id: d2d50e7d8b
Former-commit-id: 21b8f03b1f
2013-05-29 15:54:06 -05:00
Nate Jensen
fb9ca3cbc5 Issue #1989 fix for webpages
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7

Former-commit-id: 0d495f9759 [formerly 1a34067182 [formerly 7880f21755384540d3bca4ac15b04932455b8fd8]]
Former-commit-id: 1a34067182
Former-commit-id: c0e93d192c
2013-05-29 15:21:10 -05:00
Ben Steffensmeier
a3b2efc2b4 Issue #1869 fix plot updates, broken by earlier commit.
Former-commit-id: cbc3b0a9a4 [formerly d2e01ee1f2 [formerly a9240b60e4643b43880d2be76580dc85999eb897]]
Former-commit-id: d2e01ee1f2
Former-commit-id: b32a5b1c00
2013-05-29 15:00:04 -05:00
Nate Jensen
04d6f6654d Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
2013-05-29 14:49:43 -05:00
Nate Jensen
6a6484cbb2 Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]
Former-commit-id: caf414bab0
Former-commit-id: 7059967ae9
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
ec9881b914 Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]
Former-commit-id: 4747f7d319
Former-commit-id: e16dc02a54
2013-05-29 10:34:22 -05:00
Dustin Johnson
605f2d6136 Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]
Former-commit-id: 66c941fc3f
Former-commit-id: 7ca6f18405
2013-05-29 09:27:30 -05:00
Richard Peter
16c3723df8 Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
Former-commit-id: 19272c9f28 [formerly bc0f1c88fc [formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]
Former-commit-id: bc0f1c88fc
Former-commit-id: 6dd22b6dfa
2013-05-29 09:26:10 -05:00
Nate Jensen
cf705759bd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]
Former-commit-id: 82d6c03669
Former-commit-id: 808ab352c5
2013-05-29 09:20:53 -05:00
Mike Duff
0babd4d9b4 Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 5919687484 [formerly afbe294f4a [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]
Former-commit-id: afbe294f4a
Former-commit-id: 51de726e49
2013-05-29 09:15:46 -05:00
Dustin Johnson
eef3b4c750 Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]
Former-commit-id: 0a9e7ed740
Former-commit-id: c76fa3bc2a
2013-05-29 09:02:47 -05:00
Nate Jensen
d7391928f9 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: 256a67a9f9 [formerly 7c1e6e8b09 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]
Former-commit-id: 7c1e6e8b09
Former-commit-id: ba5e69c7ff
2013-05-28 15:43:31 -05:00
Nate Jensen
5748201316 Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: e846e539fb [formerly 053e37ee76 [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]
Former-commit-id: 053e37ee76
Former-commit-id: cba08666e6
2013-05-28 15:43:23 -05:00
Max Schenkelberg
98bdd5f786 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: 3175563336 [formerly 13ff44fdee [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]
Former-commit-id: 13ff44fdee
Former-commit-id: a88ca5e983
2013-05-28 15:00:59 -05:00
Nate Jensen
d479912981 Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]
Former-commit-id: ed7b0fc8c5
Former-commit-id: bd8431b986
2013-05-28 14:30:26 -05:00
Roger Ferrel
24f1c70168 Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]
Former-commit-id: cbee731447
Former-commit-id: 365af6b7ce
2013-05-28 13:21:08 -05:00
Max Schenkelberg
a91db9c1e3 Issue #1638 Added support for null search constraints for updates
Amend: Fixed comment, added SW history

Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515

Former-commit-id: 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]
Former-commit-id: 1bc4437154
Former-commit-id: 21693d6913
2013-05-28 12:59:27 -05:00
Nate Jensen
e3caafe7ad Issue #2037 made imageMap concurrent to fix memory leak
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: 68eba61c28 [formerly f77f350eb3 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]
Former-commit-id: f77f350eb3
Former-commit-id: 84444b6ba9
2013-05-28 09:21:57 -05:00
Dustin Johnson
c694d523db Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]
Former-commit-id: 2b1f75f702
Former-commit-id: f4ad0218f2
2013-05-28 06:43:35 -05:00
Ben Steffensmeier
c2ca1551f6 Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]
Former-commit-id: 3b6156843e
Former-commit-id: cdf8e7daaa
2013-05-24 16:40:21 -05:00
Mike Duff
e3804d48ec Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]
Former-commit-id: 192ce891d0
Former-commit-id: 80b1f95f0c
2013-05-24 09:20:55 -05:00
Nate Jensen
29b3e508e2 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Former-commit-id: 7d233ff590 [formerly 7d1fc954f6 [formerly ef313253ec669167b9e1deb2562170c117123937]]
Former-commit-id: 7d1fc954f6
Former-commit-id: 631567ced9
2013-05-24 09:13:10 -05:00
Bryan Kowal
45c9e4d203 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: a2148650b4 [formerly 8145305580 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]
Former-commit-id: 8145305580
Former-commit-id: b3d40951ba
2013-05-23 23:52:35 -05:00
Lee Venable
082df6ccd5 Issue #1964 - inital GUI creation
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: c3328077c8 [formerly ae020d3960 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]
Former-commit-id: ae020d3960
Former-commit-id: 4ecb65e4a2
2013-05-23 17:16:31 -05:00
Roger Ferrel
ff1dac4143 Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

Former-commit-id: e5867cbb79 [formerly 9533bb686d [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]
Former-commit-id: 9533bb686d
Former-commit-id: 75a2fc4723
2013-05-23 13:43:53 -05:00
Nate Jensen
e8ebe1a123 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
2013-05-23 11:20:40 -05:00
Nate Jensen
d7f5eea402 Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]
Former-commit-id: b8f3307f50
Former-commit-id: 876d741ab8
2013-05-23 10:43:15 -05:00
Richard Peter
25ace04a31 Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]
Former-commit-id: 57933400b9
Former-commit-id: edd70dfe47
2013-05-23 10:10:51 -05:00
Nate Jensen
4ae00040e3 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d74936ef3e
Former-commit-id: 65b9bafed7
2013-05-23 10:06:28 -05:00
Greg Armendariz
362195f3a3 Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development
Former-commit-id: db8cf0d35f [formerly 2089732453 [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]
Former-commit-id: 2089732453
Former-commit-id: 8cf9ef2527
2013-05-23 09:10:41 -05:00
Greg Armendariz
cabcb3e574 Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]
Former-commit-id: 2fe2b0c5fb
Former-commit-id: dc9623df11
2013-05-23 09:10:11 -05:00
Matt Nash
1ecf5d26af Issue #1871 fix for 64 bit ints from Python to Java
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae

Former-commit-id: 30c7ca8d36 [formerly bd64f70d1a [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]
Former-commit-id: bd64f70d1a
Former-commit-id: bbc7406812
2013-05-23 09:07:56 -05:00
Lee Venable
8f2b44a49e Merge "Issue #1966 Feature place holders for the dialogs." into development
Former-commit-id: 7245dff8b9 [formerly cb156533f4 [formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]
Former-commit-id: cb156533f4
Former-commit-id: 6e7ed9e02b
2013-05-23 09:05:11 -05:00
Richard Peter
4dc4b4131d Merge "Issue #1965 Add org.apache.commons.io package to cots." into development
Former-commit-id: 041c0ad948 [formerly df415f7088 [formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]
Former-commit-id: df415f7088
Former-commit-id: 895866b6d9
2013-05-23 08:52:47 -05:00
Roger Ferrel
7c7f9c01a6 Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]
Former-commit-id: e55f73b4f7
Former-commit-id: d7e7a56b84
2013-05-23 07:36:15 -05:00