Commit graph

146 commits

Author SHA1 Message Date
Dave Hladky
766d9f09a7 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]]
Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97]
Former-commit-id: 7e763a5a22
2014-05-05 12:15:14 -05:00
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
Brian.Dyke
f4856aae4d Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
2014-04-30 12:57:09 -04:00
Dave Hladky
15f50d3f36 Issue #2887 Previously missed check for start/end of sub (isExpired()).
Change-Id: I9a720b8db129ff7b82547531240d055499a57cfe

Former-commit-id: a3d2d3d6c8 [formerly f51497a3ce] [formerly 5bc1f147c9] [formerly a3d2d3d6c8 [formerly f51497a3ce] [formerly 5bc1f147c9] [formerly 0d78546434 [formerly 5bc1f147c9 [formerly 9af92514064e0c994be6d285f66f17c922e9d428]]]]
Former-commit-id: 0d78546434
Former-commit-id: 8e538ffe3c [formerly 8745a877c5] [formerly 6ffb4bb2051a3cbe1d8b90bdd14a0e9076a05607 [formerly b1ec77c64e]]
Former-commit-id: cc474492b77ef77785522f7375a1de2be4468d8a [formerly 909646ec3c]
Former-commit-id: 6e961f7010
2014-04-21 15:30:45 -05:00
Dave Hladky
13137a0a9a Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]]
Former-commit-id: 45059e722a
Former-commit-id: 883febe498 [formerly 117a3953af] [formerly 28cb7341b151f55976a91b298b2eaf8e4e117a17 [formerly ae84d2991e]]
Former-commit-id: 5061f97fcc5146801882be2758be31c8f5835bed [formerly 6c83fd0929]
Former-commit-id: 4ce5dfcd92
2014-04-21 12:26:47 -05:00
Richard Peter
0fc963bbc8 Merge "Issue #2810 Added comparator to BandwidthAllocations Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85" into development
Former-commit-id: 4ba272b071 [formerly 7acdf727ce] [formerly 545203a833] [formerly 4ba272b071 [formerly 7acdf727ce] [formerly 545203a833] [formerly 7093d6ff0e [formerly 545203a833 [formerly 79f857137cdc4bba40c3d6804c72dab8a4fe6ae0]]]]
Former-commit-id: 7093d6ff0e
Former-commit-id: e7cc3044e7 [formerly b3dd0a933c] [formerly c343754cdf22b2f328978110a7fef5d5ee9e7d8b [formerly dc429091da]]
Former-commit-id: 0464101d9194c2a1dfd91fc37f920f04e8dde8ce [formerly ecc9eb5268]
Former-commit-id: 21b77c1310
2014-04-04 14:39:46 -05:00
Dave Hladky
3f342820ee Issue #2810 Added comparator to BandwidthAllocations
Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85

Former-commit-id: ed6412446c [formerly 49d2b31fab] [formerly 78bae7e97b] [formerly ed6412446c [formerly 49d2b31fab] [formerly 78bae7e97b] [formerly fb642de109 [formerly 78bae7e97b [formerly f36998ca1d3bf606bb34cc8747fb17620ee78681]]]]
Former-commit-id: fb642de109
Former-commit-id: 55f4e46b93 [formerly 03722fb48f] [formerly 65e576ecef7b4cc818d777df06252e86ba0332bf [formerly 5c866b074f]]
Former-commit-id: 63e6ac082fdedac7993138f834c29c52cffe34cb [formerly 4e2bb04e5d]
Former-commit-id: 3c534127ce
2014-04-03 14:05:42 -05:00
Richard Peter
f73d41c0b4 Merge "Issue #2789 Implement Version transformations Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c" into development
Former-commit-id: 440d0b0cf2 [formerly 2323545c09] [formerly 6c3a453491] [formerly 440d0b0cf2 [formerly 2323545c09] [formerly 6c3a453491] [formerly 7c879fe6f0 [formerly 6c3a453491 [formerly 0801ff25548b90506133897fdb90284ac108672c]]]]
Former-commit-id: 7c879fe6f0
Former-commit-id: aa23c1b4b2 [formerly 96089b8c78] [formerly cde36de652e2a8a90246bd21a5cb92c2942090ae [formerly 6251f08212]]
Former-commit-id: 89dea13bfc7e7b7db5c613761c9b63d6f58f8475 [formerly fcbcd2f5d5]
Former-commit-id: accc6a7e19
2014-04-03 13:08:05 -05:00
Dave Hladky
ea0aa8d72b Issue #2789 Implement Version transformations
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c

Former-commit-id: cb3d8690d7 [formerly 4fab01e109] [formerly e80005a1c4] [formerly cb3d8690d7 [formerly 4fab01e109] [formerly e80005a1c4] [formerly 5064730dfa [formerly e80005a1c4 [formerly 50279c71ad037d462f195c5f785165d2eee26f87]]]]
Former-commit-id: 5064730dfa
Former-commit-id: 06d1b23130 [formerly 7e34763fcd] [formerly c9c0ad31bf409df400d480658e34b3729aca6872 [formerly ae13afc1c6]]
Former-commit-id: a8d38c06b2f4a3af46d59359d753a3fae8664b66 [formerly f692a99403]
Former-commit-id: c49b22c94d
2014-04-03 09:44:14 -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
493e805cbe Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 7ebbc0cf78 [formerly 7af0cfaf38 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: abf39442ba [formerly f5e1fb569a] [formerly 67499353bc5b2802a0bbc17ca5f119b6ddd6836d [formerly e8ea7b80e6]]
Former-commit-id: cbe3cfa55d05a9b0aaca0d648dd1b36fd4c563be [formerly e2ae7de485]
Former-commit-id: 8b425fed86
2014-03-12 09:47:29 -05:00
Dave Hladky
177e76f996 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly 76e216d319 [formerly 3500ad262a [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]]
Former-commit-id: 76e216d319
Former-commit-id: 39cc47bc52 [formerly f3876233e4] [formerly 28b9b16fdbb85a6e9a3afb5298b0813e917a59b1 [formerly 03fd32144a]]
Former-commit-id: 451a7125613fe9ce3c298e07c814874021718d47 [formerly c0d2eb8f6b]
Former-commit-id: 78441a1250
2014-03-11 15:53:59 -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
Dave Hladky
15edb8e522 Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly 49f6c31256 [formerly c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]]
Former-commit-id: 49f6c31256
Former-commit-id: e15d2f50f9 [formerly 3b9f80d03e] [formerly de3f95e5f61e7ea15849603d3138b155fe401280 [formerly 445b55f796]]
Former-commit-id: 1b4853e591b02029ef646ca2512a6fb8faddce26 [formerly c545368839]
Former-commit-id: c4e70210fd
2014-02-21 16:01:20 -06:00
Mike Duff
08bd755af0 Issue #2636 - Change how retrieval plan is updated over time.
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly 911789b910 [formerly 89bd047283 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]]
Former-commit-id: 911789b910
Former-commit-id: cddd263edc [formerly 42e6591bc8] [formerly 63198d978b2d9ab9f18c26071e586f7a38cac365 [formerly 5f9d913c6d]]
Former-commit-id: f2a50ed00c3b42b132cd818df4e07da12380595e [formerly d277c1caf1]
Former-commit-id: 2467a11a7e
2014-02-18 12:05:26 -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
Brad Gonzales
304704a39d Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly 704e466f28 [formerly 9c50fb29fd [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]]
Former-commit-id: 704e466f28
Former-commit-id: e57abad188 [formerly b59278f73f] [formerly fce69a5a63e582579ba583e885690b5aed2ab58f [formerly 0b211e8036]]
Former-commit-id: ce3bd1dae0d4336304304ae2262d659cba06e09c [formerly 104625b66d]
Former-commit-id: a8256a5202
2014-02-07 09:35:36 -06: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
Richard Peter
793aabd17e Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly e5af004993 [formerly 8f844bc9ce [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]]
Former-commit-id: e5af004993
Former-commit-id: 0c66686f19 [formerly d3f13fc4c7] [formerly 221df5c8f19958cdb7f96c8c47eb4903283decbe [formerly 4309c55a5f]]
Former-commit-id: cd20d2699e4537618b026ece7d62e0cb6723221f [formerly 1b8aacc92f]
Former-commit-id: 1aaeaf0037
2014-02-04 18:12:48 -06:00
Mike Duff
451406c3c5 Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly eb46191ba9 [formerly eee642ac9b [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]]
Former-commit-id: eb46191ba9
Former-commit-id: b7b0bdbfdd [formerly 38aeb23274] [formerly faacb82cc4cbe77a20073a957c9af17454152fba [formerly 684390e599]]
Former-commit-id: 9ebb64c46709c9a6c6431598e44ae990be200fb2 [formerly e8dea0d0dc]
Former-commit-id: bd52f67e0c
2014-02-04 14:01:29 -06:00
Mike Duff
f7f6516da2 Issue #2745 - Don't display fulfilled or cancelled allocations
Former-commit-id: 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly c9b98868d2 [formerly f81772f4be [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]]
Former-commit-id: c9b98868d2
Former-commit-id: c9aa63c3c8 [formerly 8b3b5a688f] [formerly 444d2596405cc6142a1dc0b4b806d00c570225c6 [formerly 4a07f6fb4c]]
Former-commit-id: f563b418bf49a1b36f27d31b1c9de60b6b56ab31 [formerly 1065c56bde]
Former-commit-id: a33c96d8fc
2014-02-03 16:57:03 -06:00
Steve Harris
fb3a30b3b3 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly f562540e7c [formerly 14ba3b29f4] [formerly 1738185503] [formerly 1aea63a1f6 [formerly 1738185503 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: cdb99cc3e0 [formerly d9cd003a5a] [formerly 5d9047e5063900e85cef179c5be76057b8ca6cd1 [formerly 1fd5b2255f]]
Former-commit-id: 50ad78f33f6b09f52d5450f88139cd7ee524d3fd [formerly ec69a2c4f7]
Former-commit-id: e3d1abe909
2014-01-29 09:41:57 -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
Lee Venable
effcad7487 Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
Former-commit-id: a2d5ac6a20 [formerly e3e3c4feef] [formerly a49cfc6a74] [formerly a2d5ac6a20 [formerly e3e3c4feef] [formerly a49cfc6a74] [formerly d9d985eee4 [formerly a49cfc6a74 [formerly 9e39a2d080e9727965a4e840847d9940af2ec3ad]]]]
Former-commit-id: d9d985eee4
Former-commit-id: dd2dfceab2 [formerly f7dff455d2] [formerly 5f366aedf7b2ddda435296df7d5daca4ff12d14c [formerly f387778dce]]
Former-commit-id: b5a2dec0314faf47df86fa1cc2f241044a7433fb [formerly f64efd9712]
Former-commit-id: 4cbf1f4ff4
2014-01-26 19:17:04 -06:00
Mike Duff
3efeba383b Issue #2636 - Fix point scheduling
Former-commit-id: a617ded73f [formerly 2c4f25ae81] [formerly af45ad9ac1] [formerly a617ded73f [formerly 2c4f25ae81] [formerly af45ad9ac1] [formerly c0e7aa2af3 [formerly af45ad9ac1 [formerly 6291c630ca3c1999870eb6045c95131153b1d305]]]]
Former-commit-id: c0e7aa2af3
Former-commit-id: 8efdea8fab [formerly e02576f737] [formerly 8b684dac184430b2c33872505cf6993afc93701c [formerly f04058849f]]
Former-commit-id: bfa0b8dbad5e8a9a988251be2f87878340b199aa [formerly 190964c224]
Former-commit-id: 5fb0034000
2014-01-26 18:59:10 -06:00
Dave Hladky
c6c43b4b4c Issue #2741 Fixed nullpointers in Retrieval and BWM
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576

Former-commit-id: 6b263aa771 [formerly efbb7faced] [formerly c06fd8317c] [formerly 6b263aa771 [formerly efbb7faced] [formerly c06fd8317c] [formerly 2e1d02fe21 [formerly c06fd8317c [formerly 3c47b3cb0ee18e485082e8a53d43b38722c5dce4]]]]
Former-commit-id: 2e1d02fe21
Former-commit-id: e52c4df6e1 [formerly 3bf1afdf70] [formerly b6e7eea399c4c32389427091c40541f8992bc3c5 [formerly 64991d004c]]
Former-commit-id: 3922798354c33c4c6e6e142d19cfbd6921e865a4 [formerly c735006401]
Former-commit-id: 50cf7cbaeb
2014-01-26 18:15:09 -06:00
Mike Duff
645998a25d Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b

Former-commit-id: 439f0ab55a [formerly a4a910daf1] [formerly 6f7cadba9f] [formerly 439f0ab55a [formerly a4a910daf1] [formerly 6f7cadba9f] [formerly 4334640c22 [formerly 6f7cadba9f [formerly c0d49492af75d0411d6c0c2541af440302595b6a]]]]
Former-commit-id: 4334640c22
Former-commit-id: 82ea159287 [formerly c8e199569a] [formerly ee5e22e05d90a6bf7102e085b4c3e6311e5a6121 [formerly 3e26dc54df]]
Former-commit-id: bf35956d28e0d66ed96bc4d2006f484c68071f63 [formerly a7eed82b28]
Former-commit-id: 952c843d02
2014-01-25 14:09:02 -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
Dave Hladky
940945ebcf Issue #2398 Fixed scheduling outside of active period/ expired window
Change-Id: I6a07a597e84351d02cb1a0da29f796d86af28107

Former-commit-id: 8e3f8b878c [formerly 470ce5269e] [formerly ae45dee861] [formerly 8e3f8b878c [formerly 470ce5269e] [formerly ae45dee861] [formerly dfc0d6d9f5 [formerly ae45dee861 [formerly d5e3fdf7bd51177d24312d9daa6af7a2a4920f06]]]]
Former-commit-id: dfc0d6d9f5
Former-commit-id: 37a34e450e [formerly 02d357c803] [formerly 6cd36c883560cd24390647a125e2c8bcf489e09f [formerly 986e0d7dbe]]
Former-commit-id: 9a804df08a40c927c4da2157af403c2110c0d331 [formerly 305697650e]
Former-commit-id: 0c8901b01d
2014-01-20 17:35:44 -06:00
Richard Peter
caf9de2ed6 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]]
Former-commit-id: 29ba337367
Former-commit-id: fa5e160245 [formerly 4796beec29] [formerly 4d7e2eae126edb00fa4f829dd78950b4c1bcb955 [formerly 4887054146]]
Former-commit-id: d0dd309b0a417a6444396ea3b859924e5cfdca56 [formerly b147653a66]
Former-commit-id: d0ef42d528
2014-01-20 17:21:21 -06:00
Max Schenkelberg
d0abdecaed Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 7073ea5e90 [formerly 1256748c42] [formerly 68aa666045] [formerly 7073ea5e90 [formerly 1256748c42] [formerly 68aa666045] [formerly 87a6db7853 [formerly 68aa666045 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]]
Former-commit-id: 87a6db7853
Former-commit-id: 33a28153bf [formerly 424f2282f0] [formerly d89b6e6e6de809f0a3a0a97dbbdaa5ada41e70fd [formerly 2574685291]]
Former-commit-id: ffa17b4375fc8065e9645d70c0e80c40a61fec8f [formerly 9903335f77]
Former-commit-id: d99c6b49e3
2014-01-20 13:54:27 -06:00
Brad Gonzales
ff5b2e2828 Issue #2678 Better fix for sbn retrieval queue init to null in wfo. Fix for bandwith graph data retrieve of sbn data.
Amend:  updated commit comment in BandwidthGraphData.

Change-Id: Ic77130425e495330fe670086e5bbfad35e7b9287

Former-commit-id: 63da94f3dc [formerly 061884910d] [formerly 0635a368c6] [formerly 63da94f3dc [formerly 061884910d] [formerly 0635a368c6] [formerly 6b8da117e4 [formerly 0635a368c6 [formerly 253b19d5cd1c7950209521a708b5ad9abbf000f6]]]]
Former-commit-id: 6b8da117e4
Former-commit-id: 3ef7702171 [formerly f7e01e3083] [formerly a182b86137b110215d3d58d0237c3557bf44940d [formerly 8e307a22e6]]
Former-commit-id: 714a90c9158fac2d94677863af23542f0bb19219 [formerly d5e7eaab4e]
Former-commit-id: 5ae1d35965
2014-01-20 13:08:27 -06:00
Mike Duff
67bab78c2f Issue #2459 - Remove unscheduled status from UI
Former-commit-id: e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: 5097ed2ad7 [formerly a492ec6a4d] [formerly 77ea703f0626d7ff1caa2689bf5deb3e8b0b0c00 [formerly a04430e334]]
Former-commit-id: 8d18315d712b7d954433a4d91c196a329a74eeaa [formerly dcb5b4a111]
Former-commit-id: 45bef29f75
2014-01-17 15:34:48 -06:00
Brad Gonzales
6da79298ba Issue #2678 fix for sbn retrieval agent subscription queue. init it as null because sbn ingest is from ingest messages.
Amend: Because of the files used specifically for InMemoryBandwidthManagerManager, added the SBN RetrievalPlan back to WFO.

Change-Id: Ibebd89a2dd0236c47e8060489eb67bec9fc8d583

Former-commit-id: 27058db803 [formerly b3f9678dba] [formerly e308f2a6ee] [formerly 27058db803 [formerly b3f9678dba] [formerly e308f2a6ee] [formerly ee4dc7068b [formerly e308f2a6ee [formerly b0c2fcb5e802815b886f669b633e516b022b55a3]]]]
Former-commit-id: ee4dc7068b
Former-commit-id: 944ed64e23 [formerly 3f4785f450] [formerly 4a53586a2d54c19cc9cd2854de59c103a46a5b94 [formerly 31705fddf5]]
Former-commit-id: 2f50828eb412b19f7462819430cd863812b3bcee [formerly 7bb44e47ba]
Former-commit-id: d2629887bf
2014-01-16 16:54:12 -06:00
Nate Jensen
9081058ca2 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 9d529b3b21 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 9f4360fdda [formerly 98e1bf9194] [formerly 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6]]
Former-commit-id: d4f72fd00fd9496a9587b235b75d9efcd7bc6b81 [formerly 3d6d9118ea]
Former-commit-id: 86b9311ed4
2014-01-15 17:36:30 -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
Dave Hladky
216d1afd3b Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c

Former-commit-id: bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly c57c27c843 [formerly 08625addba [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]]]
Former-commit-id: c57c27c843
Former-commit-id: 5cc337003a [formerly 9d136bb7d8] [formerly edd648771874f35130649ae7bc594cfa8f6feda0 [formerly 6069bb90c7]]
Former-commit-id: 5b10a19969ade1327d8d6bec3588ab1fed144fda [formerly abd5127160]
Former-commit-id: 097c4379f0
2014-01-15 10:05:20 -06:00
Mike Duff
5ea95dbca9 Issue #2459 - Refactor the subscription status
Former-commit-id: 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 245d76358e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]]
Former-commit-id: 245d76358e
Former-commit-id: c5f28e0f37 [formerly 9a45b95db6] [formerly ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937]]
Former-commit-id: 86f4629abcfe03116c78ec209c22d6df91eac0b9 [formerly 3c0634b1e8]
Former-commit-id: c8f7edbcad
2014-01-15 09:21:30 -06:00
Dave Hladky
8f841bfd4b Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
Former-commit-id: 19cbf638a6 [formerly 56b0f4274d] [formerly fee9c183f9] [formerly 19cbf638a6 [formerly 56b0f4274d] [formerly fee9c183f9] [formerly 8a6a386410 [formerly fee9c183f9 [formerly 339245a534bf2da5071536e959086d5e4f7b2bf0]]]]
Former-commit-id: 8a6a386410
Former-commit-id: c2bb3ee199 [formerly 5cf9c5bd1c] [formerly a001b689127d9b92213eb6050018ef7a8258e0a4 [formerly 79e5b19f31]]
Former-commit-id: 745af6f55324ec395ec49d15edf5bdbb524c063c [formerly 6a708e4cd6]
Former-commit-id: 30516610ca
2014-01-14 15:29:15 -06:00
Mike Duff
18410979ad Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.
Former-commit-id: c6f92e9207 [formerly 2a1f84b72d] [formerly 92b404f6ec] [formerly c6f92e9207 [formerly 2a1f84b72d] [formerly 92b404f6ec] [formerly 9e817de4a9 [formerly 92b404f6ec [formerly 605f5a0a496deeb9be0e3aed1a56f6ac816038b4]]]]
Former-commit-id: 9e817de4a9
Former-commit-id: e395071beb [formerly 850ee18fd4] [formerly 7d5d1b7a0fc09fb10c44af68831e25eff4f1f078 [formerly fc3dec0591]]
Former-commit-id: 909234f65172df27de3f168396ee4a8c42517053 [formerly ac6e032f8a]
Former-commit-id: fa7989b047
2014-01-13 09:25:34 -06:00
Brad Gonzales
d5d66b8731 Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
RecurringSubscription.  Add environment configuration files to unit tests setup.  Changed the
devRegistry debug port to the same port as registry.

Amend: Updates from peer review.

Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a

Former-commit-id: 2c0c6fbcc7 [formerly 8eeb3dc412] [formerly 4537513df7] [formerly 2c0c6fbcc7 [formerly 8eeb3dc412] [formerly 4537513df7] [formerly 343a2495e5 [formerly 4537513df7 [formerly 33a3dead503276926af71d7355f87242f5250e54]]]]
Former-commit-id: 343a2495e5
Former-commit-id: 6868d8d12d [formerly f57529be9b] [formerly 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0 [formerly 4049af9630]]
Former-commit-id: 2c41b1048f19e32de7cfb868829f77a4d1b22782 [formerly 8b362ee404]
Former-commit-id: b8c7be1225
2014-01-10 16:37:09 -06:00
Richard Peter
bc1e10f36a Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
Former-commit-id: 550b40a4bf [formerly 60f22e2d4c] [formerly 48184fe695] [formerly 550b40a4bf [formerly 60f22e2d4c] [formerly 48184fe695] [formerly 51c8919ea7 [formerly 48184fe695 [formerly 974e2fb98c17fe843025346954d727fb9d72a408]]]]
Former-commit-id: 51c8919ea7
Former-commit-id: b3059957bc [formerly b15476b43e] [formerly dc61c2e1e5f79882b6b9ca4a2f583310cd1d52df [formerly cf2c9c530c]]
Former-commit-id: 284b584c447ab7562f63b4361478a798656ec303 [formerly d4316a7dca]
Former-commit-id: fbb62b2ec8
2014-01-10 15:42:08 -06:00
Mike Duff
ad46fbe905 Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034

Former-commit-id: 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 744d7367dc [formerly b50ea7b162 [formerly 12500574ade0eced65454ff981b83f8f729cd125]]]]
Former-commit-id: 744d7367dc
Former-commit-id: 6440aa8375 [formerly 3274c591bf] [formerly bbcc98303dcc89e98466e092b86268e5c8a053c9 [formerly 0e5332e8cd]]
Former-commit-id: 33bf17f1fd1ffd937bbb693a2081cf16c68bcf78 [formerly d3557c33d0]
Former-commit-id: b471106692
2014-01-10 12:14:27 -06:00
Mike Duff
a35c24280c Issue #2636 - change log statements, add missing copyright headers
Former-commit-id: 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 3be3a8ac0d [formerly 12a8618c42 [formerly 8bf5a8185c09e9d368afc8e8e7409222164159aa]]]]
Former-commit-id: 3be3a8ac0d
Former-commit-id: ae88e49e26 [formerly ea07460e3e] [formerly 7b4e8fc0dd59dffc07172aea3397179483206f25 [formerly e121eb5dbd]]
Former-commit-id: 510296653b6e3a1f298a2c560e342f6652c2854b [formerly 9c4eaabf29]
Former-commit-id: cdd2e23eb6
2014-01-10 10:55:17 -06:00
Mike Duff
f5d13adc34 Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly a264cb06a1 [formerly 183ca614df [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]]
Former-commit-id: a264cb06a1
Former-commit-id: f6d58f7615 [formerly 05b6508299] [formerly 1723170c25ee5bf976e58a1096d080a768d79925 [formerly 4620b69f08]]
Former-commit-id: eda2ee87762a8696e1f7816588a6c03614038065 [formerly 4bd12c488b]
Former-commit-id: 621bbe5ce6
2014-01-09 10:29:21 -06:00
Brad Gonzales
8fd73a5cd9 Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
thrown from run.  Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated.  Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.

Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617

Former-commit-id: c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly 12860c79f9 [formerly 07a4420596 [formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]]]]
Former-commit-id: 12860c79f9
Former-commit-id: ad3da98af6 [formerly 5c85734e02] [formerly 53dd09e9f01677738d8bb7bceaf559f45f59115c [formerly be6f12e9c2]]
Former-commit-id: d63be2574bfe21dc4708216b7f896c519c9d925a [formerly a1ee60d16d]
Former-commit-id: 44cff7514d
2014-01-08 13:37:17 -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
2fd6d50617 Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly b2b352a5ae [formerly cc75442fa3 [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]]
Former-commit-id: b2b352a5ae
Former-commit-id: 38198d379b [formerly 6e78d3a521] [formerly b11a7f8006104e7102802aa4735db3bf8c3aaff8 [formerly 0df42dacfd]]
Former-commit-id: d94d9163be833c49e9da0c0ffbb86ce778b60899 [formerly 4f6b8a79bb]
Former-commit-id: f71ea9eeb4
2013-12-17 11:57:06 -06:00
Brad Gonzales
af8b8cf0f5 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly d0ae47d053 [formerly d324400d65 [formerly f4c1739687685a22847a09490724e84825032146]]]]
Former-commit-id: d0ae47d053
Former-commit-id: 413d6e83d3 [formerly 729ab5d41e] [formerly 230f64f02e7a5999b7f549e68cba93e994622dda [formerly 8476a13e41]]
Former-commit-id: 71ca5ec5cbf790259ccbbf23ade4ec069ca5e700 [formerly f0f1abea6b]
Former-commit-id: b12fc921a5
2013-12-17 09:43:12 -06:00