Commit graph

25 commits

Author SHA1 Message Date
Richard Peter
5350b3eac8 Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960 [formerly ff87317bd4] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480]
Former-commit-id: de624d87d3
2014-04-14 13:10:11 -05:00
Dave Hladky
36bc408bc2 Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]]
Former-commit-id: 39f97723d6
Former-commit-id: 14f2c99e46 [formerly 39f5579103] [formerly d5d37d7b55d86fa82a363075d901e0a1583e45de [formerly 2b998409f5]]
Former-commit-id: d275e71a9e574bd23d396da26d9a5eaa6435dea7 [formerly 8e2eb4d255]
Former-commit-id: 59590fdf36
2014-02-05 14:49:26 -06:00
Brad Gonzales
7e84f1a451 Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
Amend: update from peer review.

Change-Id: I1986de99319fdecd21a94579c499266b048d382a

Former-commit-id: 208d18e28e [formerly afbaf72617] [formerly e94023097e] [formerly 208d18e28e [formerly afbaf72617] [formerly e94023097e] [formerly 02f9fd20dc [formerly e94023097e [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 07eac8a84d [formerly 71a32928d9] [formerly 44dcb29c662d33832c30a88262faccc81d37a10a [formerly a40afbe8ac]]
Former-commit-id: e98e41995555ae6eff555a6489dfa8be21dda1aa [formerly f7c3c8c83d]
Former-commit-id: 7707be3dcd
2014-01-26 20:31:38 -06:00
Brad Gonzales
69f2e8a94a Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28

Former-commit-id: dd09d84c73 [formerly a2fbcecef6] [formerly 3e3fcfa9af] [formerly dd09d84c73 [formerly a2fbcecef6] [formerly 3e3fcfa9af] [formerly 46a2a5f70f [formerly 3e3fcfa9af [formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]]]]
Former-commit-id: 46a2a5f70f
Former-commit-id: 26c902d957 [formerly 7e608842b2] [formerly 4a9c736666cc3f62be99481509da930add8b7094 [formerly a1429a3911]]
Former-commit-id: 89b9939480bd370d75e57032e518294ed0d2c802 [formerly d2fac3ed56]
Former-commit-id: 15bcc55822
2014-01-15 17:16:47 -06:00
Richard Peter
052119fffe Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: f2d99af20e [formerly 5905c5d08d] [formerly 2085a9cd33] [formerly f2d99af20e [formerly 5905c5d08d] [formerly 2085a9cd33] [formerly fbda83aeb9 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]]]
Former-commit-id: fbda83aeb9
Former-commit-id: 14ed9331d3 [formerly 670e63d0dd] [formerly 92cc0eed5d5ca22d3b43329858c1619c9363e66a [formerly f7f9a4e57c]]
Former-commit-id: 5edc348b297d22aeb20b7b1cbe81e90329464d25 [formerly ff5fbcf012]
Former-commit-id: 90e23f5c6b
2013-12-03 11:41:21 -06:00
Brad Gonzales
afe5db430d 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 3c24f30ae8 [formerly 80fd8a2ad4] [formerly fe15e874f7] [formerly e2fb158757 [formerly fe15e874f7 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]]]
Former-commit-id: e2fb158757
Former-commit-id: 458698d0a2 [formerly e802b866dd] [formerly d52ca16c4b5860cf95891f8b6102ecc6f6d96bd1 [formerly 28d8aa5151]]
Former-commit-id: 59d91bce9376593b0a8507fe193efa14b5311c75 [formerly f017bee2f2]
Former-commit-id: 837664eea1
2013-11-08 15:29:05 -06:00
Mike Duff
27409bd03a Issue #2450 - Send notifications to Notification Center when subscriptions expire.
peer review comments

Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653

Former-commit-id: a3931125da [formerly 2a97da896d] [formerly 00bb57b481] [formerly a3931125da [formerly 2a97da896d] [formerly 00bb57b481] [formerly f3d07a9185 [formerly 00bb57b481 [formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]]]]
Former-commit-id: f3d07a9185
Former-commit-id: 4a2d377291 [formerly ecaef4d639] [formerly 34a98de0a9a5f176bd195b64d5d776dae48eef59 [formerly cc3846be0b]]
Former-commit-id: 76ee46484cca60f12689d07b9d08fdf8fbbdbc0e [formerly 70fbb031a2]
Former-commit-id: 8a8eb6ba4e
2013-11-06 12:23:09 -06:00
Dave Hladky
e9dec56920 Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]]
Former-commit-id: 477fbd3d59
Former-commit-id: aa5fd1ba3f [formerly 9880c82a36] [formerly a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1]]
Former-commit-id: c88b0194e09755a944f026679b6a3c33a0aad9c3 [formerly 8a1f070927]
Former-commit-id: 33bd8d5cc4
2013-10-16 09:06:00 -05:00
Brad Gonzales
6242314838 Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals.
Change-Id: If1037781d8fbf0e3a88556ef4401fb77621187d7

Former-commit-id: b0779c9b4f [formerly 5ebe8ee093] [formerly 21c1b35c8b] [formerly b0779c9b4f [formerly 5ebe8ee093] [formerly 21c1b35c8b] [formerly d5ee61dc2b [formerly 21c1b35c8b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]]]
Former-commit-id: d5ee61dc2b
Former-commit-id: 030b466b8a [formerly 2468077e8b] [formerly 1f321bfc5353c97375cf29fe6b5a3b7362000fbf [formerly 780062acf3]]
Former-commit-id: d4831539fc28c09ade22bc75769737d060ad4fe3 [formerly e642fb330f]
Former-commit-id: b6745768de
2013-08-09 15:42:38 -05:00
Dave Hladky
a794258e6d Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03

Former-commit-id: 83c17aa05e [formerly 292a7a49dc] [formerly 776bbbba21] [formerly 83c17aa05e [formerly 292a7a49dc] [formerly 776bbbba21] [formerly 5512104d86 [formerly 776bbbba21 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]]]
Former-commit-id: 5512104d86
Former-commit-id: baa2c23f7c [formerly 8d0d10a4f1] [formerly ca6f59dfbdf94182cc17eec76951e9fefb7a9546 [formerly b401764a23]]
Former-commit-id: ef1fc366f8a78f8f78e1e0b1441ba64e94ba3f65 [formerly 6f5039cb43]
Former-commit-id: 90897f5ba5
2013-06-13 22:13:49 -05:00
Dustin Johnson
8ae74786c1 Issue #2038 Change datadelivery retrieval to be plugin contributable
Amend: Fix class name resolution, no arguments to metadata adapter constructors

Change-Id: I2c08563499a34996502d22f0f9685602b8897139

Former-commit-id: 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 55aeff3422 [formerly 4a8adeb80a [formerly fc6effe4993694944d5331038d24310dec44a5d8]]]]
Former-commit-id: 55aeff3422
Former-commit-id: d1552d578f [formerly 7ec3c6c09a] [formerly fc670c4505d46445bdd5ffc292571b65c25bcbdf [formerly 075c53763d]]
Former-commit-id: 8852d0761a2b6648b34348793d38aa751867d797 [formerly f9ba7dc5ab]
Former-commit-id: d62a0b863a
2013-05-31 12:19:07 -05:00
Dustin Johnson
ca4a64dee5 Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: ac8c2784ae [formerly 74d985af51] [formerly 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450]]
Former-commit-id: d6fa7618e1d515d026b04f58e34f197cb54bf5be [formerly 3dbb682493]
Former-commit-id: 03cbf9a455
2013-05-30 09:49:09 -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
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
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
Benjamin Phillippe
977a96e419 Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1

Former-commit-id: 1e30861a21 [formerly 30be5ce6f9] [formerly 115dc12790] [formerly 1e30861a21 [formerly 30be5ce6f9] [formerly 115dc12790] [formerly 2a14245dce [formerly 115dc12790 [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]]]
Former-commit-id: 2a14245dce
Former-commit-id: 0d769d03c0 [formerly 3cc6978718] [formerly 2e9d43de3c79391b705e7ea079b7e2665d9ca96f [formerly b0010de8ff]]
Former-commit-id: 1500101ef9ca19c8fd54bb60fa6990523169ff1b [formerly 5f8b73fadd]
Former-commit-id: 781b70a8cc
2013-03-27 17:12:52 -05:00
Dustin Johnson
173cc2b457 Issue #1794 Use a queue to hold ncf retrieval transfers
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: e8c9726d51 [formerly 3d87218f1a] [formerly b29eb94780] [formerly e8c9726d51 [formerly 3d87218f1a] [formerly b29eb94780] [formerly ebce91c15d [formerly b29eb94780 [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]]]
Former-commit-id: ebce91c15d
Former-commit-id: b0a2a23c78 [formerly e3a5458f1a] [formerly 28f3f246d64f321b17586c020ec5a8677085f92c [formerly c88d9dd6cf]]
Former-commit-id: 2a47b90eb6d779af665719641e4d0655f79997c0 [formerly 67f055ca39]
Former-commit-id: eaf2a061b5
2013-03-21 12:28:00 -05:00
Dustin Johnson
25efd81e23 Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

Former-commit-id: 9cbd54fb43 [formerly 2bd62ad4b6] [formerly 8107f76d98] [formerly 9cbd54fb43 [formerly 2bd62ad4b6] [formerly 8107f76d98] [formerly 547780f9a3 [formerly 8107f76d98 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]]]
Former-commit-id: 547780f9a3
Former-commit-id: 17a3c88acd [formerly 8c99bc1f17] [formerly 90ec3431ba959280681cdc1016aef6fcf5421ea5 [formerly 043f122356]]
Former-commit-id: 5995c0d49e8632dcdbd98fa104d9d26a0a175eda [formerly 13db762ae2]
Former-commit-id: 5464463722
2013-03-05 11:39:42 -06:00
Dustin Johnson
a6196589c5 Issue #1647 Configure NCF and WFO retrieval tasks
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4

Former-commit-id: 446e86bd19 [formerly 527ed01fec] [formerly de7f387248] [formerly 446e86bd19 [formerly 527ed01fec] [formerly de7f387248] [formerly bf9eefe961 [formerly de7f387248 [formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]]]
Former-commit-id: bf9eefe961
Former-commit-id: 9e2042e75e [formerly bbba19a26f] [formerly d153466292c80a218a52ecf3208c5a1da3cfaedd [formerly 81fcd0bc65]]
Former-commit-id: 3e34676190f1c18e9115c5330e55f0f2ebd66056 [formerly 680a65490b]
Former-commit-id: 665752eebe
2013-03-04 10:22:16 -06:00
Dustin Johnson
5b3735a110 Issue #1543 Use XML to represent retrieval
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor

Amend:
   Add call-through method to prepare for serialization.

Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d

Former-commit-id: dc3b521846 [formerly f16c1507d0] [formerly 437a168b50] [formerly dc3b521846 [formerly f16c1507d0] [formerly 437a168b50] [formerly 62a84aea76 [formerly 437a168b50 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]]]
Former-commit-id: 62a84aea76
Former-commit-id: 3110a88e0c [formerly 6f94c035e8] [formerly 9b75194ff411af8419ede2a4c14daf3b155c88ab [formerly db3a9d8f19]]
Former-commit-id: 731555484a02802af631aec74dd42c443654887f [formerly f6257b20ea]
Former-commit-id: 191ec3b408
2013-02-18 13:05:41 -06:00
Dustin Johnson
cca5e664c4 Issue #1543 Serialize DODS response rather than plugin data objects directly
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.

Amend:
   Peer review comments.
   Set retrieval status to failed when payload is null.

Change-Id: I458b13856302c8faceeef985c1c41115644520b7

Former-commit-id: 0bdaf0babe [formerly 25faaa2af0] [formerly dd8ca33fc4] [formerly 0bdaf0babe [formerly 25faaa2af0] [formerly dd8ca33fc4] [formerly d143735ea8 [formerly dd8ca33fc4 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]]]
Former-commit-id: d143735ea8
Former-commit-id: 018faeb591 [formerly 6f821ed8c9] [formerly ba20e1bd90048ad833da2d88ebbec80e0486dca1 [formerly 9783dc4d9f]]
Former-commit-id: c8bed06596d9d427b321f153a9723a4d98817a9a [formerly 922da948eb]
Former-commit-id: 1d80262cf9
2013-02-14 09:49:22 -06:00
Dustin Johnson
75eaa4cde0 Issue #1543 Clean up test files after changing to Spring transactions
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680

Former-commit-id: 4f5d6bc65c [formerly 651c6d55c1] [formerly 4bcd75c091] [formerly 4f5d6bc65c [formerly 651c6d55c1] [formerly 4bcd75c091] [formerly 19fd95d2c8 [formerly 4bcd75c091 [formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]]]]
Former-commit-id: 19fd95d2c8
Former-commit-id: ad99747ea8 [formerly 4a10957512] [formerly 6ab33d2052c840a4a5f0ae570b4700da2eac8923 [formerly b4367903b0]]
Former-commit-id: 2169ccf6f6caa4c42e2d094d2ff3047464e21f2c [formerly 084f5b7fdf]
Former-commit-id: 691e6d788e
2013-02-12 11:59:45 -06:00
Dustin Johnson
d9fe43006a Issue #1543 Add testing of current OpenDAP type retrievals.
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.

Amend:
  Peer review comments.
  Change to use Spring transactions.

Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366

Former-commit-id: c79c031f62 [formerly 0d548bd66f] [formerly 8307af022c] [formerly c79c031f62 [formerly 0d548bd66f] [formerly 8307af022c] [formerly ef32853dc1 [formerly 8307af022c [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]]
Former-commit-id: ef32853dc1
Former-commit-id: ae6a451422 [formerly 73a5667256] [formerly 143e062f3345112806fef29bb7754963c3fc28dc [formerly e504a474f9]]
Former-commit-id: a69874d13e21bedfe5a86f9a76cacb772976a779 [formerly e48bf48821]
Former-commit-id: 35b13ba973
2013-02-11 14:21:57 -06:00
Dustin Johnson
2f19170098 Issue #1543 Break apart the retrieval process to support SBN capabilities.
Made interfaces for various aspects of retrieval that are Spring injectable.
Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept.

Amend:
  Check whether debug is enabled prior to debug message.
  Move log of request xml inside null check.

Change-Id: I5e3fe835f028cb93c98abce9735d3d59cfc663dc

Former-commit-id: 3112fce540 [formerly cf063000ca] [formerly 3b20efeb7d] [formerly 3112fce540 [formerly cf063000ca] [formerly 3b20efeb7d] [formerly 1a17e4a0f5 [formerly 3b20efeb7d [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: 82c86df837 [formerly 2940a059d1] [formerly 3cb29f382d95ee1e760fcb5f018ec70b8bd3cb00 [formerly b5f69e21d8]]
Former-commit-id: 80d55cc82b3caa3784bcb0f5d2966f02f9acfa60 [formerly bef0f2eca1]
Former-commit-id: 55f7212a0e
2013-02-04 09:00:33 -06:00
Bryan Kowal
904678e8f4 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 0e985cf0f3 [formerly 6d7f57c62a] [formerly acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606]]
Former-commit-id: caceba3a84e843b279eb8a807b33e26d81487e49 [formerly 0136f9d5a3]
Former-commit-id: 1996f92f7e
2013-01-07 12:16:01 -06:00