Dustin Johnson
ca4a64dee5
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: 0ac058008d463bed7647efc3c6a2f20ac058008d463bed7647efc3c6a2f2b99a8bc4f9efc3c6a2f2b99a8bc4f9ac8c2784ae74d985af51b1d66a04503dbb68249303cbf9a455
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: 778cf6542c6243f1f789aa76f81b3c778cf6542c6243f1f789aa76f81b3c321f153547aa76f81b3c321f153547c8811ff347cb69ca7e93bbc15413d434707fe2725a66a33017
2013-05-30 09:34:18 -05:00
Steve Harris
d850ee5ce1
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 80896a4e3107bc6c83e99d4577079d80896a4e3107bc6c83e99d4577079d0a276d49549d4577079d0a276d49547af97e645af72ba834dcf4d1b7c86c9bf53663ae86a4b2913f
2013-05-30 07:26:30 -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: 3c98d835bf52a1addb297b24cd293a3c98d835bf52a1addb297b24cd293abd9251eba07b24cd293abd9251eba0cad451315d5ee9c9f6a14eb7d951e428bbbfefefd6ce03a31d
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: 05e7e0551fb3865f4efc268ee5ce3005e7e0551fb3865f4efc268ee5ce30191f93653d268ee5ce30191f93653dc6150879d59c415e2f1950c5c5edfabc19b816c4f73b0b551e
2013-05-29 17:50:50 -05:00
Richard Peter
6588e18b91
Merge "Issue #1989 remove unused schemas" into development
...
Former-commit-id: a88b17b12547b95286add563ae4eb8a88b17b12547b95286add563ae4eb8800c7dd9a6d563ae4eb8800c7dd9a629a1c468f34788532b86c8c5be650cd546fcf7347d8ebdbfde
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: 07009bf650df5945a8e24f3ea80cd907009bf650df5945a8e24f3ea80cd9532d3ee8994f3ea80cd9532d3ee89970eca967a3545fe43c1ef95037a9bfd354b67dd315894e477c
2013-05-29 16:20:17 -05:00
Nate Jensen
cf843cfa42
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 00fbfbe7e5740237c317f3258e77f700fbfbe7e5740237c317f3258e77f7fc691cbb2ff3258e77f7fc691cbb2ffde771fa01ab10e0072d6214f529a73588ed1899528ab65a66
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: de43cbb63d8ae3e74339b0348bc056de43cbb63d8ae3e74339b0348bc0562554ff9602b0348bc0562554ff9602dc87184caf4741aca6b105d5a08497f2686f44755ad7ca03a7
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: 63ccc2c13321b8f03b1fd2d50e7d8b63ccc2c13321b8f03b1fd2d50e7d8becf3f2e300d2d50e7d8becf3f2e300efd95f253ed467832855151df64a6e94c42476171047ef53b3
2013-05-29 15:54:06 -05:00
Steve Harris
7e31d1a9a1
13.4.1-13 baseline
...
Former-commit-id: 9a7ef48967e3b8086bd087b97120099a7ef48967e3b8086bd087b9712009de476791fb87b9712009de476791fb70ecafa237418f8aef56b58cf237bfc9155c1631176f4d392f
2013-05-29 16:30:09 -04:00
Nate Jensen
f038e1ac31
Issue #1989 fix for webpages
...
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7
Former-commit-id: fb9ca3cbc5c0e93d192c1a34067182fb9ca3cbc5c0e93d192c1a340671820d495f97591a340671820d495f9759c641738561839e9fc76d8da746cde6a2417f0d9b2d5e05ceea
2013-05-29 15:21:10 -05:00
Ben Steffensmeier
554e1183f8
Issue #1869 fix plot updates, broken by earlier commit.
...
Former-commit-id: a3b2efc2b4b32a5b1c00d2e01ee1f2a3b2efc2b4b32a5b1c00d2e01ee1f2cbc3b0a9a4d2e01ee1f2cbc3b0a9a44555ef990c6b7958c834d90ca1696e47dba49e8d75b800be90
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: 04d6f6654d927da5cffb99b4a2141404d6f6654d927da5cffb99b4a214143f3e0a788d99b4a214143f3e0a788d3a41ae85b4b025262dc1a1f314948f4eb941dacbe4bbe70d57
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: 6a6484cbb27059967ae9caf414bab06a6484cbb27059967ae9caf414bab0148b20f57ccaf414bab0148b20f57c043cc9f66147d2bf99b972ed3e21b31fe16c9553121dd032bf
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
719500006d
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: ec9881b914e16dc02a544747f7d319ec9881b914e16dc02a544747f7d319d5263b2b754747f7d319d5263b2b75a05a910ef9c6af8b4d7c7cca4d8794c441b20ddba75821e0a6
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: 605f2d61367ca6f1840566c941fc3f605f2d61367ca6f1840566c941fc3fac292f124266c941fc3fac292f12426567c1b6efb6c87f42b1ef43634c56bae8a2436d233d827c9c
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: 16c3723df86dd22b6dfabc0f1c88fc16c3723df86dd22b6dfabc0f1c88fc19272c9f28bc0f1c88fc19272c9f286d11397746d26eac7bdf4be6514b573550d07a9c6ceeb324e1
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: cf705759bd808ab352c582d6c03669cf705759bd808ab352c582d6c0366936bc35b5c882d6c0366936bc35b5c8768a7dad60452858b86fcb4b66d37a74081dd140f9d85ac8a9
2013-05-29 09:20:53 -05:00
Mike Duff
b1c0253e8e
Issue #2016 - fix TS Trace toggle
...
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: 0babd4d9b451de726e49afbe294f4a0babd4d9b451de726e49afbe294f4a5919687484afbe294f4a5919687484d292cfcca0d9fd9d297b66f4e6fe875e3fa8852b4d43e81158
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: eef3b4c750c76fa3bc2a0a9e7ed740eef3b4c750c76fa3bc2a0a9e7ed74031e01a9f9a0a9e7ed74031e01a9f9afb15a3e115fff0172786187a1e49ef1fab7334724ac1c2cbdb
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: d7391928f9ba5e69c7ff7c1e6e8b09d7391928f9ba5e69c7ff7c1e6e8b09256a67a9f97c1e6e8b09256a67a9f98c756705c5ac838f62dd2fe1960ebb99a1938d364ac4250fe3
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: 5748201316cba08666e6053e37ee765748201316cba08666e6053e37ee76e846e539fb053e37ee76e846e539fb74bce32a88607e980d455c60582df2f1b34d9fdd95ddeeb10a
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: 98bdd5f786a88ca5e98313ff44fdee98bdd5f786a88ca5e98313ff44fdee317556333613ff44fdee3175563336b2a9cba9c74e8d25b3179932114218b3bae339be062c4e90cd
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: d479912981bd8431b986ed7b0fc8c5d479912981bd8431b986ed7b0fc8c53f85aeb00aed7b0fc8c53f85aeb00ae94a5b5494f7817d7c410b48f54f47e7f6bee0254469346bc5
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: 24f1c70168365af6b7cecbee73144724f1c70168365af6b7cecbee7314479263b54845cbee7314479263b54845618feeda6d838eacc802fce5c2ca1ea5db5a53b360820cf776
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: a91db9c1e321693d69131bc4437154a91db9c1e321693d69131bc4437154807e4501c81bc4437154807e4501c8ae669fec596c9fedb312036b11c84ebafad639870cb45bc6c9
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: e3caafe7ad84444b6ba9f77f350eb3e3caafe7ad84444b6ba9f77f350eb368eba61c28f77f350eb368eba61c284cb8b766b550d981285daf7fcf7e8e95371e7ec01ee22de2db
2013-05-28 09:21:57 -05:00
Dustin Johnson
52d6561920
Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
...
Former-commit-id: c694d523dbf4ad0218f22b1f75f702c694d523dbf4ad0218f22b1f75f702197a5cef1b2b1f75f702197a5cef1bd8cdc3c8c58d00ba1978a8fc7295ef19274fb903834ffed160
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: c2ca1551f6cdf8e7daaa3b6156843ec2ca1551f6cdf8e7daaa3b6156843e7be9ad1f8b3b6156843e7be9ad1f8b84eac56ea0c71afc41982a8a87e564b7014d1570c0e3037695
2013-05-24 16:40:21 -05:00
Mike Duff
c99170b497
Issue #2020 - Implement Shared Subscriptions Cave-side.
...
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: e3804d48ec80b1f95f0c192ce891d0e3804d48ec80b1f95f0c192ce891d0b6b01c3e81192ce891d0b6b01c3e81e7790088ac6ee0ef55ffa9004667b753ca0058365b21a6cfa4
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: 29b3e508e2631567ced97d1fc954f629b3e508e2631567ced97d1fc954f67d233ff5907d1fc954f67d233ff5907fa0ba3069e976a4c94e9e37d21dc6543e0c7746afcf650681
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: 45c9e4d203b3d40951ba814530558045c9e4d203b3d40951ba8145305580a2148650b48145305580a2148650b41f0ad9a4a0c658131c8466cf28ab849392da90418998e5cb8f
2013-05-23 23:52:35 -05:00
Richard Peter
9845d2e8b7
Merge "Issue #1917 : Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period." into omaha_13.4.1
...
Former-commit-id: 7aec695890344765c61d979cc8c1817aec695890344765c61d979cc8c181732ae3c832979cc8c181732ae3c8328289c96d1ce65237b93fec8c77f6f3d48c54529ff3b67f0d33
2013-05-23 18:10:58 -05:00
Lee Venable
05f50370b4
Issue #1964 - inital GUI creation
...
Change-Id: I47d58880066fa2ef284e8911390163624b873381
Former-commit-id: 082df6ccd54ecb65e4a2ae020d3960082df6ccd54ecb65e4a2ae020d3960c3328077c8ae020d3960c3328077c8dea017445b041d612ea29a72abf083eb7c8a4d939a6c295b62
2013-05-23 17:16:31 -05:00
Roger Ferrel
771cc43fb9
Issue #1966 Feature plugin for archive.
...
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771
Former-commit-id: ff1dac414375a2fc47239533bb686dff1dac414375a2fc47239533bb686de5867cbb799533bb686de5867cbb792e54bc5af6ef14a57411bdecc2f3099b90237bcfa5378d6ba7
2013-05-23 13:43:53 -05:00
Ron Anderson
bc0ece31ba
Merge "Issue #2025 : Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
...
Former-commit-id: f9bedd3aec1eb1cffa15c0fffc630df9bedd3aec1eb1cffa15c0fffc630d57c452b085c0fffc630d57c452b0850462d29a0f9cdf34184d59d823bf7be33fd0c95f3a44fb51ca
2013-05-23 12:12:39 -05:00
Richard Peter
8d69735af5
Issue #1917 : Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
...
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c
Former-commit-id: cbfe9772c5d5c0b86b7ab599745012cbfe9772c5d5c0b86b7ab5997450127349808131b5997450127349808131d4eb77b24853190601f6f3e0966966c51e6750b462191a8d82
2013-05-23 11:50:34 -05:00
Nate Jensen
de2f575c94
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
...
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: e8ebe1a123b7cecb931e1978133177e8ebe1a123b7cecb931e19781331771fd2f8965f19781331771fd2f8965f3b56918970a84a6fe6ae49b20e5d209689640192eaaf8d1b8a
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: d7f5eea402876d741ab8b8f3307f50d7f5eea402876d741ab8b8f3307f503b058175feb8f3307f503b058175fea9a2c23e233287b6ace271d9076fe241403a55ed7843d83e0d
2013-05-23 10:43:15 -05:00
Richard Peter
6d4c39f5e3
Merge "Issue #1989 fix clustered routes suspending/starting" into development
...
Former-commit-id: 25ace04a31edd70dfe4757933400b925ace04a31edd70dfe4757933400b99ca63e7d2657933400b99ca63e7d26b087cac180e150a518717a02b906906660e053793d65441ec4
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: 4ae00040e365b9bafed7d74936ef3e4ae00040e365b9bafed7d74936ef3ed7b8e04bb7d74936ef3ed7b8e04bb7b8e6b1a083882296f82391c8b9ac1d0f319b972173290b1bb6
2013-05-23 10:06:28 -05:00
Mike Duff
afc3142888
Issue #1902 - fix to forced guidance
...
Peer review comments
Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e
Former-commit-id: 44ef119c41b331a68a0811423a746544ef119c41b331a68a0811423a74652a733fa5f811423a74652a733fa5f8f603c809882878cde6767d177607bfa1dd9d73ba12bad74ca8
2013-05-23 09:52:07 -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: 362195f3a38cf9ef25272089732453362195f3a38cf9ef25272089732453db8cf0d35f2089732453db8cf0d35fddb7f13f18c7e028a6ff287f078150ba12811ed9e5c6e02f05
2013-05-23 09:10:41 -05:00
Greg Armendariz
f0f31d2c81
Merge "Issue #1927 - patch ant includegen task" into development
...
Former-commit-id: cabcb3e574dc9623df112fe2b0c5fbcabcb3e574dc9623df112fe2b0c5fba4457f8c832fe2b0c5fba4457f8c83806a417f0f7c97422501270269219c28475200b6b0e11947dd
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: 1ecf5d26afbbc7406812bd64f70d1a1ecf5d26afbbc7406812bd64f70d1a30c7ca8d36bd64f70d1a30c7ca8d36e9735dc410230e3d149eca208f913c1bfa549b4063a4dd32c0
2013-05-23 09:07:56 -05:00
Lee Venable
bf70165d9a
Merge "Issue #1966 Feature place holders for the dialogs." into development
...
Former-commit-id: 8f2b44a49e6e7ed9e02bcb156533f48f2b44a49e6e7ed9e02bcb156533f47245dff8b9cb156533f47245dff8b9664405e247a551d4b5868b13517100415d9b74f7236e7b39db
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: 4dc4b4131d895866b6d9df415f70884dc4b4131d895866b6d9df415f7088041c0ad948df415f7088041c0ad948f43c2d9d61b28bb05fde08f45fe8327f4e17f1aee54a8c5c78
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: 7c7f9c01a6d7e7a56b84e55f73b4f77c7f9c01a6d7e7a56b84e55f73b4f7d35424df4fe55f73b4f7d35424df4f3aa439216d760b0f33662d4434119d6d3604e6293ac1658261
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: a73d60754473dfc7a5e1bfd08efaa9a73d60754473dfc7a5e1bfd08efaa98061922b70bfd08efaa98061922b70b85da4c89f1469cb15d683c1e3127ef13a7f7ca527ad63100f
2013-05-22 22:34:45 -05:00
