4218 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bryan Kowal	8a0b0667de	Issue #2540 - pure python module merge implementation ... Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge Amend: remove module merge exception catching Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1 Former-commit-id: 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]] Former-commit-id: 7e35ea310f Former-commit-id: 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3] Former-commit-id: 4759e48c5c	2013-11-14 11:57:11 -06:00
Richard Peter	42ac155685	Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development ... Former-commit-id: 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly e88f5777a7 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]] Former-commit-id: e88f5777a7 Former-commit-id: 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74] Former-commit-id: ed258e9421	2013-11-13 16:43:26 -06:00
Benjamin Phillippe	7cbc9b4ef3	Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query ... Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279 Former-commit-id: 7b53fc40d4 [formerly c294d5d77a] [formerly d1769bae732e9e8f04b6407fdf659ac6eeaae5c3 [formerly 5cd030f096]] [formerly 1c46226a11 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]] Former-commit-id: 1c46226a11 Former-commit-id: 02517e3b01d1874cc92736a35804499b6a45c0d6 [formerly fe7c6886c4] Former-commit-id: 1a19965daf	2013-11-13 10:52:07 -06:00
Brian Clements	c399d0394f	Issue #1314 fixed WFS output problem found when testing KeyLocker ... Stored query response objects needed to be wrapped in JAXB elements Former-commit-id: 0991849617 [formerly 0d80fa7dc1] [formerly a1efb536e48a75742d84cd92212efeb7e692e012 [formerly dfd88151e6]] [formerly 37f4f41d2d [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]] Former-commit-id: 37f4f41d2d Former-commit-id: e50da8d67f3cc8f84bc4978a0aab417ea16a7c26 [formerly ef2acc6562] Former-commit-id: c3a0ea3400	2013-11-13 10:04:13 -06:00
Nate Jensen	df8ddb3eac	Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development ... Former-commit-id: 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly c0ed705daf [formerly 85923b0f7f [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]] Former-commit-id: c0ed705daf Former-commit-id: 8aeadacd76d9077469357c8afa7195a688cca933 [formerly a62e415724] Former-commit-id: fad5c6d615	2013-11-13 09:01:09 -06:00
Brian Clements	381a274111	Issue #2546 added fix for TAFs that contain legacy valid times ... added unit test Former-commit-id: 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly df1542a66c [formerly 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]] Former-commit-id: df1542a66c Former-commit-id: 3ac020de4f913cf98382a5249c8fda9e76a0edaa [formerly 0e5d3e9e69] Former-commit-id: bca5149811	2013-11-13 08:07:29 -06:00
Bryan Kowal	d8a1e15951	Issue #2297 - update build scripts to complete the full delta build ... Former-commit-id: 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly d76033ff3d [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]] Former-commit-id: d76033ff3d Former-commit-id: 08a3d0dc0c028b514f152d7d2df94af1610acc50 [formerly 084d772588] Former-commit-id: e9ff5e018b	2013-11-12 17:43:10 -06:00
Nate Jensen	793a7f6544	Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development ... Former-commit-id: b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly f0b386b632 [formerly accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]] Former-commit-id: f0b386b632 Former-commit-id: dfb26a2628a5b054a3463a05d41c518dd8e86068 [formerly 80227c4750] Former-commit-id: ec073efd45	2013-11-12 16:55:31 -06:00
Nate Jensen	ad6d935205	Merge "Issue #2361 better logging of viz spring initialization of bundles" into development ... Former-commit-id: decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly b1d376e238 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]] Former-commit-id: b1d376e238 Former-commit-id: 50151ea1ec6e4d1ca1d0f68de456f2de9ac40c8f [formerly 645e816d5d] Former-commit-id: b0cfb6e836	2013-11-12 16:48:32 -06:00
Dave Hladky	b467763805	Issue #2542 Jetty upgraded ... Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3 Former-commit-id: 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly e3a259182c [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]] Former-commit-id: e3a259182c Former-commit-id: a4fec8aeeb03e65d82a83a1808e0fa6530ced21e [formerly 53866e481a] Former-commit-id: f2f670bc00	2013-11-12 14:55:41 -06:00
Nate Jensen	8dacce7f9b	Merge "Issue #2539 removed java 7 specific code from exception subclass" into development ... Former-commit-id: 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly c60228c854 [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]] Former-commit-id: c60228c854 Former-commit-id: 5dddfaa7f46782e5270d7070d02a28f1d2f20a01 [formerly a1315f1072] Former-commit-id: c6e10ebdef	2013-11-12 14:41:34 -06:00
Richard Peter	51f9a7fe54	Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development ... Former-commit-id: 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly f12839a9e5 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]] Former-commit-id: f12839a9e5 Former-commit-id: d63f1f5f4506e36003ebe3658bbae7045d51f7d9 [formerly c8ff79a7f5] Former-commit-id: 502d67591b	2013-11-12 13:47:04 -06:00
Nate Jensen	25047d10d5	Issue #2361 better logging of viz spring initialization of bundles ... Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b Former-commit-id: 821c8d2a30 [formerly 6707d1aadf] [formerly 692ea76d75] [formerly a4ece1d116 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]] Former-commit-id: a4ece1d116 Former-commit-id: bb48885fad4303574e632bfa0ef5cef5bf842c6d [formerly 2e86520b53] Former-commit-id: 4b329513e5	2013-11-12 13:02:49 -06:00
Nate Jensen	f673de2e99	Merge "Issue #2448 fix scheduling for start/stop of subscription." into development ... Former-commit-id: 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 64aa00bad6 [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]] Former-commit-id: 64aa00bad6 Former-commit-id: 9e53a2808b9310818f353602936e9b93270e44e7 [formerly 39679b0608] Former-commit-id: 7a5f716d70	2013-11-12 12:46:38 -06:00
Brad Gonzales	725742f4ec	Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes. ... Amend: Separate update from create notifications in LifecycleManagerImpl. Refactored notification sending in EdexBandwidthManager. Fixed error in LifecycleManagerImpl refactor. Added comment to isRecurringSubscription. Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77 Former-commit-id: 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]] Former-commit-id: aea0e847aa Former-commit-id: 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0] Former-commit-id: 7747d901f7	2013-11-12 12:42:16 -06:00
Brian Clements	3351401cb6	Issue #2539 removed java 7 specific code from exception subclass ... Former-commit-id: e9b4f777e1 [formerly 9f7e85450d] [formerly 8b0e85f82c] [formerly 4050eb5f3e [formerly 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]] Former-commit-id: 4050eb5f3e Former-commit-id: 6cca22845871692e5d67bd3e6d781e22aab81c7d [formerly ba12c7467d] Former-commit-id: 4d3c2f488c	2013-11-12 12:41:50 -06:00
Nate Jensen	0c999d40dd	Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development ... Former-commit-id: 1747b23290 [formerly b71f2463da] [formerly 3f86a3735e] [formerly eed4c8604b [formerly 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]] Former-commit-id: eed4c8604b Former-commit-id: e300fc5ad7ce2f811eabeaaee0fd88234f5a7008 [formerly 18d790a423] Former-commit-id: b0600c60ce	2013-11-12 12:13:58 -06:00
Richard Peter	be32cf8237	Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development ... Former-commit-id: 7bd2cdb170 [formerly 4d82382054] [formerly 8afc87e570] [formerly 61fc3eba44 [formerly 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]] Former-commit-id: 61fc3eba44 Former-commit-id: b49bd79f027e2a7d4129d4e1a9aa4cdf3f6a55d0 [formerly b8b01f6305] Former-commit-id: d66aaa7746	2013-11-12 11:18:56 -06:00
Nate Jensen	e2db59a055	Issue #2361 static lazy initialization of SubscriptionOverlapService's ... JAXBManager Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac Former-commit-id: a1fadcf38f [formerly 6c016a6bb6] [formerly 1ee5d91af2] [formerly 2cdc7e5e63 [formerly 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]] Former-commit-id: 2cdc7e5e63 Former-commit-id: 62f6799a9e992798bc661107dd6e08c64c9810c5 [formerly 368d73449e] Former-commit-id: 98cbafe95c	2013-11-12 11:03:51 -06:00
Dave Hladky	3d5ca2453b	Issue #2448 fix scheduling for start/stop of subscription. ... Former-commit-id: af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly 976eece1b1 [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]] Former-commit-id: 976eece1b1 Former-commit-id: 18e585f452f18b7b112c96e0494390595d97c58e [formerly 753b36cfea] Former-commit-id: 3f5b80e5b3	2013-11-12 10:58:50 -06:00
Nate Jensen	493d79f524	Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development ... Former-commit-id: 695f25ba66 [formerly 3480148f14] [formerly bca5793e3d] [formerly da8a858727 [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]] Former-commit-id: da8a858727 Former-commit-id: 9671b7375763905e318a2a92acb4933c27a059b8 [formerly d758e5ab57] Former-commit-id: ddebd81c73	2013-11-12 10:55:40 -06:00
Brad Gonzales	66d22943ed	Issue #2506 Added subscription notification service to bandwidth manager. ... Change-Id: I3aad52887532f9a16dd6ea396458803890916d92 Former-commit-id: 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly ff5edde334 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]] Former-commit-id: ff5edde334 Former-commit-id: 368a51ec44c83075967d0b8589b3b09c44ba8b74 [formerly efdc64b7b3] Former-commit-id: 1987184f87	2013-11-12 10:50:06 -06:00
Nate Jensen	d1e5b5e0dc	Merge "Issue #2377 fixed error handling in QPF config" into development ... Former-commit-id: 881e9efc68 [formerly 74d7dfd7da] [formerly 3054868350] [formerly d8f2ffbceb [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]] Former-commit-id: d8f2ffbceb Former-commit-id: 30a720690f9ddf9e80cde824f8524806bc0200e8 [formerly 68866c322c] Former-commit-id: 5899801877	2013-11-12 10:39:51 -06:00
Nate Jensen	d2f15c928c	Merge "Issue #2539 added GZIP support to WFS REST" into development ... Former-commit-id: bf4406d124 [formerly cd5b0576b0] [formerly f1b8eecca7] [formerly 8c4608630d [formerly f1b8eecca7 [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]] Former-commit-id: 8c4608630d Former-commit-id: 7d794297e4516fd184a29fd40a964387c686691f [formerly b87efc6860] Former-commit-id: f240b80d6f	2013-11-12 10:39:44 -06:00
Nate Jensen	f91ac1953e	Issue #2361 remove using SerializationUtil for processing XML colormaps ... Change-Id: I25409474972eb94a928bde61fca3af88630a82b7 Former-commit-id: 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 7a73c65430 [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]] Former-commit-id: 7a73c65430 Former-commit-id: 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6 [formerly 5427e68fd2] Former-commit-id: 9bf83be7e9	2013-11-12 10:37:54 -06:00
Nate Jensen	d3cadd78d6	Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development ... Former-commit-id: 178e212c4b [formerly 8ff0d1129a] [formerly 3ed50ff500] [formerly 23fe7de462 [formerly 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]] Former-commit-id: 23fe7de462 Former-commit-id: bbd9ec0c716072ceca26f944c7f0c8aec819db11 [formerly 90320ab47a] Former-commit-id: c84ff18213	2013-11-12 09:29:46 -06:00
Bryan Kowal	5bfc4d4dda	Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later. ... Amend: addressed review comments Amend: update DR number Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0 Former-commit-id: d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]] Former-commit-id: 75e6914df1 Former-commit-id: 117ea92d58b5f7e0d20d3bd89d1f4e7c6c26b7f1 [formerly 5c38f0bfd6] Former-commit-id: 1a966d8ec2	2013-11-11 17:00:17 -06:00
Brian Clements	407884f08e	Issue #2377 fixed error handling in QPF config ... Former-commit-id: 6faded726a [formerly 23e9ac6aa8] [formerly e2ac7ae212] [formerly 684bd4dc50 [formerly e2ac7ae212 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]] Former-commit-id: 684bd4dc50 Former-commit-id: a089b8911c036cdf25eb53efbf261c6116d81cf6 [formerly c6f8609b39] Former-commit-id: 368223de1f	2013-11-11 16:18:16 -06:00
Nate Jensen	e62a756cbc	Issue #2361 undo earlier changes that potentially break uengine based ... local apps Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65 Former-commit-id: cf88b536e0 [formerly bb93c18e7d] [formerly 8628b7755e] [formerly a2935193b5 [formerly 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]]] Former-commit-id: a2935193b5 Former-commit-id: 32cf218a7d8218d000be9f55fd45198a966abf60 [formerly 9dc69e316f] Former-commit-id: e1138809e7	2013-11-11 16:14:35 -06:00
Brian Clements	9c04028981	Issue #2539 added GZIP support to WFS REST ... small code cleanup in providers Former-commit-id: 9934916ec7 [formerly 02ab14579f] [formerly a888aad0046cac205c889c6486de64c7defb47fe [formerly 36a0be2db1]] [formerly 061515b485 [formerly 36a0be2db1 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]]] Former-commit-id: 061515b485 Former-commit-id: 0196637c33858fef7c310554bbe9d076877097b6 [formerly 24905af3c4] Former-commit-id: 7cba0ca3c1	2013-11-11 16:08:09 -06:00
Steve Harris	6c1b10ef38	Merge branch 'omaha_13.5.3' into development ... Former-commit-id: 3046218ffa [formerly 51af205d06] [formerly 9dabbc7b8e] [formerly 66f99f3974 [formerly 9dabbc7b8e [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]] Former-commit-id: 66f99f3974 Former-commit-id: 0a548e3ee4a8da8b1016d683c486d04b1f3f4cdd [formerly 9f1d93a2cf] Former-commit-id: 48997c36f0	2013-11-11 15:40:45 -06:00
Steve Harris	dffea727be	Merge branch 'master_13.5.3' into omaha_13.5.3 ... Former-commit-id: 1a49b03f89 [formerly 00a64f061d] [formerly c1dcded2bd] [formerly e0d2de3a19 [formerly c1dcded2bd [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]]] Former-commit-id: e0d2de3a19 Former-commit-id: 7ef46b17621b2c5d7650aa762a0c86f5ec0633aa [formerly 0d4e6712f8] Former-commit-id: 5b789ef8b0	2013-11-11 15:39:27 -06:00
Steve Harris	c698e151f2	13.5.3-7 baseline ... Former-commit-id: 130ad51d0c [formerly 36af5686bd] [formerly 0bde7454557dc9d790321a4bc1383621f270a531 [formerly 21bed95fa4]] [formerly 47102ee47b [formerly 21bed95fa4 [formerly a9ada72dc63cd460499052171c61323b438bb10d]]] Former-commit-id: 47102ee47b Former-commit-id: 06258f044b934f4063d605764f82c7d974d58d0b [formerly 3599d7f09b] Former-commit-id: 142f1201b3	2013-11-11 16:33:51 -05:00
Nate Jensen	bdfe31ca9d	Merge "Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development ... Former-commit-id: a349a980d3 [formerly a3fd84d9ef] [formerly 7dda17a660] [formerly 05ee46c4bc [formerly 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]] Former-commit-id: 05ee46c4bc Former-commit-id: bde810fa0fc654c54b6988c3f5dabe5ab75424e3 [formerly 64df0d8d8f] Former-commit-id: 208cc6a534	2013-11-11 14:05:11 -06:00
Richard Peter	9600b1a10e	Merge "Issue #2506 Refactored RegistryEvent constructors." into development ... Former-commit-id: 8a3069e8e3 [formerly d55e99dc2d] [formerly 13989d9c6e] [formerly 51649b56e5 [formerly 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]] Former-commit-id: 51649b56e5 Former-commit-id: 01640204f77e3bf9716a94b6d6df69c22e18cadd [formerly 8db2d589e3] Former-commit-id: 0e1ec70a0d	2013-11-11 13:09:24 -06:00
Steve Harris	ef183dd7af	Merge branch 'omaha_13.5.3' (13.5.3-6) into development ... Former-commit-id: cf9f426faa [formerly 33e02b548d] [formerly fbfe1a5faf] [formerly 8a2e9f1725 [formerly fbfe1a5faf [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]] Former-commit-id: 8a2e9f1725 Former-commit-id: acaa9065d51878d26f0253e193ea63bd14a6d273 [formerly b4fe17406f] Former-commit-id: 4e09ce78c8	2013-11-11 11:45:35 -06:00
Steve Harris	73966efbac	Merge branch 'master_13.5.3' into omaha_13.5.3 ... Former-commit-id: 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 4190ddf39b [formerly b62ab264f0 [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]]] Former-commit-id: 4190ddf39b Former-commit-id: 97466112f596932da4595e1e089695d5218ac848 [formerly 590d7de15d] Former-commit-id: 0822dd1682	2013-11-11 11:40:03 -06:00
Steve Harris	155831d8d2	13.5.3-6 baseline ... Former-commit-id: aa30ebfea8 [formerly 11ca17a63c] [formerly 77a45660d5] [formerly 5fa893d37b [formerly 77a45660d5 [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]] Former-commit-id: 5fa893d37b Former-commit-id: 2ec2397f40dee7ff2d4d5b8e509eb1e661a33c78 [formerly f31112871c] Former-commit-id: 8705c4779b	2013-11-11 12:34:10 -05:00
Max Schenkelberg	ad9578db6f	Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing. ... Change-Id: Ic82f45447113425a08909be4c5229502882db022 Former-commit-id: 752c9574b4 [formerly 2f794486e3] [formerly e58a5df04b] [formerly bd903f6641 [formerly e58a5df04b [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]] Former-commit-id: bd903f6641 Former-commit-id: f684ed2d6192fd370d5f9876f88c4494c40afb31 [formerly c85532a180] Former-commit-id: 3f3b244b0d	2013-11-11 11:09:00 -06:00
Nate Jensen	80b165f0f9	Merge "Issue #1314 removed common.spatial plugin" into development ... Former-commit-id: 78ba2b302e [formerly 0c25fe98bd] [formerly 0dbc31b756] [formerly 06acf1b8a0 [formerly 0dbc31b756 [formerly 823cb0e07793ec5baa1863088634a312364b3d8b]]] Former-commit-id: 06acf1b8a0 Former-commit-id: 1196c0ab88a8de7b7a6280832fbc6d81e340a440 [formerly de2623e273] Former-commit-id: 06c24325c1	2013-11-11 08:48:44 -06:00
Brad Gonzales	516426e13f	Issue #2506 Refactored RegistryEvent constructors. ... Amend: Added call to default constructor in Event initialization constructor. Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454 Former-commit-id: 6e7c6c980a [formerly adc09b748d] [formerly 9e8420b216] [formerly d80183edc1 [formerly 9e8420b216 [formerly f4cb28f209073788a3c329c44283c8c8cf3bf70f]]] Former-commit-id: d80183edc1 Former-commit-id: 033425fcb7988c579bf7a0bdbe5c72e806d56c5e [formerly 86f5c2b6ec] Former-commit-id: 04c4b2a4cd	2013-11-08 15:46:40 -06:00
Brad Gonzales	458698d0a2	Issue #2506 fixed issues with shared distributed ingest. ... Amend: Updated comment in StoreRetrievedData. Removed separate messageing to clear BandwidthSubscriptions. Add fix and test case for SBN deserialization with content following the ending xml tag. Removed unneeded changes. Added XmlWMOMessage class. Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd Former-commit-id: 3c24f30ae8 [formerly 80fd8a2ad4] [formerly fe15e874f7] [formerly e2fb158757 [formerly fe15e874f7 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]] Former-commit-id: e2fb158757 Former-commit-id: d52ca16c4b5860cf95891f8b6102ecc6f6d96bd1 [formerly 28d8aa5151] Former-commit-id: e802b866dd	2013-11-08 15:29:05 -06:00
Nate Jensen	f043b92e20	Merge "Issue #2361 remove SerializationUtil from SoundingPrefs" into development ... Former-commit-id: d0d76c8981 [formerly 76ccc6f8f7] [formerly 89a650d94a] [formerly f57cc4ab8f [formerly 89a650d94a [formerly 2622cf7de4bfa09734e8a0acca402ffb5f8b1fcb]]] Former-commit-id: f57cc4ab8f Former-commit-id: c28ed7e73c017daac9313c88ab918f647433c97a [formerly 24d83fcb9a] Former-commit-id: 6228d02608	2013-11-08 14:45:22 -06:00
Brian Clements	715edf805e	Issue #1314 removed common.spatial plugin ... Moved KeyLocker to common.util Updated query store to use read write lock Former-commit-id: 4a97229443 [formerly f994d9924d] [formerly 8142ff770f] [formerly 04791b7939 [formerly 8142ff770f [formerly 4f3d7e982a34f17fdf8cd80f025da176f939a3b1]]] Former-commit-id: 04791b7939 Former-commit-id: e1ff87a68f53adadd668ab79157a662d8a5660e4 [formerly f96f92df0b] Former-commit-id: 90682b4beb	2013-11-08 13:43:52 -06:00
Richard Peter	24d8b6b5d3	Merge "Issue #2361 fix saving hydro table objects" into development ... Former-commit-id: 4400d1f8c5 [formerly 931e583990] [formerly bded464ccf] [formerly cf261df489 [formerly bded464ccf [formerly 8a326cda9dd0b801f0bbaf779d6548f42078c0a5]]] Former-commit-id: cf261df489 Former-commit-id: 99ca53d06fe751276c6ea8d3ec5293ff04488f9e [formerly 9bb4f8dd7f] Former-commit-id: d54bdf1094	2013-11-08 13:26:06 -06:00
Nate Jensen	398524b7e2	Issue #2361 fix saving hydro table objects ... Change-Id: I38e6cd44359c60e88132b297beee66cede0437de Former-commit-id: f5b461908d [formerly 040f022e5d] [formerly 7a27264094] [formerly 08441efbb7 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]] Former-commit-id: 08441efbb7 Former-commit-id: 0f1cb8fd2bdb23523f68173edb6fddf6e99b2e4e [formerly 4958732cb2] Former-commit-id: 399265e3f8	2013-11-08 12:37:26 -06:00
Nate Jensen	5d97357d55	Issue #2361 remove ISerializableObject from persistence path keys ... Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16 Former-commit-id: 6c82fc1303 [formerly 0e4a1d9ced] [formerly 02d26d0f84] [formerly 44a6d5b302 [formerly 02d26d0f84 [formerly 044f4fd87a83d6b83eef7f46854f1b484536c825]]] Former-commit-id: 44a6d5b302 Former-commit-id: a61da77e3f2fe75d073103685c78688e9c49adaf [formerly 3ea850b9da] Former-commit-id: b10cc7b9b0	2013-11-08 12:30:39 -06:00
Nate Jensen	cb0d280f07	Issue #2361 remove SerializationUtil from SoundingPrefs ... Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991 Former-commit-id: ce69843d03 [formerly b01f5697d3] [formerly c3b37bcb7b] [formerly e9ca44ee64 [formerly c3b37bcb7b [formerly eab1cf126b79ec5708facf2b2c9a303fca8a24fe]]] Former-commit-id: e9ca44ee64 Former-commit-id: e0e97718894af1cacca9e7ad90e6c0f06ab94bc9 [formerly 56335703ac] Former-commit-id: f58ec24a85	2013-11-08 12:13:50 -06:00
Nate Jensen	cfce0fd9e2	Issue #2361 fix map style preferences ... Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049 Former-commit-id: f4167f3a52 [formerly 058c963aa2] [formerly 21d6bdb1f91d0f7bfbf0a28ffaa3009b713412c1 [formerly ec319b7dd0]] [formerly 43bbf31347 [formerly ec319b7dd0 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]]] Former-commit-id: 43bbf31347 Former-commit-id: 58a28ee555fbdc72d3afed2a0051022d9f1408dc [formerly 5ecde78b02] Former-commit-id: 8a27263b0c	2013-11-08 10:38:11 -06:00
Richard Peter	a57b316541	Merge "Issue #2361 remove viz.grid ISerializableObjects" into development ... Former-commit-id: dcb0258a74 [formerly 44818e3dbd] [formerly 214a72ac69] [formerly bb0dcf6d4a [formerly 214a72ac69 [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]] Former-commit-id: bb0dcf6d4a Former-commit-id: 90c1adbc58241688caf304cfe406e22783c132df [formerly 1909b0d06b] Former-commit-id: 990053c1fb	2013-11-08 10:35:41 -06:00