Richard Peter
e8ea7b80e6
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
...
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 7af0cfaf387ebbc0cf78
2014-03-12 09:47:29 -05:00
Dave Hladky
03fd32144a
Issue #2678 end retrieval double clutching
...
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 3500ad262a76e216d319
2014-03-11 15:53:59 -05:00
Richard Peter
f13c86bc3e
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: 0e25ae35c11c150e6e8b
2014-02-27 15:18:26 -06:00
Dave Hladky
445b55f796
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: c4bed432da49f6c31256
2014-02-21 16:01:20 -06:00
Mike Duff
5f9d913c6d
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 89bd047283911789b910
2014-02-18 12:05:26 -06:00
Brad Gonzales
3be3380944
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: 19460ed0d7ba4e308328
2014-02-18 11:10:44 -06:00
Brad Gonzales
0b211e8036
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: 9c50fb29fd704e466f28
2014-02-07 09:35:36 -06:00
Dave Hladky
2b998409f5
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 6172c83afc39f97723d6
2014-02-05 14:49:26 -06:00
Richard Peter
4309c55a5f
Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
...
Former-commit-id: 8f844bc9cee5af004993
2014-02-04 18:12:48 -06:00
Mike Duff
684390e599
Issue #2636 - Scheduling refactor. Single scheduling method now.
...
Review comments
Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58
Former-commit-id: eee642ac9beb46191ba9
2014-02-04 14:01:29 -06:00
Mike Duff
4a07f6fb4c
Issue #2745 - Don't display fulfilled or cancelled allocations
...
Former-commit-id: f81772f4bec9b98868d2
2014-02-03 16:57:03 -06:00
Steve Harris
1fd5b2255f
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: 17381855031aea63a1f6
2014-01-29 09:41:57 -06:00
Brad Gonzales
a40afbe8ac
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: e94023097e02f9fd20dc
2014-01-26 20:31:38 -06:00
Lee Venable
f387778dce
Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
...
Former-commit-id: a49cfc6a74d9d985eee4
2014-01-26 19:17:04 -06:00
Mike Duff
f04058849f
Issue #2636 - Fix point scheduling
...
Former-commit-id: af45ad9ac1c0e7aa2af3
2014-01-26 18:59:10 -06:00
Dave Hladky
64991d004c
Issue #2741 Fixed nullpointers in Retrieval and BWM
...
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576
Former-commit-id: c06fd8317c2e1d02fe21
2014-01-26 18:15:09 -06:00
Mike Duff
3e26dc54df
Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
...
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b
Former-commit-id: 6f7cadba9f4334640c22
2014-01-25 14:09:02 -06:00
Steve Harris
252c7ee40a
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: 24ab7cff4969dc3d835b
2014-01-21 12:36:54 -06:00
Mike Duff
9112366cae
Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
...
Former-commit-id: bdf6a002f69a2d2af4a9
2014-01-20 17:44:02 -06:00
Dave Hladky
986e0d7dbe
Issue #2398 Fixed scheduling outside of active period/ expired window
...
Change-Id: I6a07a597e84351d02cb1a0da29f796d86af28107
Former-commit-id: ae45dee861dfc0d6d9f5
2014-01-20 17:35:44 -06:00
Richard Peter
4887054146
Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
...
Former-commit-id: 6b859c9a4229ba337367
2014-01-20 17:21:21 -06:00
Max Schenkelberg
2574685291
Issue #2620 Fixed manifest issues for baseline p2 export
...
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3
Former-commit-id: 68aa66604587a6db7853
2014-01-20 13:54:27 -06:00
Brad Gonzales
8e307a22e6
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: 0635a368c66b8da117e4
2014-01-20 13:08:27 -06:00
Mike Duff
a04430e334
Issue #2459 - Remove unscheduled status from UI
...
Former-commit-id: 93cb80cfc725d1d39fc2
2014-01-17 15:34:48 -06:00
Brad Gonzales
31705fddf5
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: e308f2a6eeee4dc7068b
2014-01-16 16:54:12 -06:00
Nate Jensen
1be41d69c6
Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
...
Former-commit-id: ae101297139d529b3b21
2014-01-15 17:36:30 -06:00
Brad Gonzales
a1429a3911
Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
...
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28
Former-commit-id: 3e3fcfa9af46a2a5f70f
2014-01-15 17:16:47 -06:00
Dave Hladky
6069bb90c7
Issue #2679 Multiple regions for a single collector mapped to single WFS source
...
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: 08625addbac57c27c843
2014-01-15 10:05:20 -06:00
Mike Duff
d96a9d2937
Issue #2459 - Refactor the subscription status
...
Former-commit-id: f94593867e245d76358e
2014-01-15 09:21:30 -06:00
Dave Hladky
79e5b19f31
Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
...
Former-commit-id: fee9c183f98a6a386410
2014-01-14 15:29:15 -06:00
Mike Duff
fc3dec0591
Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.
...
Former-commit-id: 92b404f6ec9e817de4a9
2014-01-13 09:25:34 -06:00
Brad Gonzales
4049af9630
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: 4537513df7343a2495e5
2014-01-10 16:37:09 -06:00
Richard Peter
cf2c9c530c
Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
...
Former-commit-id: 48184fe69551c8919ea7
2014-01-10 15:42:08 -06:00
Mike Duff
0e5332e8cd
Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
...
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034
Former-commit-id: b50ea7b162744d7367dc
2014-01-10 12:14:27 -06:00
Mike Duff
e121eb5dbd
Issue #2636 - change log statements, add missing copyright headers
...
Former-commit-id: 12a8618c423be3a8ac0d
2014-01-10 10:55:17 -06:00
Mike Duff
4620b69f08
Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
...
Former-commit-id: 183ca614dfa264cb06a1
2014-01-09 10:29:21 -06:00
Brad Gonzales
be6f12e9c2
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: 07a442059612860c79f9
2014-01-08 13:37:17 -06:00
Max Schenkelberg
f58795f460
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: 16046a4ddecc2080449c
2014-01-06 17:03:45 -06:00
Brad Gonzales
0df42dacfd
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: cc75442fa3b2b352a5ae
2013-12-17 11:57:06 -06:00
Brad Gonzales
8476a13e41
Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
...
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168
Former-commit-id: d324400d65d0ae47d053
2013-12-17 09:43:12 -06:00
Mike Duff
0deef9b6dd
Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
...
Former-commit-id: b310cf0388eb591030d8
2013-12-13 16:03:36 -06:00
Brad Gonzales
79efc3b53a
Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
...
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c
Former-commit-id: 112649eff296dc3b65b1
2013-12-11 17:06:41 -06:00
Brad Gonzales
531c598e3b
Issue #2566 fix bandwidthmanager spring file resource resolution.
...
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731
Former-commit-id: 5dd466e22acfa7128be2
2013-12-11 11:19:40 -06:00
Brad Gonzales
c54fe467a3
Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
...
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
the edex.core.modes package. Move EdexMode, DefaultEdexMode, and EdexModesContainer
to the same package.
Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb
Former-commit-id: 410a00c72a72df38075f
2013-12-05 15:17:14 -06:00
Mike Duff
7f2ddb1360
Issue #2545 - Get bandwidth graph data by network
...
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314
Former-commit-id: 4796f434950c452e2434
2013-12-05 13:35:31 -06:00
Dave Hladky
4060748634
Issue #1736 Add registry bandwidth tracking
...
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6
Former-commit-id: 483ec5d22f593f24023d
2013-12-04 11:58:49 -06:00
Brad Gonzales
04d7bff784
Issue #2448 Fixed problem that set subscription start time to first cycle time.
...
Fixed problem that set subscription end time to end of day.
Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65
Former-commit-id: 93b47ce68bd2cfc5986a
2013-11-20 15:49:27 -06:00
Brad Gonzales
04829d37e2
Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
...
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring. Removed the SBN route from wfo mode.
Amend: Comment updates from peer review.
Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8
Former-commit-id: 053f20c70b95a1914c71
2013-11-20 11:58:33 -06:00
Brad Gonzales
490c95d010
Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
...
Added missing comma to com.raytheon.edex.plugin.text.
Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162
Former-commit-id: aa8fb36fc153d4de12d9
2013-11-15 08:00:47 -06:00
Richard Peter
c8ff79a7f5
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: 9af1de07d4f12839a9e5
2013-11-12 13:47:04 -06:00
