Dave Hladky
5fa53b22dc
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f
[formerly e2a4bb6755
] [formerly c352643c79
] [formerly a14cb8c45f
[formerly e2a4bb6755
] [formerly c352643c79
] [formerly 3b00ae03cc
[formerly c352643c79
[formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 5fc17cf3b8
[formerly ea791b5ca5
] [formerly 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740
]]
Former-commit-id: 966b34bc10a6cb76f151b577b0acae7fb953d804 [formerly 5b11e45636
]
Former-commit-id: a06db5a4e7
2014-04-30 17:38:28 -05:00
Dave Hladky
50c77e0a2f
Issue #2889 user who issued change now shows in notification center
...
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: ec2c3b4af2
[formerly 2d18b657a8
] [formerly 1671baaf10
] [formerly ec2c3b4af2
[formerly 2d18b657a8
] [formerly 1671baaf10
] [formerly 9479219b73
[formerly 1671baaf10
[formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]]
Former-commit-id: 9479219b73
Former-commit-id: b908654a83
[formerly 86287bb5df
] [formerly 6f17881da511134df9f83e5fdfe37fa16d15481a [formerly f26450c40d
]]
Former-commit-id: f804771d0b0a2e246911a4aba55370426917839a [formerly 577b6402da
]
Former-commit-id: fedb08a7eb
2014-04-02 14:06:25 -05:00
Richard Peter
ef2ff1d0f7
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a
[formerly 7bd6a07913
] [formerly 0e25ae35c1
] [formerly 79d3aa4e1a
[formerly 7bd6a07913
] [formerly 0e25ae35c1
] [formerly 1c150e6e8b
[formerly 0e25ae35c1
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0
[formerly 50a1b270c5
] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e
]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649
]
Former-commit-id: 5fab51d41b
2014-02-27 15:18:26 -06:00
Brad Gonzales
ac050068d5
Issue #2386 fixed spatial overlap rule application.
...
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: 39afe190e0
[formerly b6e2ce4b74
] [formerly 783afb1585
] [formerly 39afe190e0
[formerly b6e2ce4b74
] [formerly 783afb1585
] [formerly 8b2b50baaf
[formerly 783afb1585
[formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: c364269fae
[formerly f57f472f6a
] [formerly 0b393405d83191a17ccf6537e803d672cbc79eae [formerly 5ce1939d01
]]
Former-commit-id: 4945cd39a9cc275d1c7a6df8d10b99e4aea2962c [formerly f4513d0e64
]
Former-commit-id: aa2d8b76a1
2014-02-25 09:22:08 -06:00
Brad Gonzales
d899777a6d
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
...
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: b0f71efecc
[formerly 49ddffc99b
] [formerly 36a24c1cb5
] [formerly b0f71efecc
[formerly 49ddffc99b
] [formerly 36a24c1cb5
] [formerly 794bbc3c9b
[formerly 36a24c1cb5
[formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 2330bf10b2
[formerly 3bb9975728
] [formerly 156a80d9ff219de8a2827577a58910cefd208d71 [formerly 90d34f7386
]]
Former-commit-id: f42b463f576142d80cc6c0dbb6de2708378d5614 [formerly b99b5d9373
]
Former-commit-id: d50a8cd7a5
2014-02-18 12:11:02 -06:00
Brad Gonzales
e906d71ac4
Issue #2771 For Data Delivery CAVE now request current id from
...
the registry EDEX. Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.
Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
Created ClusterIdUtil. DataDeliveryIdUtil uses that utility. It also verifies the id against the awips sites.
Changed centralRegistry.sh to set CLUSTER_ID to NCF.
Handle cases where site id is HAK or HUS.
Check for empty id setting in Cluster ID Util.
Return full id for Data Delivery ID.
Simplify Data Delivery ID and return Cluster ID.
Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911
Former-commit-id: 1d57e9f5f7
[formerly 379c0fb46c
] [formerly 19460ed0d7
] [formerly 1d57e9f5f7
[formerly 379c0fb46c
] [formerly 19460ed0d7
] [formerly ba4e308328
[formerly 19460ed0d7
[formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]
Former-commit-id: ba4e308328
Former-commit-id: ae35320dd6
[formerly 1b76488111
] [formerly eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944
]]
Former-commit-id: 367c8f66061868a52d255ea46c57bb8c2dc11b5f [formerly 9aa1cb299e
]
Former-commit-id: b0421675ff
2014-02-18 11:10:44 -06:00
Steve Harris
0a5772e795
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 56f5ae9f48
[formerly a465718a0d
] [formerly 24ab7cff49
] [formerly 69dc3d835b
[formerly 24ab7cff49
[formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 6cb92b1f57
[formerly b62efa9387
] [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a
]]
Former-commit-id: 800d6b432a0b97ae5f3b770d37e08ca17eb7e05a [formerly 2a967fc9b5
]
Former-commit-id: 69626ab704
2014-01-21 12:36:54 -06:00
Mike Duff
0672db6081
Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
...
Former-commit-id: 4038246f93
[formerly 9bd8e84b9f
] [formerly bdf6a002f6
] [formerly 4038246f93
[formerly 9bd8e84b9f
] [formerly bdf6a002f6
] [formerly 9a2d2af4a9
[formerly bdf6a002f6
[formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: 7e3e76e9da
[formerly e929abf7d7
] [formerly d100328be0c1140a5b43dcb2f41ad9e6ab41095e [formerly 9112366cae
]]
Former-commit-id: d799b7c4eda4917284ed7af90a20dbf028cb2301 [formerly 8844bbbe2d
]
Former-commit-id: e8d473b9c6
2014-01-20 17:44:02 -06:00
Max Schenkelberg
e0b7ba7058
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
...
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: 30059d255c
[formerly b3aed99142
] [formerly 16046a4dde
] [formerly 30059d255c
[formerly b3aed99142
] [formerly 16046a4dde
] [formerly cc2080449c
[formerly 16046a4dde
[formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: 257553461b
[formerly 0ceaa43902
] [formerly d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460
]]
Former-commit-id: e6116ab5b34627162fc751f613c0b7f4743d9668 [formerly 789a279475
]
Former-commit-id: 783391423f
2014-01-06 17:03:45 -06:00
Brad Gonzales
0aa3b220bf
Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
...
Amend: Separate update from create notifications in LifecycleManagerImpl.
Refactored notification sending in EdexBandwidthManager.
Fixed error in LifecycleManagerImpl refactor.
Added comment to isRecurringSubscription.
Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77
Former-commit-id: 50fb18601c
[formerly 62e4cafa27
] [formerly 8f70fb1d0c
] [formerly 50fb18601c
[formerly 62e4cafa27
] [formerly 8f70fb1d0c
] [formerly aea0e847aa
[formerly 8f70fb1d0c
[formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]]
Former-commit-id: aea0e847aa
Former-commit-id: 725742f4ec
[formerly 7747d901f7
] [formerly 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0
]]
Former-commit-id: 0b81bcbc6ab893fa04a28ec2f1a491d80e5eeec8 [formerly bad9b3242a
]
Former-commit-id: a626b240ce
2013-11-12 12:42:16 -06:00
Dave Hladky
eba1c80d0b
Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
...
Former-commit-id: 07c70d72cc
[formerly 1594cc6a72
] [formerly e5896397f6
] [formerly 07c70d72cc
[formerly 1594cc6a72
] [formerly e5896397f6
] [formerly 422dabf3eb
[formerly e5896397f6
[formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]]]
Former-commit-id: 422dabf3eb
Former-commit-id: fd96474a8b
[formerly d589bced40
] [formerly c56edc32fb745fdee96b63e71aaf76cca3d28fa8 [formerly ca1f2fc340
]]
Former-commit-id: b5130373dbabc32643d34913298bac79e8bc89eb [formerly 448d13c266
]
Former-commit-id: b8b78939e3
2013-11-01 10:23:56 -05:00
Mike Duff
e48beadbc6
Issue #2292 - refactor and move overlap/duplicate checks to edex.
...
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: fbcf271899
[formerly c1bd170f8a
] [formerly f123fa11f5
] [formerly fbcf271899
[formerly c1bd170f8a
] [formerly f123fa11f5
] [formerly 3fc811102e
[formerly f123fa11f5
[formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]]
Former-commit-id: 3fc811102e
Former-commit-id: ce2afdf1b3
[formerly b0c54d7c17
] [formerly ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461
]]
Former-commit-id: ece01cf9cf7d6b3d925c922f4d1d6fe84edf0f17 [formerly 26ca1b4d72
]
Former-commit-id: 5ff3fe2791
2013-10-31 09:22:50 -05: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
Dave Hladky
f80a730a58
Issue #2388 Multiple code jars in path, Nate's logger finds.
...
Former-commit-id: e8234c2ef8
[formerly 3787da81a8
] [formerly 8e5d3d9742
] [formerly e8234c2ef8
[formerly 3787da81a8
] [formerly 8e5d3d9742
] [formerly f184d2ba9c
[formerly 8e5d3d9742
[formerly ad02f4640d747328257f9b7a3f2ca2300fcc7bba]]]]
Former-commit-id: f184d2ba9c
Former-commit-id: 4df5cea860
[formerly 4360a23a07
] [formerly e5b737dd2d117f50e8ddc1d9fef058bc6c2b1649 [formerly 41ba230de0
]]
Former-commit-id: 85d61f4cf30487354033294aee585d0c19887a96 [formerly b98d037cdd
]
Former-commit-id: 5001c8f42e
2013-09-19 10:59:07 -05:00
Mike Duff
2dbaf0e60b
Issue #2180 - handle delete of credentials
...
Change-Id: Ie8f1cdba92df03d94a4d7b009b8330eced10e036
Former-commit-id: f3717d0040
[formerly 43583eeaae
] [formerly 0d602a6c3f
] [formerly f3717d0040
[formerly 43583eeaae
] [formerly 0d602a6c3f
] [formerly aaf7a3778f
[formerly 0d602a6c3f
[formerly 1dfcfc80308a182f0f21f028e19285fa39c53d6e]]]]
Former-commit-id: aaf7a3778f
Former-commit-id: cd0cbaeca9
[formerly 30076abe7c
] [formerly c156374f6cb30e814824ac145f3c81bf41a0fbaa [formerly 4b572b038f
]]
Former-commit-id: 7c31f0babf1386b050b903c55238e50bbe02694d [formerly 0f386a468f
]
Former-commit-id: fa7a76c1ff
2013-09-11 12:08:12 -05:00
Mike Duff
d940150143
Issue #2180 - Pass messages back to CAVE
...
Change-Id: Ia5b88d577fc51b449a77389354e14808515e67bc
Former-commit-id: e9e712892f
[formerly 4ed4e2a225
] [formerly 20e6396c48
] [formerly e9e712892f
[formerly 4ed4e2a225
] [formerly 20e6396c48
] [formerly 5f462ebf6f
[formerly 20e6396c48
[formerly 37de8f85f870ca494e5a641967f544e359df77b9]]]]
Former-commit-id: 5f462ebf6f
Former-commit-id: cb0bd31b88
[formerly 463eb504e0
] [formerly 925559a0b7a9032d6b454b5d001bf47cf5684486 [formerly 70b186d19a
]]
Former-commit-id: 0daa82dfd8d0c9b902a3983043f69dd37958be94 [formerly e679055958
]
Former-commit-id: 3fb882a3b6
2013-08-23 13:47:26 -05:00
Dave Hladky
61dd3901ea
Issue #2236 Merged Mike's Code
...
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6
Former-commit-id: 78766d5567
[formerly 2049a9b4da
] [formerly e21cc84d16
] [formerly 78766d5567
[formerly 2049a9b4da
] [formerly e21cc84d16
] [formerly db7c81a1df
[formerly e21cc84d16
[formerly 7cc09247bc4166f9586867fba097b4c40577464d]]]]
Former-commit-id: db7c81a1df
Former-commit-id: be1b52c989
[formerly fef2b39123
] [formerly 3c1f19617df625bcf1fc232516da55cda0f42bfc [formerly fe9e969142
]]
Former-commit-id: e29bf91bafd2f989787cde4e5cd1e78eb502884c [formerly a6bff7d97f
]
Former-commit-id: aa099029be
2013-07-31 16:16:47 -05:00
Dave Hladky
4f821f0bd8
Issue #2180 encrypt credential storage
...
Change-Id: If617535df024216c8d089a67c326c098e906724e
Former-commit-id: 3c5ed94610
[formerly a9b8cad721
] [formerly a2260ac6d3
] [formerly 3c5ed94610
[formerly a9b8cad721
] [formerly a2260ac6d3
] [formerly adf02a83c0
[formerly a2260ac6d3
[formerly f912ce7c2806abdce17c2b994d9226cdacf1ff34]]]]
Former-commit-id: adf02a83c0
Former-commit-id: 4fc764ca3c
[formerly ac3b701421
] [formerly e0dae0061e18dad377413d63990d4054adbe3d1b [formerly 703614af1d
]]
Former-commit-id: 563563d284924df77b94b1b54e6b0645fba33317 [formerly 4819c8f895
]
Former-commit-id: 5e0cbdab23
2013-07-30 08:33:59 -05:00
Richard Peter
4e00a449b7
Issue #2170 : Initial plugin rename for notification framework
...
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: a3d9294d13
[formerly bf99d8fd4d
] [formerly 359ee5d1af
] [formerly a3d9294d13
[formerly bf99d8fd4d
] [formerly 359ee5d1af
] [formerly 8ba840f1d9
[formerly 359ee5d1af
[formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 85884ccfd1
[formerly 43453bcbff
] [formerly 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9 [formerly 16e182d70b
]]
Former-commit-id: a4aa95423528b7d80ac7bfb1f4727754c4129e0b [formerly 51773c757e
]
Former-commit-id: 5665e7eb9e
2013-07-26 14:36:46 -05:00
Dustin Johnson
c9b74d06a1
Issue #2106 Fix transactional semantics
...
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits
Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9
Former-commit-id: fe8c0b47d1
[formerly 5bfef9bb45
] [formerly fac7d3a9d9
] [formerly fe8c0b47d1
[formerly 5bfef9bb45
] [formerly fac7d3a9d9
] [formerly 69c09e530f
[formerly fac7d3a9d9
[formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]]
Former-commit-id: 69c09e530f
Former-commit-id: 84ecc6dec4
[formerly da1ad3c8a0
] [formerly 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394
]]
Former-commit-id: 99261465c72149de5291722572317482216a9d86 [formerly c2ed1495ad
]
Former-commit-id: 9b42432838
2013-06-25 08:33:55 -05:00
Richard Peter
f6e6c3c531
Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c
Former-commit-id: cf29af8d65
[formerly ad353c34f9
] [formerly d262c02612
] [formerly cf29af8d65
[formerly ad353c34f9
] [formerly d262c02612
] [formerly b007d4a302
[formerly d262c02612
[formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]]
Former-commit-id: b007d4a302
Former-commit-id: bf6e4c1f71
[formerly e03283ad4a
] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb
]]
Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f
]
Former-commit-id: ed15c2edcc
2013-06-24 18:51:56 -05:00
Dustin Johnson
a7a5ea4b35
Issue #1802 Fix event processing in regards to transaction commits/rollbacks
...
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22
Former-commit-id: de8c9a4915
[formerly a606508cd4
] [formerly ecae75ecd8
] [formerly de8c9a4915
[formerly a606508cd4
] [formerly ecae75ecd8
] [formerly a331cd2958
[formerly ecae75ecd8
[formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]]]
Former-commit-id: a331cd2958
Former-commit-id: bf2f6eebd8
[formerly cf36003f12
] [formerly b97c78d83811f1218347ce87ea5843be3bb4e72f [formerly d2faa3b600
]]
Former-commit-id: 1c8ca91ae0182e9e685222962120c92d3ee918d3 [formerly 87e4d9269d
]
Former-commit-id: a6c7287a74
2013-06-20 13:53:04 -05:00
Steve Harris
740f6fb8e0
Merge branch 'omaha_13.5.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
Former-commit-id: ba02238047
[formerly 12248cade1
] [formerly 43316cbff9
] [formerly ba02238047
[formerly 12248cade1
] [formerly 43316cbff9
] [formerly 532d41787b
[formerly 43316cbff9
[formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]]
Former-commit-id: 532d41787b
Former-commit-id: 324532d6ac
[formerly 251b3c1a9e
] [formerly 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f
]]
Former-commit-id: 67413e3c272a714fa394b7a22d2e55375f160635 [formerly 316d2ec667
]
Former-commit-id: 01dee712d5
2013-06-17 15:29:01 -05:00
Bryan Kowal
d73d4d9216
Issue #1924 - standardize build.properties files
...
Former-commit-id: ab045a7ce1
[formerly 874c93146c
] [formerly cebb5f8d5f
] [formerly ab045a7ce1
[formerly 874c93146c
] [formerly cebb5f8d5f
] [formerly ec78ee1838
[formerly cebb5f8d5f
[formerly 739e93988616fefbb235ab3e023b7a7e0394b5e9]]]]
Former-commit-id: ec78ee1838
Former-commit-id: f951c5d78a
[formerly 78c52ebb5a
] [formerly 97bb0430a3e680ec6666816e15471172d37a62ca [formerly c5c6d1d4d4
]]
Former-commit-id: 8faa4e0bc6eec75218489a470d33cdc82b4353ce [formerly fb1cbdebfa
]
Former-commit-id: ec5cbd0a49
2013-06-13 16:04:18 -05:00
Dustin Johnson
af894a10e3
Issue #2038 Delta script should also update providers in the database
...
Change-Id: I07f058af1702d43f3aa60f0a8646b016f6866b3b
Former-commit-id: 82523d84c4
[formerly 2b5daedc75
] [formerly f361c49484
] [formerly 82523d84c4
[formerly 2b5daedc75
] [formerly f361c49484
] [formerly 14c7d2d81e
[formerly f361c49484
[formerly de9efbe2f2a74f5c2b2d730153f4831f0c17336e]]]]
Former-commit-id: 14c7d2d81e
Former-commit-id: fa2ebeebb8
[formerly b0658fda21
] [formerly 70a55bfe422d0b5ae314fca120998327360852d3 [formerly 582c618ace
]]
Former-commit-id: 1255f5255ef90423baa2a761e05e4b37fd63f835 [formerly 27120c17f0
]
Former-commit-id: 1425620cce
2013-06-10 15:36:47 -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
Mike Duff
c99170b497
Issue #2020 - Implement Shared Subscriptions Cave-side.
...
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: e3804d48ec
[formerly 80b1f95f0c
] [formerly 192ce891d0
] [formerly e3804d48ec
[formerly 80b1f95f0c
] [formerly 192ce891d0
] [formerly b6b01c3e81
[formerly 192ce891d0
[formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]]
Former-commit-id: b6b01c3e81
Former-commit-id: e7790088ac
[formerly 6ee0ef55ff
] [formerly bbd9728434e2386f696b8016882158b60232d706 [formerly a9004667b7
]]
Former-commit-id: 1a67b61c05159bc4081f57926a9ff0be90dec414 [formerly 53ca005836
]
Former-commit-id: 5b21a6cfa4
2013-05-24 09:20:55 -05:00
Nate Jensen
de2f575c94
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
...
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: e8ebe1a123
[formerly b7cecb931e
] [formerly 1978133177
] [formerly e8ebe1a123
[formerly b7cecb931e
] [formerly 1978133177
] [formerly 1fd2f8965f
[formerly 1978133177
[formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970
[formerly a84a6fe6ae
] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20
]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192
]
Former-commit-id: eaaf8d1b8a
2013-05-23 11:20:40 -05:00
Dustin Johnson
97d7d8a52b
Issue #2000 Subscription overlap configuration GUI
...
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: 095acb5ac3
[formerly 554347f17c
] [formerly 5b62669f8e
] [formerly 095acb5ac3
[formerly 554347f17c
] [formerly 5b62669f8e
] [formerly 38249cd7b9
[formerly 5b62669f8e
[formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 4d30dc16c6
[formerly 3a504d1e7b
] [formerly 97b3d509a5df6b5067753a00490a5ec5d5462760 [formerly 7858a3b57f
]]
Former-commit-id: 89d6680a67c8ed3519146cf6dc8353ec7345e96c [formerly d12b26ac1d
]
Former-commit-id: a314bd8f4a
2013-05-20 17:12:47 -05:00
Dustin Johnson
2ca9de593d
Issue #2000 Subscription duplication/overlap detection
...
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5
Former-commit-id: b4e94bbebe
[formerly 3447a3726b
] [formerly db2e3cd9bb
] [formerly b4e94bbebe
[formerly 3447a3726b
] [formerly db2e3cd9bb
] [formerly fdf3ac7897
[formerly db2e3cd9bb
[formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]]]
Former-commit-id: fdf3ac7897
Former-commit-id: cb3d9d1bb9
[formerly 5f2de42ebe
] [formerly d257155045c32d99334087cafb3c78dab9537c29 [formerly 085058e788
]]
Former-commit-id: bd1d3fd5f7fec484cbf5181d789776032eec615a [formerly aa591995c6
]
Former-commit-id: 1503e4c8e5
2013-05-14 15:34:08 -05:00
Dustin Johnson
e7301e95c9
Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
...
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.
Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf
Former-commit-id: 3a6d9209df
[formerly cef805e79a
] [formerly 61346b1388
] [formerly 3a6d9209df
[formerly cef805e79a
] [formerly 61346b1388
] [formerly f3bdede2c8
[formerly 61346b1388
[formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 73a8bb7a02
[formerly 4b4eb8e406
] [formerly da2f137f6b51f8ac36c0d76f597f0c82e1dfd829 [formerly 8c52cd190f
]]
Former-commit-id: 58e02dc2dcf3d6a21fbf5672b90de97e43258d5e [formerly fefc0dca3b
]
Former-commit-id: 5958178516
2013-04-05 12:41:02 -05:00
Dustin Johnson
b6c2c0194c
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: 5b7fcb1ce2
[formerly 48a2002e68
] [formerly c981b7250f
] [formerly 5b7fcb1ce2
[formerly 48a2002e68
] [formerly c981b7250f
] [formerly 6129d86be4
[formerly c981b7250f
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]]
Former-commit-id: 6129d86be4
Former-commit-id: c42ca22867
[formerly 644ed2396d
] [formerly e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454
]]
Former-commit-id: 4466a4fe3eec25da0716798d2d3f9beb6bb0d4f0 [formerly 15ed8a6f58
]
Former-commit-id: e57b8314d8
2013-04-01 15:35:51 -05:00
Steve Harris
f2a81e18e9
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 02f49bc2e4
[formerly 069ee8a748
] [formerly 9a321b6ac8
] [formerly 02f49bc2e4
[formerly 069ee8a748
] [formerly 9a321b6ac8
] [formerly 3073951b3d
[formerly 9a321b6ac8
[formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5
[formerly 6e48567370
] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7
]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf
]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Dustin Johnson
e01c368285
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 5dbff646aa
[formerly fbcfdd0ca1
] [formerly 52c27ec57f
] [formerly 5dbff646aa
[formerly fbcfdd0ca1
] [formerly 52c27ec57f
] [formerly 1684507bdb
[formerly 52c27ec57f
[formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]]
Former-commit-id: 1684507bdb
Former-commit-id: 49c53e5443
[formerly 2591041c9d
] [formerly 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b
]]
Former-commit-id: 9f863145bc53a4b320485d6a4c216ac1f5122e9a [formerly c5685dbe9f
]
Former-commit-id: 198fb2b6ae
2013-03-27 15:38:36 -05:00
Benjamin Phillippe
e7ea63963d
Issue #1802 Refactored DD transaction management
...
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: 15f5bc0cad
[formerly 4675bed4c2
] [formerly b10b1150be
] [formerly 15f5bc0cad
[formerly 4675bed4c2
] [formerly b10b1150be
] [formerly af05feb5a7
[formerly b10b1150be
[formerly 534777d96a45b275abd9cc26818b7df200974595]]]]
Former-commit-id: af05feb5a7
Former-commit-id: a8350c0129
[formerly 541646148b
] [formerly 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab
]]
Former-commit-id: edbdb2638e5a5abcb6d8adcfa785deaefe6a2f03 [formerly c250bda12b
]
Former-commit-id: 5e50d32bdb
2013-03-25 15:15:38 -05:00
Steve Harris
34d0f59592
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: abdc733151
[formerly 64744fdb19
] [formerly a0573644c4
] [formerly abdc733151
[formerly 64744fdb19
] [formerly a0573644c4
] [formerly 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684
[formerly 4f155a183a
] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1
]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c
]
Former-commit-id: b5d9e75b95
2013-02-21 15:41:39 -06:00
Steve Harris
fac2d20002
13.3.1-1 baseline
...
Former-commit-id: e0406d3183
[formerly 8ae397085e
] [formerly 71e8990021
] [formerly e0406d3183
[formerly 8ae397085e
] [formerly 71e8990021
] [formerly d2a654625f
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf
[formerly e4435815c9
] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4
]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0
]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -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
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
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
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
Dustin Johnson
834a16e4bc
Issue #1412 User Admin dialog should refresh with changes made to authentication data
...
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23
Former-commit-id: 4ec1b32d09
[formerly bad7b754e5
] [formerly b7ed75896b
] [formerly 4ec1b32d09
[formerly bad7b754e5
] [formerly b7ed75896b
] [formerly a354bac4da
[formerly b7ed75896b
[formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]]
Former-commit-id: a354bac4da
Former-commit-id: a010315743
[formerly 424a70dbfe
] [formerly 53baf13d05630029a4556dcb8562eff91b689c93 [formerly 0d5bb5ba95
]]
Former-commit-id: f99fcc7f473dbe7b10a2d765f054c5b16bffbc0b [formerly 09a33ab8ac
]
Former-commit-id: d4d1a95461
2013-01-09 15:40:36 -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