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
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
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
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
a2725cc46d
Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development
...
Former-commit-id: 362195f3a3
[formerly 8cf9ef2527
] [formerly 2089732453
] [formerly 362195f3a3
[formerly 8cf9ef2527
] [formerly 2089732453
] [formerly db8cf0d35f
[formerly 2089732453
[formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]]]
Former-commit-id: db8cf0d35f
Former-commit-id: ddb7f13f18
[formerly c7e028a6ff
] [formerly a53888056ffd5a6cde39461a7854aaf44b0cb313 [formerly 287f078150
]]
Former-commit-id: 5056bc806c5cced87ed5edae5fb094e830ed4f91 [formerly ba12811ed9
]
Former-commit-id: e5c6e02f05
2013-05-23 09:10:41 -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
Lee Venable
bf70165d9a
Merge "Issue #1966 Feature place holders for the dialogs." into development
...
Former-commit-id: 8f2b44a49e
[formerly 6e7ed9e02b
] [formerly cb156533f4
] [formerly 8f2b44a49e
[formerly 6e7ed9e02b
] [formerly cb156533f4
] [formerly 7245dff8b9
[formerly cb156533f4
[formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]]]
Former-commit-id: 7245dff8b9
Former-commit-id: 664405e247
[formerly a551d4b586
] [formerly 1e5540cfa0e146921b014d691a8a622f845a82f2 [formerly 8b13517100
]]
Former-commit-id: 3c8249dfee63a01dd63cfaad02b5394672004945 [formerly 415d9b74f7
]
Former-commit-id: 236e7b39db
2013-05-23 09:05:11 -05:00
Richard Peter
fa9319f65a
Merge "Issue #1965 Add org.apache.commons.io package to cots." into development
...
Former-commit-id: 4dc4b4131d
[formerly 895866b6d9
] [formerly df415f7088
] [formerly 4dc4b4131d
[formerly 895866b6d9
] [formerly df415f7088
] [formerly 041c0ad948
[formerly df415f7088
[formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]]]
Former-commit-id: 041c0ad948
Former-commit-id: f43c2d9d61
[formerly b28bb05fde
] [formerly 261ad7af85056f8723367c153d62ac7a260ce0a3 [formerly 08f45fe832
]]
Former-commit-id: a725ed8c8949aca9b5ac7fd4ddecfce5c2dfd765 [formerly 7f4e17f1ae
]
Former-commit-id: e54a8c5c78
2013-05-23 08:52:47 -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
c0683ac24d
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
...
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: a73d607544
[formerly 73dfc7a5e1
] [formerly bfd08efaa9
] [formerly a73d607544
[formerly 73dfc7a5e1
] [formerly bfd08efaa9
] [formerly 8061922b70
[formerly bfd08efaa9
[formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]]
Former-commit-id: 8061922b70
Former-commit-id: b85da4c89f
[formerly 1469cb15d6
] [formerly 7f883b486090bea47bbfeee228a09574a9b949d0 [formerly 83c1e3127e
]]
Former-commit-id: 5ccd1f8765d2002b05016968c6cf55d77e21f10a [formerly f13a7f7ca5
]
Former-commit-id: 27ad63100f
2013-05-22 22:34:45 -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
Brad Gonzales
16343b603b
Issue #1965 Add org.apache.commons.io package to cots.
...
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed
Former-commit-id: 819160fcde
[formerly 33045d73a6
] [formerly 4bc98160ab
] [formerly 819160fcde
[formerly 33045d73a6
] [formerly 4bc98160ab
] [formerly 598a7a221e
[formerly 4bc98160ab
[formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]]]
Former-commit-id: 598a7a221e
Former-commit-id: 6811365078
[formerly 6d483764e3
] [formerly ca35c74668d7cc1c2b516ca39d37aeba84ced527 [formerly 858f68fc5c
]]
Former-commit-id: a9f6bb5c0e2cb1ffd111c07fd21bf4e8649585a6 [formerly 0edf6a9b5e
]
Former-commit-id: 52b1009539
2013-05-21 16:29:01 -05:00