Commit graph

136 commits

Author SHA1 Message Date
Richard Peter
042468f761 Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 7ebbc0cf78 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]
Former-commit-id: 7af0cfaf38
2014-03-12 09:47:29 -05:00
Dave Hladky
7cd4304140 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: 76e216d319 [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]
Former-commit-id: 3500ad262a
2014-03-11 15:53:59 -05:00
Richard Peter
7bd6a07913 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: 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 0e25ae35c1
2014-02-27 15:18:26 -06:00
Dave Hladky
542ba7e504 Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: 49f6c31256 [formerly 60c9027b219f3de7193320e5a55911c740e58f30]
Former-commit-id: c4bed432da
2014-02-21 16:01:20 -06:00
Mike Duff
33f81d8822 Issue #2636 - Change how retrieval plan is updated over time.
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: 911789b910 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]
Former-commit-id: 89bd047283
2014-02-18 12:05:26 -06:00
Brad Gonzales
379c0fb46c 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: ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]
Former-commit-id: 19460ed0d7
2014-02-18 11:10:44 -06:00
Brad Gonzales
9529c1d191 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: 704e466f28 [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]
Former-commit-id: 9c50fb29fd
2014-02-07 09:35:36 -06:00
Dave Hladky
7fb7e10cda Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 39f97723d6 [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]
Former-commit-id: 6172c83afc
2014-02-05 14:49:26 -06:00
Richard Peter
21b0a87d78 Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: e5af004993 [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]
Former-commit-id: 8f844bc9ce
2014-02-04 18:12:48 -06:00
Mike Duff
2ca26aaa39 Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: eb46191ba9 [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]
Former-commit-id: eee642ac9b
2014-02-04 14:01:29 -06:00
Mike Duff
4d529f5051 Issue #2745 - Don't display fulfilled or cancelled allocations
Former-commit-id: c9b98868d2 [formerly 7b7f294622e886d7457d7abe0451d3e819568677]
Former-commit-id: f81772f4be
2014-02-03 16:57:03 -06:00
Steve Harris
14ba3b29f4 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: 1aea63a1f6 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]
Former-commit-id: 1738185503
2014-01-29 09:41:57 -06:00
Brad Gonzales
afbaf72617 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: 02f9fd20dc [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]
Former-commit-id: e94023097e
2014-01-26 20:31:38 -06:00
Lee Venable
e3e3c4feef Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
Former-commit-id: d9d985eee4 [formerly 9e39a2d080e9727965a4e840847d9940af2ec3ad]
Former-commit-id: a49cfc6a74
2014-01-26 19:17:04 -06:00
Mike Duff
2c4f25ae81 Issue #2636 - Fix point scheduling
Former-commit-id: c0e7aa2af3 [formerly 6291c630ca3c1999870eb6045c95131153b1d305]
Former-commit-id: af45ad9ac1
2014-01-26 18:59:10 -06:00
Dave Hladky
efbb7faced Issue #2741 Fixed nullpointers in Retrieval and BWM
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576

Former-commit-id: 2e1d02fe21 [formerly 3c47b3cb0ee18e485082e8a53d43b38722c5dce4]
Former-commit-id: c06fd8317c
2014-01-26 18:15:09 -06:00
Mike Duff
a4a910daf1 Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b

Former-commit-id: 4334640c22 [formerly c0d49492af75d0411d6c0c2541af440302595b6a]
Former-commit-id: 6f7cadba9f
2014-01-25 14:09:02 -06:00
Steve Harris
a465718a0d 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: 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]
Former-commit-id: 24ab7cff49
2014-01-21 12:36:54 -06:00
Mike Duff
9bd8e84b9f Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 9a2d2af4a9 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]
Former-commit-id: bdf6a002f6
2014-01-20 17:44:02 -06:00
Dave Hladky
470ce5269e Issue #2398 Fixed scheduling outside of active period/ expired window
Change-Id: I6a07a597e84351d02cb1a0da29f796d86af28107

Former-commit-id: dfc0d6d9f5 [formerly d5e3fdf7bd51177d24312d9daa6af7a2a4920f06]
Former-commit-id: ae45dee861
2014-01-20 17:35:44 -06:00
Richard Peter
e6bc012925 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 29ba337367 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]
Former-commit-id: 6b859c9a42
2014-01-20 17:21:21 -06:00
Max Schenkelberg
1256748c42 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]
Former-commit-id: 68aa666045
2014-01-20 13:54:27 -06:00
Brad Gonzales
061884910d 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: 6b8da117e4 [formerly 253b19d5cd1c7950209521a708b5ad9abbf000f6]
Former-commit-id: 0635a368c6
2014-01-20 13:08:27 -06:00
Mike Duff
0cfa9ee36c Issue #2459 - Remove unscheduled status from UI
Former-commit-id: 25d1d39fc2 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]
Former-commit-id: 93cb80cfc7
2014-01-17 15:34:48 -06:00
Brad Gonzales
b3f9678dba 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: ee4dc7068b [formerly b0c2fcb5e802815b886f669b633e516b022b55a3]
Former-commit-id: e308f2a6ee
2014-01-16 16:54:12 -06:00
Nate Jensen
9028260386 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 9d529b3b21 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]
Former-commit-id: ae10129713
2014-01-15 17:36:30 -06:00
Brad Gonzales
a2fbcecef6 Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28

Former-commit-id: 46a2a5f70f [formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]
Former-commit-id: 3e3fcfa9af
2014-01-15 17:16:47 -06:00
Dave Hladky
eddceed756 Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c

Former-commit-id: c57c27c843 [formerly b888d311923ba0628fa015018ef2f62fce47fb43]
Former-commit-id: 08625addba
2014-01-15 10:05:20 -06:00
Mike Duff
d03c012a54 Issue #2459 - Refactor the subscription status
Former-commit-id: 245d76358e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]
Former-commit-id: f94593867e
2014-01-15 09:21:30 -06:00
Dave Hladky
56b0f4274d Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
Former-commit-id: 8a6a386410 [formerly 339245a534bf2da5071536e959086d5e4f7b2bf0]
Former-commit-id: fee9c183f9
2014-01-14 15:29:15 -06:00
Mike Duff
2a1f84b72d Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.
Former-commit-id: 9e817de4a9 [formerly 605f5a0a496deeb9be0e3aed1a56f6ac816038b4]
Former-commit-id: 92b404f6ec
2014-01-13 09:25:34 -06:00
Brad Gonzales
8eeb3dc412 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: 343a2495e5 [formerly 33a3dead503276926af71d7355f87242f5250e54]
Former-commit-id: 4537513df7
2014-01-10 16:37:09 -06:00
Richard Peter
60f22e2d4c Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
Former-commit-id: 51c8919ea7 [formerly 974e2fb98c17fe843025346954d727fb9d72a408]
Former-commit-id: 48184fe695
2014-01-10 15:42:08 -06:00
Mike Duff
26e34bb4d1 Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034

Former-commit-id: 744d7367dc [formerly 12500574ade0eced65454ff981b83f8f729cd125]
Former-commit-id: b50ea7b162
2014-01-10 12:14:27 -06:00
Mike Duff
8993103c45 Issue #2636 - change log statements, add missing copyright headers
Former-commit-id: 3be3a8ac0d [formerly 8bf5a8185c09e9d368afc8e8e7409222164159aa]
Former-commit-id: 12a8618c42
2014-01-10 10:55:17 -06:00
Mike Duff
30b65a4fe7 Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: a264cb06a1 [formerly b841e795f2a18bf902ec373c9f79b191db177fde]
Former-commit-id: 183ca614df
2014-01-09 10:29:21 -06:00
Brad Gonzales
02910c2a8c 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: 12860c79f9 [formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]
Former-commit-id: 07a4420596
2014-01-08 13:37:17 -06:00
Max Schenkelberg
b3aed99142 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: cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]
Former-commit-id: 16046a4dde
2014-01-06 17:03:45 -06:00
Brad Gonzales
253cc9df80 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: b2b352a5ae [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]
Former-commit-id: cc75442fa3
2013-12-17 11:57:06 -06:00
Brad Gonzales
d329fc26bb Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: d0ae47d053 [formerly f4c1739687685a22847a09490724e84825032146]
Former-commit-id: d324400d65
2013-12-17 09:43:12 -06:00
Mike Duff
685c07cde0 Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: eb591030d8 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]
Former-commit-id: b310cf0388
2013-12-13 16:03:36 -06:00
Brad Gonzales
6515d6a9e5 Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 96dc3b65b1 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]
Former-commit-id: 112649eff2
2013-12-11 17:06:41 -06:00
Brad Gonzales
419230d6db Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: cfa7128be2 [formerly c12676830e66cf8e18f10e835c0f95e25074d992]
Former-commit-id: 5dd466e22a
2013-12-11 11:19:40 -06:00
Brad Gonzales
3d34764022 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: 72df38075f [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]
Former-commit-id: 410a00c72a
2013-12-05 15:17:14 -06:00
Mike Duff
a412a19583 Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: 0c452e2434 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]
Former-commit-id: 4796f43495
2013-12-05 13:35:31 -06:00
Dave Hladky
6607e5fe30 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 593f24023d [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]
Former-commit-id: 483ec5d22f
2013-12-04 11:58:49 -06:00
Brad Gonzales
c7959336f5 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: d2cfc5986a [formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]
Former-commit-id: 93b47ce68b
2013-11-20 15:49:27 -06:00
Brad Gonzales
5576ac6134 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: 95a1914c71 [formerly c245f741b9e78d8e4503698336d9929536e72e0d]
Former-commit-id: 053f20c70b
2013-11-20 11:58:33 -06:00
Brad Gonzales
938683ba4d 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: 53d4de12d9 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]
Former-commit-id: aa8fb36fc1
2013-11-15 08:00:47 -06:00
Richard Peter
c25ba19514 Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: f12839a9e5 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]
Former-commit-id: 9af1de07d4
2013-11-12 13:47:04 -06:00