Commit graph

200 commits

Author SHA1 Message Date
Dustin Johnson
3e8624a3e8 Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
Amend:
  Add constant for "CAVE".
  Add preconditions on creating a subscription.

Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae

Former-commit-id: ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly c4d4e37cad [formerly f8870c8946 [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]]
Former-commit-id: c4d4e37cad
Former-commit-id: ccb959c686 [formerly 09d1d7b6cf] [formerly e46190078db46b56cb5461797a9ab3f3c3ecb7f5 [formerly d58306a92e]]
Former-commit-id: abf3adf681b6aeddfe60c155ab334a33629028b4 [formerly 0f4ec00790]
Former-commit-id: 4d41fca019
2013-03-21 16:14:49 -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
Dave Hladky
7eace92a56 Issue #1796 Fixed the test
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c

Former-commit-id: b6e4db814b [formerly a624cc49c7] [formerly d9078b438a] [formerly b6e4db814b [formerly a624cc49c7] [formerly d9078b438a] [formerly b4eb7b17a9 [formerly d9078b438a [formerly e5648a32e688c0b23233ab46e0c9f32b3bf2920f]]]]
Former-commit-id: b4eb7b17a9
Former-commit-id: b2c04da284 [formerly de43e4fc66] [formerly 0fc093c7a65abc7af6435a8d3fe4259fde06de7a [formerly b43c821a33]]
Former-commit-id: fa89636f145954a39a241e373429def479cfba9d [formerly 87728badf5]
Former-commit-id: 9391c2fb54
2013-03-19 17:22:00 -05:00
Steve Harris
4c10c7a5be Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
2013-03-18 16:52:00 -05:00
Dustin Johnson
090d1fe72a Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 43a9f608ef [formerly ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]]
Former-commit-id: 43a9f608ef
Former-commit-id: d8880e29b6 [formerly 7adf94e9f6] [formerly 32cf95aeffa94b88b3254eb1bbd479d2d9247fa2 [formerly 1b82ad0dc4]]
Former-commit-id: b520365a67b13e0f4c76818883c281e85883a6aa [formerly a08059dd34]
Former-commit-id: 83034c3f43
2013-03-15 11:51:58 -05:00
Dave Hladky
b111edeb8b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
2013-03-13 13:56:33 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Dustin Johnson
71d6d82042 Issue #1784 Move NCF bandwidth manager code to data delivery repo
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 2676e08fdd [formerly 2983ed29e4] [formerly 71365cd945] [formerly 2676e08fdd [formerly 2983ed29e4] [formerly 71365cd945] [formerly 1930183036 [formerly 71365cd945 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]]
Former-commit-id: 1930183036
Former-commit-id: fdaa9b5ce7 [formerly f5a3b57107] [formerly 9459f282f836590ae975e73dd24d60edd299352a [formerly 48a96911c8]]
Former-commit-id: 2ca9f41c1f96efae5c1b40855b28f7c73b8e3f8b [formerly 06b39b848b]
Former-commit-id: be4fe08b9d
2013-03-13 08:39:08 -05:00
Dustin Johnson
f440fe5d75 Issue #1778 Watch for bandwidth configuration changes
Amend: Peer review comments

Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e

Former-commit-id: e358952f1f [formerly 6eed493b3e] [formerly 4c7f7801fa] [formerly e358952f1f [formerly 6eed493b3e] [formerly 4c7f7801fa] [formerly 794812fb23 [formerly 4c7f7801fa [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]]]
Former-commit-id: 794812fb23
Former-commit-id: f3fb0e6fd2 [formerly d63cdbfd17] [formerly 4f7ac3d05b747da63a956d1add39e97eccb9f98f [formerly 33fe353252]]
Former-commit-id: 02ed92897102ecb414138fa1ec8a9d8802e0460f [formerly fbb8745ce5]
Former-commit-id: 226be42368
2013-03-12 12:02:09 -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
3036d45756 Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 7bfc28b6f8 [formerly 73f884753a] [formerly 1161125c84] [formerly 7bfc28b6f8 [formerly 73f884753a] [formerly 1161125c84] [formerly 54c3980cba [formerly 1161125c84 [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]]]
Former-commit-id: 54c3980cba
Former-commit-id: 286d1c3d36 [formerly 67d6a4ac99] [formerly 0e044dbd4df754584a21481f1a73073d2a862d91 [formerly c0a1ae396a]]
Former-commit-id: 9edbfa25c43a48c1c5e2440029f285038e17bbaf [formerly 5da3043a97]
Former-commit-id: 2f7bdb18f9
2013-03-04 14:55:50 -06:00
Dustin Johnson
b24c3f23c7 Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 88a9b953b6 [formerly 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]]
Former-commit-id: 88a9b953b6
Former-commit-id: c23b8a58c3 [formerly 94300e0c1d] [formerly 188d47a162860963a3b8ee6af04bd72c07f6168a [formerly cc0254ba03]]
Former-commit-id: 9b2a38cdff53a695ca327ed0c3edd1084fed67fd [formerly 2d6df74b67]
Former-commit-id: 6bb570ce5c
2013-02-26 15:06:04 -06:00
Mike Duff
d6fbe05ab7 Issue #1588 - Fix match any/all in data browser dialog
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

Former-commit-id: af47a02e47 [formerly 0d2c817680] [formerly d00a790d7b] [formerly af47a02e47 [formerly 0d2c817680] [formerly d00a790d7b] [formerly 086d24acc8 [formerly d00a790d7b [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]]]
Former-commit-id: 086d24acc8
Former-commit-id: f73faee133 [formerly dccb6b94b9] [formerly f34a7712b345b1738f4e1c4927c8c43d0e321466 [formerly 1365596d4d]]
Former-commit-id: 5556e6f398a9c701dd666e73aee68a1b5fe828a7 [formerly ce30c45c88]
Former-commit-id: 7fc320844f
2013-02-25 15:53:55 -06:00
Mike Duff
d1fec7bb15 Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]]
Former-commit-id: 81649d346a
Former-commit-id: 5439b30b6a [formerly 01ef273417] [formerly 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]]
Former-commit-id: 0b55db4b6b45148de1eef1eb4f0dbf9090315261 [formerly a92492ed07]
Former-commit-id: 383f5c075e
2013-02-25 09:29:16 -06:00
Dustin Johnson
2a9f20fca7 Merge "Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO - Change new registry modes to explicitly list includes/excludes. - Add separate bandwidth manager creation capabilities for NCF and WFO. - Add deltaScript to add a "route" slot to subscriptions. - Remove unnecessary schemas from Spring files." into development
Former-commit-id: 8256f182c2 [formerly b6602f9468] [formerly a9e976eed8] [formerly 8256f182c2 [formerly b6602f9468] [formerly a9e976eed8] [formerly cb1380af90 [formerly a9e976eed8 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]]]
Former-commit-id: cb1380af90
Former-commit-id: 18cfc1ee4d [formerly f552967bf3] [formerly 48d8590ebfaa96f41ee4b9def3d4c9a8b17d1c3c [formerly 5031ae4d66]]
Former-commit-id: 8a3326929ccb7815ac1878648083e7db49810bb1 [formerly d62153b1b4]
Former-commit-id: a5a2f437f9
2013-02-20 16:17:20 -06:00
Roger Ferrel
0ab8a42f96 Issue #1636 Changes to TimeTools to allow file timestamp pattern to allow option hour; and WarningDecoder.py now uses TimeTools.
Change-Id: Iac6a4453c06d571f9462db9074b81434e1b5f45f

Former-commit-id: c0df401088 [formerly acfccac971] [formerly 8baa3b6df5] [formerly c0df401088 [formerly acfccac971] [formerly 8baa3b6df5] [formerly dd05bc65be [formerly 8baa3b6df5 [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]]]]
Former-commit-id: dd05bc65be
Former-commit-id: 672a979183 [formerly e47c91eda7] [formerly bb8e979b980b2c5128f11b8e520f639e237ea72a [formerly 8264adc47d]]
Former-commit-id: 7942c7b0e437e39d63fc331211541bf727eae1cf [formerly 70dae3453a]
Former-commit-id: cdbebf0743
2013-02-20 12:09:26 -06:00
Dustin Johnson
6924e0f530 Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO
- Change new registry modes to explicitly list includes/excludes.
- Add separate bandwidth manager creation capabilities for NCF and WFO.
- Add deltaScript to add a "route" slot to subscriptions.
- Remove unnecessary schemas from Spring files.

Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa

Former-commit-id: 597908f34d [formerly d4afef2cab] [formerly d8659e742e] [formerly 597908f34d [formerly d4afef2cab] [formerly d8659e742e] [formerly c8760e5699 [formerly d8659e742e [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]]]
Former-commit-id: c8760e5699
Former-commit-id: 0c7c2a6abd [formerly 5a8b6459d4] [formerly f672d4337c7763a3c1b36a4e134928216fc2dff2 [formerly ca721863be]]
Former-commit-id: 9272577337c7736f0a166437a92ddcb0a5d60072 [formerly 5ffa5f410e]
Former-commit-id: 2565df8435
2013-02-20 10:42:51 -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
Mike Duff
833e5aaf24 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 6628aea419 [formerly 3e59308771] [formerly 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]]
Former-commit-id: ee93310e9d4290c2cb2fd40f2f7c40a19a16c41c [formerly 72f6e95a67]
Former-commit-id: 2aee18ea9d
2013-02-18 08:16:57 -06:00
Dustin Johnson
5f7a161077 Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 714ea1c8d8 [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]]
Former-commit-id: 6e2f69939f
Former-commit-id: 72cb5b436b [formerly d0ecd69456] [formerly 11d3a956bd7f1cc9a0583c0a5584b6470fe49630 [formerly 1ef440f8ee]]
Former-commit-id: 7cc6a0aaad6eada373e1fab36c85062f70d96699 [formerly f14bedec28]
Former-commit-id: 12d4b055f6
2013-02-15 08:13:11 -06:00
Dustin Johnson
c84db93145 Issue #1595 Fix expired subscription update retrieval time scheduling
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7

Former-commit-id: 632586a6d2 [formerly 54dd90afdd] [formerly 656601f272] [formerly 632586a6d2 [formerly 54dd90afdd] [formerly 656601f272] [formerly f6a286da2d [formerly 656601f272 [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]]]
Former-commit-id: f6a286da2d
Former-commit-id: 2e40a0e908 [formerly 158ce1fe5b] [formerly fb3f73098ac1d1c9b79e611ae10bc7164b395903 [formerly 776581bc55]]
Former-commit-id: 4e158717754c918dfde1fb1f4e21727ad51c745b [formerly 0614bd08f7]
Former-commit-id: 4466e63c84
2013-02-14 15:33:06 -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
Steve Harris
b43935a991 13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 5027d2365b [formerly bbe92e6824] [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]]
Former-commit-id: 0cd3f4b5889bda9de32b546358edf3d8210d3ad8 [formerly 0c128dd8f0]
Former-commit-id: dc55ef579a
2013-02-07 16:00:39 -06:00
Mike Duff
2314c6c187 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: 6f1a03d230 [formerly 06ddb6cce7] [formerly 1b1d00f8a9] [formerly 6f1a03d230 [formerly 06ddb6cce7] [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1b1d00f8a9 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]]
Former-commit-id: 36909dd6c0
Former-commit-id: 77ad5ea58e [formerly cd52a94032] [formerly ea3b9db059eaba9fc3581435e18f0a784925da2b [formerly 4400265394]]
Former-commit-id: 98cae448c2f17401fc8c1450a1b5fda8d453c7bb [formerly 0cb979038b]
Former-commit-id: 28e854de25
2013-02-05 15:13:51 -06:00
Dustin Johnson
01c5245270 Merge "Issue #1543 Add ability to save/read dods files back to net.dods" into development
Former-commit-id: baa843d739 [formerly 7b2adf535e] [formerly df987e6204] [formerly baa843d739 [formerly 7b2adf535e] [formerly df987e6204] [formerly 0ceb35c131 [formerly df987e6204 [formerly 062ed14d60a8b3d29650ce78fa449f69f40d413b]]]]
Former-commit-id: 0ceb35c131
Former-commit-id: aaa4ea8fba [formerly 81d0423913] [formerly b9f41462701bde6c5a7c07d7fa9ea11554562ab2 [formerly d08a9b3b13]]
Former-commit-id: ae811356abf356c2d92d07ea919eae4017330f3f [formerly f50dd729f5]
Former-commit-id: 53c04aac63
2013-02-05 14:36:31 -06:00
Dustin Johnson
31151f3c5a Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: 23449a73bf [formerly efe1bcc4b5] [formerly cd381cb819] [formerly 23449a73bf [formerly efe1bcc4b5] [formerly cd381cb819] [formerly febe492056 [formerly cd381cb819 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]]
Former-commit-id: febe492056
Former-commit-id: 7ad9070600 [formerly c81cb3d60b] [formerly 8ed6a0d05f4ab5e36a81ae666ed0b62384b8afd6 [formerly fffbb32775]]
Former-commit-id: 21356a47c76d0ac4674803ca4b53386af099cd4e [formerly 999f3cbcd5]
Former-commit-id: 547362b6bb
2013-02-05 14:07:30 -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
Steve Harris
a8d7e2a51a Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]]
Former-commit-id: ec56acde81
Former-commit-id: 41b14f0fa2 [formerly 73d9455c65] [formerly 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]]
Former-commit-id: 96b2d429acce04d3a7b895e5c4de0e318433555e [formerly a74d58ce6f]
Former-commit-id: 2107a54161
2013-01-31 10:19:14 -06:00
Dustin Johnson
4064a06a23 Issue #1528 Fix subscription priorities to be the same from domain object to GUI
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]]
Former-commit-id: f88a5c1b95
Former-commit-id: dac4c429e7 [formerly 4ab288ae75] [formerly a9e048c56f0e0bcf1daa53c2f59ef7d20bb01b9b [formerly 4465094fe9]]
Former-commit-id: 053fc880d7a6ac70b3580a152303d0a3ab5154a5 [formerly b78257ab11]
Former-commit-id: 7d73d0bd64
2013-01-25 14:30:04 -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
Mike Duff
27a9b15eea Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly c06ed9f9dc [formerly ba5014b162 [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: a09e8c5570 [formerly 05e9b88566] [formerly 1b1ac20cfdbaa8e552b23d4725c85806c869b494 [formerly fbf92a6d06]]
Former-commit-id: ef3455ec3540faf3e7ca24232e1af94de307fd18 [formerly f9b7cae879]
Former-commit-id: 0752ecb4f1
2013-01-24 12:39:12 -06:00
Mike Duff
5cf904ba6f Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: aa26a4d5d2 [formerly dfcce57a0a] [formerly 1dd22669a9d4462243dd018526062181eb8a7d09 [formerly 4cd7deb608]]
Former-commit-id: 9fd21a8ac89c2efd5bc6d198d4f4290003357cb3 [formerly ac9f95d1d0]
Former-commit-id: df41fe4395
2013-01-23 11:17:36 -06:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00
Dustin Johnson
1e301478b9 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly f730422834 [formerly 6c1818d544 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]]
Former-commit-id: f730422834
Former-commit-id: 70bce9d505 [formerly 2e09d46fea] [formerly 76d8b5641220e657d9123f65878c0ce41da1c8f6 [formerly 516ac1ab9a]]
Former-commit-id: ba860324a0a7e30cd96383cd383eb22a2db70a82 [formerly 7918b009ff]
Former-commit-id: 4cec3d4356
2013-01-23 08:06:52 -06:00
Steve Harris
4ed4f88644 Merge branch '13.2.1_delivery' into development
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]]
Former-commit-id: 1af055a04b
Former-commit-id: 7d6a1a7e3a [formerly 8b578c10dc] [formerly cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]]
Former-commit-id: f741fd6472c315f672ab76f7a397d383205c6f95 [formerly b03d5ce450]
Former-commit-id: c60051d5df
2013-01-22 16:45:48 -06:00
Dustin Johnson
a2ca5bd06f Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 40ef4c5947 [formerly 3ec05a5a9c] [formerly 557de162b0] [formerly 40ef4c5947 [formerly 3ec05a5a9c] [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 557de162b0 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 02604beac9 [formerly 756080321e] [formerly 6bc759f6c2019b3fef1eb1a080cf002dc07697ce [formerly a3c99f86bb]]
Former-commit-id: 07f8633fb9fb320b16573c6dc1052a735e4bf124 [formerly 2168713505]
Former-commit-id: 7da688f138
2013-01-22 11:45:18 -06:00
Steve Harris
f8888e5294 Merge branch '13.2.1_delivery' into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java

Former-commit-id: bf957a3bd7 [formerly 89f3120c0c] [formerly 2c9c6b7dde] [formerly bf957a3bd7 [formerly 89f3120c0c] [formerly 2c9c6b7dde] [formerly 407d73a04f [formerly 2c9c6b7dde [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]]
Former-commit-id: 407d73a04f
Former-commit-id: f2b52084dc [formerly 0ca985778e] [formerly 5714abfd35536ab502243bd9ff20068b0fa7b7ac [formerly bbb637faf3]]
Former-commit-id: 56287c40efa8ad1381c1a6f8efbc143f960cefd1 [formerly 45760d8bef]
Former-commit-id: 61a9f644d9
2013-01-18 10:52:29 -06:00
Dustin Johnson
70e2870b54 Issue #1412 Check file last modified times each time role data is requested
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: 088b0d4c08 [formerly b1ce19e41d] [formerly 74d5a70c30] [formerly 088b0d4c08 [formerly b1ce19e41d] [formerly 74d5a70c30] [formerly 037dabb683 [formerly 74d5a70c30 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]]]
Former-commit-id: 037dabb683
Former-commit-id: 837c1a0492 [formerly fce3f8bec9] [formerly 4c1037f281d91482cf2e0798dc7d242a1877cfba [formerly 6468029207]]
Former-commit-id: 58749b06f78b3c611a53c13d20facc15be2e4ccb [formerly 799cf85f82]
Former-commit-id: e3cf0246c7
2013-01-17 12:48:01 -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
Dustin Johnson
693e9d93a2 Issue #1487 Use XML to store stats grouping information in the database
Amend:
  Increase length of grouping column to 1024.
  Add deltaScript to convert the grouping column to xml.
  Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.

Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a

Former-commit-id: 0397f990da [formerly c12b46027f] [formerly b627dfc054] [formerly 0397f990da [formerly c12b46027f] [formerly b627dfc054] [formerly 19d3a14d4f [formerly b627dfc054 [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]]]
Former-commit-id: 19d3a14d4f
Former-commit-id: 56b47ffbf1 [formerly ecb1d5564a] [formerly a1d7a7e343770b91b36afc9c193dcdcee6b09ef3 [formerly c750e27389]]
Former-commit-id: d950f4621f676478de7a7656c2bccf8b324d5f74 [formerly 19558ae3fa]
Former-commit-id: 4ab214c5d7
2013-01-16 12:21:11 -06:00
Dustin Johnson
23e70d529a Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 3d74a68e94 [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]]
Former-commit-id: 2cf52d976b
Former-commit-id: b18fc5ff5e [formerly 94e95f3e07] [formerly d2caf5c394290add805dceb28270a72f9b600765 [formerly aa7acedf0a]]
Former-commit-id: 21ec2413c9d2a86c99721c6504722141f9046ddb [formerly 5cd31fc0b7]
Former-commit-id: 1070de3f2d
2013-01-15 10:18:14 -06:00
Mike Duff
ac03c3993c Issue #1420 - Additional changes and cleanup
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064

Former-commit-id: 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 8411a46e3e [formerly 279729e88e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]]
Former-commit-id: 8411a46e3e
Former-commit-id: 135fd5c13d [formerly d3ed6f6148] [formerly 8b9f15d6e0da73076d2f6aec446ddc93878baabc [formerly 950c71c164]]
Former-commit-id: 0e71292ea44022ed0f31fa4514b8529d747d49a7 [formerly 772154de38]
Former-commit-id: 66dc038d02
2013-01-11 14:38:34 -06:00
Richard Peter
038b214887 Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: dd12b3fe0f [formerly cf815a4c72] [formerly 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]]
Former-commit-id: 505df6e18a00aa3547de015d6cffa6c770479c9f [formerly a9f01d5846]
Former-commit-id: 87b4521a69
2013-01-11 12:37:05 -06:00
Dustin Johnson
f275418843 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly c4068d27bf [formerly 7716f1baa9 [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]]
Former-commit-id: c4068d27bf
Former-commit-id: 2a306b4122 [formerly a4414d409a] [formerly c86a35d61a0a7c32f9505c7606fcb5598beded97 [formerly 0b3f803f6c]]
Former-commit-id: 3330a60d2df34bd1b8732593f276c83b6d1c1c02 [formerly 9b3cf3308f]
Former-commit-id: ef31fc45a9
2013-01-11 12:23:15 -06:00
Dave Hladky
87ae3ccfb8 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 59c349ac77 [formerly fe486b4889] [formerly 6a98f7fe2876ba19787aa908c721669aaf618444 [formerly 5312e82b4b]]
Former-commit-id: 57ac28b8518a3193cbd3b4125cd190f547bac07f [formerly a51f8f449b]
Former-commit-id: b5ea7aaff8
2013-01-11 11:59:36 -06:00
Dustin Johnson
2598fc06d8 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]]
Former-commit-id: 446f65776e
Former-commit-id: 6984791be8 [formerly 7bf029eb7e] [formerly 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]]
Former-commit-id: 4b7dc8fbd66d90306e884b8ea9c8af6f53371156 [formerly 6fb6bc8f87]
Former-commit-id: f269969791
2013-01-11 11:53:02 -06:00
Mike Duff
9adac72fba Issue #1420 - Rules Peer review comments
Former-commit-id: 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 4c63333a96 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: 65dd6c6f60 [formerly ed95eae2e3] [formerly 4e7421c22c8ae6fb0dd6d1566ea3fb164aec7691 [formerly 67486aa43b]]
Former-commit-id: 2661145adf236b4fa5c186262fb5752eabdf600d [formerly 8313877a3a]
Former-commit-id: 660064ea6a
2013-01-09 12:02:21 -06:00
Dustin Johnson
683542813d Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 2635e05723 [formerly 6a90779214 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]]
Former-commit-id: 2635e05723
Former-commit-id: 71e085b940 [formerly 885f315d30] [formerly db9b8d2b230d04c2984037f6535517c2201db20b [formerly 492cee4992]]
Former-commit-id: 7294d4c01e6fcf76d993e5993a213ccedb5d6fe1 [formerly b1c159fc7f]
Former-commit-id: b24ddaeb4e
2013-01-08 12:44:29 -06:00