Commit graph

143 commits

Author SHA1 Message Date
Richard Peter
aa305777de Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly 2946e97294 [formerly 6eb11703e4 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]]
Former-commit-id: 2946e97294
Former-commit-id: 0ae1b55321 [formerly 7c9b9b0237] [formerly 111af45a80d6a0af8bd6a302b734f70ab8d8f912 [formerly 878cbe1695]]
Former-commit-id: c079a8a182f031460dd573dd9af4bb06ff087f91 [formerly 4f61e88c6f]
Former-commit-id: 7a41e41ca9
2013-01-28 15:27:23 -06:00
Steve Harris
379a9dd95c Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]]
Former-commit-id: 827611474f
Former-commit-id: 1397f8a811 [formerly a85c81289e] [formerly b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]]
Former-commit-id: f2d8f7cd1be3a2bba4584db2da805b450fce002a [formerly 895b25bac4]
Former-commit-id: a7d7847b06
2013-01-25 10:54:51 -06:00
Nate Jensen
20549bfc31 Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 705bfb0755 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 9fb144f73e [formerly 04a397866a] [formerly 7e4143b4d4e1d3ad304dded5581543897cc27dd0 [formerly fa27552c9b]]
Former-commit-id: fab84284a623721ba923b4339c1fe692ec1f2c99 [formerly 8726a77052]
Former-commit-id: ddf1360954
2013-01-24 16:41:02 -06:00
Max Schenkelberg
f6a854755a Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
Amend: Only register product alerts in thin client if JMS is not disabled

Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2

Former-commit-id: 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly b6a29c38a5 [formerly 9655d64069 [formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]]]
Former-commit-id: b6a29c38a5
Former-commit-id: c709c91154 [formerly ecce9be8ce] [formerly 52f3bdc976aa7b28a5a0097fdc6d4d6c63530fb5 [formerly 11c8dd6fff]]
Former-commit-id: 75e5474b19b240758634d24dabc0961fd75c2813 [formerly 12318158c2]
Former-commit-id: 8bfa47f929
2013-01-23 16:50:17 -06:00
Steve Harris
b30f963db9 Merge branch '13.2.1_delivery' into development
Former-commit-id: 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 1718a19f2d [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]]
Former-commit-id: 9b6cc68601
Former-commit-id: b33edc1373 [formerly 764efdb8b8] [formerly 85fb1ad709c9c553a8e608e531581ff213d0b779 [formerly c7148da94d]]
Former-commit-id: f23a16bd0977557a616aa8dd06c01d27db2c4f5b [formerly 6964c16be7]
Former-commit-id: 7063a0c8d2
2013-01-22 21:47:09 -06:00
Max Schenkelberg
09f301958d Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized.
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390

Former-commit-id: 1944f4f81d [formerly 8058260830] [formerly 5c51083f35] [formerly 1944f4f81d [formerly 8058260830] [formerly 5c51083f35] [formerly 6fd6b2e42d [formerly 5c51083f35 [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 004f5213e1 [formerly 3d459dd57c] [formerly 79bd5d81a31d638d24e6343dd5e7a7bedd4ae7c3 [formerly 2c05f3c179]]
Former-commit-id: 67f0be97b9bd51c009176c4f3dc90364eecc1921 [formerly 75135bf8f6]
Former-commit-id: babef87edb
2013-01-21 14:58:16 -06:00
Ben Steffensmeier
aeeae8dde3 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly ec199ad7d1 [formerly f0af056d97 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]]
Former-commit-id: ec199ad7d1
Former-commit-id: d270c16979 [formerly 50d1561165] [formerly 08da3e13f0dfa4e1eab04881e0b72815afc9b88a [formerly 3bfba5b771]]
Former-commit-id: 378f6595a0ecbd00464d01161dfb30503bf9e8c4 [formerly ca6ab4a945]
Former-commit-id: 8d6d821ac0
2013-01-18 10:59:43 -06:00
Roger Ferrel
815dd12ad9 Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 96deac5f43 [formerly 86d51634dc] [formerly ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]]
Former-commit-id: 06cef0013d52ca86020642bf82ef1a6b6988048f [formerly 722708105f]
Former-commit-id: 0435636b1e
2013-01-16 16:53:29 -06:00
Steve Harris
e77b0896ee Merge branch '13.2.1_delivery' into development
Former-commit-id: e87c1739ce [formerly 79e7b50d94] [formerly 8c447659ff] [formerly e87c1739ce [formerly 79e7b50d94] [formerly 8c447659ff] [formerly 483e55bcef [formerly 8c447659ff [formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]]]
Former-commit-id: 483e55bcef
Former-commit-id: bda3371aef [formerly b8ab464cee] [formerly 1f1108e1b07236a5416fa8b9d145b56652782043 [formerly 2e34a82690]]
Former-commit-id: 8b7928ea064b9023438dda6e63c688f3a7d1c069 [formerly 77662c1de0]
Former-commit-id: f1164c96a7
2013-01-16 12:03:50 -06:00
Bryan Kowal
d9c01fe8a0 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 49b121ed3a [formerly 38480e46b1] [formerly 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121]]
Former-commit-id: 64fa164a62368e1ef375932fe20cd65b2d0ba6fb [formerly 290167ac16]
Former-commit-id: 89cc2bdf57
2013-01-15 14:56:01 -06:00
Lee Venable
717642416f Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
Former-commit-id: 1578950906 [formerly a3c5aded12] [formerly 32692a6def] [formerly 1578950906 [formerly a3c5aded12] [formerly 32692a6def] [formerly f63da5aba6 [formerly 32692a6def [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]]]
Former-commit-id: f63da5aba6
Former-commit-id: e5e1841b7e [formerly c4291fcb2a] [formerly 2d8f8827471d802ee24a1d297aac5aed42839e14 [formerly 5a733e465d]]
Former-commit-id: c63b057f5dee3a652c87b56e1ae096143f3c4b3f [formerly b8c01b939b]
Former-commit-id: ed28295ec1
2013-01-15 14:47:49 -06:00
Max Schenkelberg
7f857992b6 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly aa88b83859 [formerly 02e7c79de9 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]]
Former-commit-id: aa88b83859
Former-commit-id: cea378c445 [formerly 410abb1144] [formerly 451ec6f6d7261a1c251d7e39253fc41e3af7c367 [formerly c6b6823228]]
Former-commit-id: 12984637b106529c3322a63eb74880567de70ad5 [formerly f35d30e675]
Former-commit-id: 5d6421259b
2013-01-15 14:13:36 -06:00
Ben Steffensmeier
405ec460f7 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 1926965b6b [formerly da79be73a2] [formerly f49e77f7df] [formerly 1926965b6b [formerly da79be73a2] [formerly f49e77f7df] [formerly 2e10a8408b [formerly f49e77f7df [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]]]
Former-commit-id: 2e10a8408b
Former-commit-id: 2ebe93dc12 [formerly 3d63fa24a1] [formerly 2adb2b2db42f9a0a161c689d6a3b7ec66791bb64 [formerly 0a0d230091]]
Former-commit-id: b77bd47a9b61a62d7e87a9111d90036d52bba942 [formerly fcc71cc31d]
Former-commit-id: 88ac5805b6
2013-01-14 17:44:46 -06:00
Ben Steffensmeier
0c5c4cb9a9 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly cf8a9e3f64 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]]
Former-commit-id: ac9ba67919
Former-commit-id: dea702c873 [formerly c1ae999c81] [formerly c92b1fa2bb66c18a0319bba6df102f7c8450428d [formerly 147a379a81]]
Former-commit-id: 73a388037366997d5eca653a47b9832fd79df51c [formerly 6b95c98e8e]
Former-commit-id: 08311ccdf5
2013-01-14 14:30:17 -06:00
Ben Steffensmeier
27622d6418 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 211a9b6cee [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]]]
Former-commit-id: a1afabe4e3
Former-commit-id: 3f17e60975 [formerly 3b72ea7f19] [formerly b4a7ccd68b59466072f1a849836b8ea6dc674c1c [formerly 7b6bc3f69b]]
Former-commit-id: 46afb2158f8811cd347ebf0a531a9452e01d8c91 [formerly d2667da4b9]
Former-commit-id: cbebc15454
2013-01-11 11:46:32 -06:00
Ron Anderson
dc5fa4c736 Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 7b8eba7461 [formerly 37d6ed5232] [formerly 145665c496] [formerly 7b8eba7461 [formerly 37d6ed5232] [formerly 145665c496] [formerly 3df3cf7f7b [formerly 145665c496 [formerly cae505a088e959670f4cacb92e439a82f13559b9]]]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 1b4acc66e9 [formerly 2c364744bb] [formerly 394db5ca0b53e186b2f8d6e2619a70bcb1da53e8 [formerly 1f298b87b5]]
Former-commit-id: 8396f507c830310fd1ab818538d4d58fee56ff7c [formerly d855e9ada0]
Former-commit-id: b6bb0a5319
2013-01-10 10:00:56 -06:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Dustin Johnson
ee8e3c1b75 Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: 393f51fe1b [formerly f5f6884b79] [formerly 452729a647] [formerly 393f51fe1b [formerly f5f6884b79] [formerly 452729a647] [formerly 19f1b30437 [formerly 452729a647 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]]
Former-commit-id: 19f1b30437
Former-commit-id: 34fea3d53a [formerly cdf08ea65a] [formerly de7f6eddfab0e5e6cb4cd6a0a89817af6d81ac7a [formerly 818664e557]]
Former-commit-id: ed5a671e6262c6d9d859eb31d20e0f2000aeb165 [formerly a29d38f5f9]
Former-commit-id: 3d9c459c10
2013-01-04 12:34:43 -06:00
Dustin Johnson
2f4c4ecb1d Issue #1449 Add interface in front of VizApp task running methods
Change-Id: I4696782d800a836f347cf72738c6c0673314a492

Former-commit-id: f7127d12f3 [formerly f6e081d331] [formerly b9c9030d05] [formerly f7127d12f3 [formerly f6e081d331] [formerly b9c9030d05] [formerly dc61af2dea [formerly b9c9030d05 [formerly 3ed5c31344148559c0e5479f4b7955fcee7cb0a7]]]]
Former-commit-id: dc61af2dea
Former-commit-id: 7f958ac71d [formerly 853ea19014] [formerly a3e4e685d352ecc229c5ffe510888c363f9a3dc9 [formerly 19cdf2f57c]]
Former-commit-id: 2fcaa691592b6f8420a274a31e7a166814158f1f [formerly 05951d66c6]
Former-commit-id: 1bc5b09603
2013-01-02 11:01:15 -06:00
Max Schenkelberg
c257a7f5ed Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 373de78320 [formerly b4952b003a [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]]
Former-commit-id: 373de78320
Former-commit-id: 754fe67e13 [formerly 886c39f5a4] [formerly 94aad176091cd344656ab44ae8b6a7db61c25bf6 [formerly adf6aed592]]
Former-commit-id: c59b073430cdcff78da21b53fe38f82a966c2e90 [formerly c18d3486eb]
Former-commit-id: 7f708ac427
2012-12-17 17:05:34 -06:00
Max Schenkelberg
8f83ab09b5 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]]
Former-commit-id: 5db71ca943
Former-commit-id: cf9e6ff3b2 [formerly d43e0c1c25] [formerly e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909]]
Former-commit-id: 56e64154314976881dc1506547d9d9b8c9f9f150 [formerly 206116ab66]
Former-commit-id: 2030832669
2012-12-12 11:39:32 -06:00
Steve Harris
db5990243a Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]]
Former-commit-id: ce72ebb094
Former-commit-id: 88f9070c93 [formerly 15849ae72a] [formerly 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]]
Former-commit-id: 90d18a302d7bff79b3ebe72d11d8f08efc5f661a [formerly db24093e42]
Former-commit-id: 868acb808b
2012-12-11 08:56:54 -06:00
Steve Harris
179755f156 Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
2012-12-11 08:45:53 -06:00
Nate Jensen
87e33eb8c2 Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 52b55cdf65 [formerly 851f8977f3] [formerly 020b84e373] [formerly 52b55cdf65 [formerly 851f8977f3] [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 020b84e373 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]]]
Former-commit-id: 03e6f7ee16
Former-commit-id: adad056c53 [formerly 7c0941e292] [formerly db935f8f15b87218882a4babaf96d3d58289cbba [formerly 496fa1ede9]]
Former-commit-id: 502d457e7e9a9564188a34109c31a23d6b0411b1 [formerly c1de3bcff5]
Former-commit-id: 0ffbeecd4e
2012-12-07 11:59:13 -06:00
Ron Anderson
464ceb1658 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly b6fcd999f4 [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]]
Former-commit-id: b6fcd999f4
Former-commit-id: 7c09ef9001 [formerly c5b3111795] [formerly a37aae4d7e209290f67a1eb565eee632c0e19fd2 [formerly 70cca3900b]]
Former-commit-id: 341f47a5a9d882b376fc4121ea445322390c9a2b [formerly 111c0495a4]
Former-commit-id: b02f3a733f
2012-12-06 17:02:56 -06:00
Ron Anderson
d582b42490 Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 03dff87b0d [formerly 330e913cb2] [formerly 5143e82d4a] [formerly 03dff87b0d [formerly 330e913cb2] [formerly 5143e82d4a] [formerly 9398573f2f [formerly 5143e82d4a [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]]]
Former-commit-id: 9398573f2f
Former-commit-id: 76141bfc05 [formerly d42afa44dc] [formerly d82c8ff0301aef55921e5f77656fa41a6963ce17 [formerly 10479a1909]]
Former-commit-id: 793c4a33d940970a3c242820b41e2fe8e3155183 [formerly ddd26d1fbd]
Former-commit-id: bb50fa220a
2012-12-06 15:38:04 -06:00
Dustin Johnson
60f5576f5e Issue #1377 Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: eda8a2208f [formerly 6d1831b002] [formerly bba092f51e] [formerly eda8a2208f [formerly 6d1831b002] [formerly bba092f51e] [formerly 529238d010 [formerly bba092f51e [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]]]
Former-commit-id: 529238d010
Former-commit-id: 46c2b31f91 [formerly 5953c5372f] [formerly a57882853f80c6e174dda103c8aec580f19821e6 [formerly 1b165c8e73]]
Former-commit-id: 500c5eb369844a461c4870f114119e1e9ecc28b9 [formerly 5731299558]
Former-commit-id: 5f51b0b3f8
2012-12-03 12:06:32 -06:00
Max Schenkelberg
8215537399 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]]
Former-commit-id: ed77d56a84
Former-commit-id: 1f8c88490a [formerly f681c1304c] [formerly 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]]
Former-commit-id: c5ee37a2251945312e76e97b444e5dc6495a440a [formerly b8b98a78c3]
Former-commit-id: a7b239f9c1
2012-11-29 10:29:36 -06:00
Nate Jensen
7088298f2a Issue #1323 fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: f2ff0e89ca [formerly cbb77b884b] [formerly d76ab40583] [formerly f2ff0e89ca [formerly cbb77b884b] [formerly d76ab40583] [formerly f24fcc07cf [formerly d76ab40583 [formerly db083d70f18b771740f73ecb787c103b5264881d]]]]
Former-commit-id: f24fcc07cf
Former-commit-id: c5a27b653a [formerly 8a4544a632] [formerly 77af90edc781818f265653aebd82cbfac24f0a3f [formerly 10be056dcb]]
Former-commit-id: 280d92a4aa3d7b711b4e708b2a25452d4db9ed35 [formerly 2385f6223a]
Former-commit-id: 2621f23dfa
2012-11-27 09:07:07 -06:00
Dustin Johnson
a4b4e67a64 Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly a9d01486ed [formerly 13b1683458 [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]]
Former-commit-id: a9d01486ed
Former-commit-id: add45e6805 [formerly dd03bf9bd5] [formerly c8e8f27647ef18ecfbb5e4b6ae6a9f36c8133dea [formerly 1bb69653af]]
Former-commit-id: d71f218208ec47f1958e84baa204371a3d055b80 [formerly f91817813d]
Former-commit-id: 5b64ddb7ba
2012-11-19 13:21:03 -06:00
Dustin Johnson
064ecbb159 Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 8a6be78eb0 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 9b9f41cb5a [formerly a448369b44] [formerly 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994]]
Former-commit-id: 960ecc6840d0a9a5daf8843cf376de88f65aa067 [formerly 2afb19d76b]
Former-commit-id: 08f3910ece
2012-11-16 14:43:45 -06:00
Max Schenkelberg
f980bf1d4f Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly f540f65fd7 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]]
Former-commit-id: f540f65fd7
Former-commit-id: d86550c239 [formerly db2fe0b5e8] [formerly 6ed55cce2d899bb904eca4a9886c9f8d39f745d2 [formerly f1866b2e49]]
Former-commit-id: b6193bec079d86df90df890267f3f0fecb331b78 [formerly 7ffce5cd45]
Former-commit-id: a94b9c173d
2012-11-15 16:21:42 -06:00
Max Schenkelberg
ecde93e6fc Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]]
Former-commit-id: 28e61c8285
Former-commit-id: 91607fb03e [formerly 5aa26e4f13] [formerly 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799]]
Former-commit-id: 2d176fd248163b3e85988708b437bfc1e899b487 [formerly 429ddc7312]
Former-commit-id: eec401909b
2012-11-14 16:19:37 -06:00
Max Schenkelberg
9de9bb8cb1 Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]]
Former-commit-id: 00822a4f39
Former-commit-id: 25f5a9b1aa [formerly 4408af827f] [formerly 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]]
Former-commit-id: ce52baa9c7936da99037dab8b484c380e17a0b39 [formerly 9a13824af2]
Former-commit-id: c6b516ff9e
2012-11-12 16:46:21 -06:00
Dustin Johnson
eb82c7672b Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
2012-11-08 09:57:16 -06:00
Max Schenkelberg
3a1cefc612 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]
Former-commit-id: ca4177dd08
Former-commit-id: f9e6347863 [formerly 5a5bd522a1] [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]]
Former-commit-id: 0f95dc114844e36c224300902fd5c26ef83108c0 [formerly 50625b0453]
Former-commit-id: 2345861756
2012-11-07 10:44:42 -06:00
Dustin Johnson
4bc4d95b21 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
2012-11-01 13:36:06 -05:00
Steve Harris
856a26b5a9 Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 21136b0560 [formerly 18ec4b5933] [formerly 34e7b3f4a3] [formerly 21136b0560 [formerly 18ec4b5933] [formerly 34e7b3f4a3] [formerly 8703ff00c7 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]]]
Former-commit-id: 8703ff00c7
Former-commit-id: 6a81945d07 [formerly 31253e2949] [formerly a128d53471bbb82cdb98a297cb2308d5a1ee6417 [formerly dc5eba737d]]
Former-commit-id: 3fd432466308c3a7db4ae61099388f48370c782f [formerly ea34163a1c]
Former-commit-id: 52409eaef5
2012-10-17 08:21:19 -05:00
Steve Harris
ec74d87147 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]]
Former-commit-id: 751563e331
Former-commit-id: d88afce365 [formerly d0e91329b4] [formerly 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]]
Former-commit-id: 188da5301da8f47f50c81e58f02ec2fbae69747e [formerly ad78266035]
Former-commit-id: 1e4c737ff2
2012-10-16 15:48:14 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Nate Jensen
b625256d61 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 446d7f5f13 [formerly 93143bbda0] [formerly c35558c0281157096518a8d9e3647aa801d78a21 [formerly 5bdf9d4d38]]
Former-commit-id: 39c9b14c28231eba502ff6ceadb2e1e6bddcb180 [formerly 319c4cda2b]
Former-commit-id: 1efcd36987
2012-10-12 15:16:27 -05:00
Roger Ferrel
434b124dc0 Issue #1248 Changes to allow change listeners on Alter Bundles.
Changes from code review 2.

Change-Id: I8f8640a9c90c0191179c74570855a67370617a20

Former-commit-id: a001e54a85 [formerly 65a19e48b0] [formerly e7d27f4aab] [formerly a001e54a85 [formerly 65a19e48b0] [formerly e7d27f4aab] [formerly 03070aded9 [formerly e7d27f4aab [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]]]
Former-commit-id: 03070aded9
Former-commit-id: 0653f130b8 [formerly 09bb914dc0] [formerly 1db773c056a395caee481c1f3227dcbac2e92bae [formerly f4861554cd]]
Former-commit-id: 0e45533af831d494fc18a8addc39159b04f67275 [formerly 8982e1baf9]
Former-commit-id: 7044db959a
2012-10-10 06:52:09 -05:00
Steve Harris
92a6b72092 Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: a6c3e16c69 [formerly 7be572b27d] [formerly 8c97afe03b] [formerly a6c3e16c69 [formerly 7be572b27d] [formerly 8c97afe03b] [formerly 0895f22690 [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]]
Former-commit-id: 0895f22690
Former-commit-id: d6f07f7013 [formerly 48a80a23e4] [formerly 0ccc977e5162ad8a17c1a30f58a15fa4f27ad13b [formerly 8dae024430]]
Former-commit-id: c55ffde48719b1c578dec26d2fc1779c951daf3e [formerly 8c81601905]
Former-commit-id: 198eca2a6c
2012-10-08 13:29:34 -05:00
Steve Harris
75d99f4e93 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 6e0b2c55d7 [formerly 772c60efa4] [formerly 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]]
Former-commit-id: 8fe8231e2d1c3ba8a832320dad34957e6a59e8fe [formerly e72b6d5da6]
Former-commit-id: ff9321e3ce
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
ca90ca3250 Issue #1151 move alert parsing into the resource data so that it can clear the time cache for derived alerts.
Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8

Former-commit-id: c3d732b9dd [formerly b4d7183cdd] [formerly 42ae490a50] [formerly c3d732b9dd [formerly b4d7183cdd] [formerly 42ae490a50] [formerly b6e124f830 [formerly 42ae490a50 [formerly 4f648f3ea23cd2d300bb92228e20d7f2678718fd]]]]
Former-commit-id: b6e124f830
Former-commit-id: 32ebb2c4c7 [formerly fdddbebddc] [formerly 7bcd6df46a77a7bee1474c158e30b4e4396a5765 [formerly 2cdb3553e9]]
Former-commit-id: 11c7ab5c1efeb9749df79836357675f497bd3509 [formerly 542aca681b]
Former-commit-id: bee77d6299
2012-10-05 14:28:35 -05:00
Steven Harris
db663faca9 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
2012-09-27 15:57:45 -05:00
Max Schenkelberg
818de10899 Issue #1214 Made VizGlobalsManager check for null window before calling getPage() since getInstance() still returns succesfully when null window is passed in. Change TimeMatchingJob to be shutdown when core plugin stops and cancels existing jobs.
Amend: Removed println

Change-Id: I3559b13074eb025e9bf931685cda3e804037baff

Former-commit-id: 8a9ba0178b [formerly 51e565c6ff] [formerly 4b2467e639] [formerly 8a9ba0178b [formerly 51e565c6ff] [formerly 4b2467e639] [formerly edfd7fd22f [formerly 4b2467e639 [formerly fc617c1392d9585d2e91e371af74aad4b24acfbb]]]]
Former-commit-id: edfd7fd22f
Former-commit-id: 2eaaa36856 [formerly f0376e0240] [formerly 6c26ac1dfaab3d2a090ad759e28fbd78f175087c [formerly 63c30eafc2]]
Former-commit-id: 2adf458bec2f11f2c0f950eb4d1d474a0b85a51a [formerly e021aee0c8]
Former-commit-id: 471e8249b2
2012-09-24 15:39:18 -05:00
Steve Harris
7018fef5a9 Merge branch 'development' into Enhanced_points and Enhanced_points into development
Former-commit-id: 912cec518b [formerly c64e9b0ad9] [formerly 72ecefa9ee] [formerly 912cec518b [formerly c64e9b0ad9] [formerly 72ecefa9ee] [formerly fe92909f53 [formerly 72ecefa9ee [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]]]
Former-commit-id: fe92909f53
Former-commit-id: 61bb5bf595 [formerly 91f26b6c0e] [formerly 0d6cc0b3ec0875f61bc7bd95203b177595d2ed5c [formerly b8d2ff47ca]]
Former-commit-id: ea273be86b5f19270ed6c4f2c3a06627b8ee3281 [formerly f9166b9d83]
Former-commit-id: ff96578fb4
2012-09-17 14:58:23 -05:00
Bryan Kowal
faa2bbda20 Issue #1181 - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: cff13f2294 [formerly 9915d4c006] [formerly 77d12d0275] [formerly cff13f2294 [formerly 9915d4c006] [formerly 77d12d0275] [formerly 3a037ffd49 [formerly 77d12d0275 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]]]
Former-commit-id: 3a037ffd49
Former-commit-id: 0ab345e17f [formerly 9dc8747553] [formerly 87357daeaaf9ea2895f17d4854007267e21c00d1 [formerly f516e61f20]]
Former-commit-id: 1d8a42cac7558e4c00a06f158c06ba66408d14c0 [formerly 219c939169]
Former-commit-id: eaca9d0306
2012-09-14 12:25:41 -05:00
Steve Harris
01248e7101 Merge branch 'development' into Enhanced_points
Former-commit-id: b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly 6146f56ce4 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]]
Former-commit-id: 6146f56ce4
Former-commit-id: 92bac7167a [formerly bc86013d8f] [formerly 1519ecf79b5f70bd2a5878e760356c231a28383c [formerly 9ca736f901]]
Former-commit-id: 8426fe487b6ac801ec3e1fdc9e8591d2f018b9cf [formerly 69b6272658]
Former-commit-id: 40ddaa276f
2012-09-13 15:25:12 -05:00