Dave Hladky
ccaaa1cfea
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: 2e5ee5565d1847490e46c59866b14f77555e2a7e
2014-05-05 12:15:14 -05:00
Dave Hladky
3b00ae03cc
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a34955102d1316135c4151210daba0e5807ff6c9
2014-04-30 17:38:28 -05:00
Brian.Dyke
63137ed69c
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: 64c3766ed570885a796f846b889d40413e8250c6
2014-04-30 12:57:09 -04:00
Dave Hladky
0d78546434
Issue #2887 Previously missed check for start/end of sub (isExpired()).
...
Change-Id: I9a720b8db129ff7b82547531240d055499a57cfe
Former-commit-id: 9af92514064e0c994be6d285f66f17c922e9d428
2014-04-21 15:30:45 -05:00
Dave Hladky
45059e722a
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Richard Peter
7093d6ff0e
Merge "Issue #2810 Added comparator to BandwidthAllocations Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85" into development
...
Former-commit-id: 79f857137cdc4bba40c3d6804c72dab8a4fe6ae0
2014-04-04 14:39:46 -05:00
Dave Hladky
fb642de109
Issue #2810 Added comparator to BandwidthAllocations
...
Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85
Former-commit-id: f36998ca1d3bf606bb34cc8747fb17620ee78681
2014-04-03 14:05:42 -05:00
Richard Peter
7c879fe6f0
Merge "Issue #2789 Implement Version transformations Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c" into development
...
Former-commit-id: 0801ff25548b90506133897fdb90284ac108672c
2014-04-03 13:08:05 -05:00
Dave Hladky
5064730dfa
Issue #2789 Implement Version transformations
...
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c
Former-commit-id: 50279c71ad037d462f195c5f785165d2eee26f87
2014-04-03 09:44:14 -05:00
Dave Hladky
9479219b73
Issue #2889 user who issued change now shows in notification center
...
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: adc364d92a7fcb2a255a2f448efb56ef48492280
2014-04-02 14:06:25 -05:00
Richard Peter
7ebbc0cf78
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
...
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 3f0cf9200a42adb2bd7dbd70e50642e940d6b822
2014-03-12 09:47:29 -05:00
Dave Hladky
76e216d319
Issue #2678 end retrieval double clutching
...
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 31a35e35b75bc9e6efc43af1da0b184c1828ff45
2014-03-11 15:53:59 -05:00
Richard Peter
1c150e6e8b
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: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
Dave Hladky
49f6c31256
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 60c9027b219f3de7193320e5a55911c740e58f30
2014-02-21 16:01:20 -06:00
Mike Duff
911789b910
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5
2014-02-18 12:05:26 -06:00
Brad Gonzales
ba4e308328
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: d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb
2014-02-18 11:10:44 -06:00
Brad Gonzales
704e466f28
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: f1a4a7b24290b6e85380668563793ac529fc5b31
2014-02-07 09:35:36 -06:00
Dave Hladky
39f97723d6
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 0b85e00cecdca6c5dcb6deee138f1a002515ac3c
2014-02-05 14:49:26 -06:00
Richard Peter
e5af004993
Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
...
Former-commit-id: a2536c180f68e5ea970e3406e3ef1f899650f3e2
2014-02-04 18:12:48 -06:00
Mike Duff
eb46191ba9
Issue #2636 - Scheduling refactor. Single scheduling method now.
...
Review comments
Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58
Former-commit-id: fc9ed661c3fe3ca75d30d8df414b5d1cd5725613
2014-02-04 14:01:29 -06:00
Mike Duff
c9b98868d2
Issue #2745 - Don't display fulfilled or cancelled allocations
...
Former-commit-id: 7b7f294622e886d7457d7abe0451d3e819568677
2014-02-03 16:57:03 -06:00
Steve Harris
1aea63a1f6
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: d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45
2014-01-29 09:41:57 -06:00
Brad Gonzales
02f9fd20dc
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: 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6
2014-01-26 20:31:38 -06:00
Lee Venable
d9d985eee4
Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
...
Former-commit-id: 9e39a2d080e9727965a4e840847d9940af2ec3ad
2014-01-26 19:17:04 -06:00
Mike Duff
c0e7aa2af3
Issue #2636 - Fix point scheduling
...
Former-commit-id: 6291c630ca3c1999870eb6045c95131153b1d305
2014-01-26 18:59:10 -06:00
Dave Hladky
2e1d02fe21
Issue #2741 Fixed nullpointers in Retrieval and BWM
...
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576
Former-commit-id: 3c47b3cb0ee18e485082e8a53d43b38722c5dce4
2014-01-26 18:15:09 -06:00
Mike Duff
4334640c22
Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
...
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b
Former-commit-id: c0d49492af75d0411d6c0c2541af440302595b6a
2014-01-25 14:09:02 -06:00
Steve Harris
69dc3d835b
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: 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90
2014-01-21 12:36:54 -06:00
Mike Duff
9a2d2af4a9
Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
...
Former-commit-id: 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a
2014-01-20 17:44:02 -06:00
Dave Hladky
dfc0d6d9f5
Issue #2398 Fixed scheduling outside of active period/ expired window
...
Change-Id: I6a07a597e84351d02cb1a0da29f796d86af28107
Former-commit-id: d5e3fdf7bd51177d24312d9daa6af7a2a4920f06
2014-01-20 17:35:44 -06:00
Richard Peter
29ba337367
Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
...
Former-commit-id: afdfd6b07687c9de20dad3f352db34fba6ade93c
2014-01-20 17:21:21 -06:00
Max Schenkelberg
87a6db7853
Issue #2620 Fixed manifest issues for baseline p2 export
...
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3
Former-commit-id: aaf90365b8855551b0cc22a8a95ae7e0b55f52ff
2014-01-20 13:54:27 -06:00
Brad Gonzales
6b8da117e4
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: 253b19d5cd1c7950209521a708b5ad9abbf000f6
2014-01-20 13:08:27 -06:00
Mike Duff
25d1d39fc2
Issue #2459 - Remove unscheduled status from UI
...
Former-commit-id: ddbef8fd122a6be6c32ff9a58659e712c2912a07
2014-01-17 15:34:48 -06:00
Brad Gonzales
ee4dc7068b
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: b0c2fcb5e802815b886f669b633e516b022b55a3
2014-01-16 16:54:12 -06:00
Nate Jensen
9d529b3b21
Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
...
Former-commit-id: 61b073cef0bfe65634096221d8ee8aef37f9e1ed
2014-01-15 17:36:30 -06:00
Brad Gonzales
46a2a5f70f
Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
...
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28
Former-commit-id: 3d396223b93631f0ea561a4df8ae9a3d71dde767
2014-01-15 17:16:47 -06:00
Dave Hladky
c57c27c843
Issue #2679 Multiple regions for a single collector mapped to single WFS source
...
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: b888d311923ba0628fa015018ef2f62fce47fb43
2014-01-15 10:05:20 -06:00
Mike Duff
245d76358e
Issue #2459 - Refactor the subscription status
...
Former-commit-id: 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9
2014-01-15 09:21:30 -06:00
Dave Hladky
8a6a386410
Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
...
Former-commit-id: 339245a534bf2da5071536e959086d5e4f7b2bf0
2014-01-14 15:29:15 -06:00
Mike Duff
9e817de4a9
Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.
...
Former-commit-id: 605f5a0a496deeb9be0e3aed1a56f6ac816038b4
2014-01-13 09:25:34 -06:00
Brad Gonzales
343a2495e5
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: 33a3dead503276926af71d7355f87242f5250e54
2014-01-10 16:37:09 -06:00
Richard Peter
51c8919ea7
Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
...
Former-commit-id: 974e2fb98c17fe843025346954d727fb9d72a408
2014-01-10 15:42:08 -06:00
Mike Duff
744d7367dc
Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
...
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034
Former-commit-id: 12500574ade0eced65454ff981b83f8f729cd125
2014-01-10 12:14:27 -06:00
Mike Duff
3be3a8ac0d
Issue #2636 - change log statements, add missing copyright headers
...
Former-commit-id: 8bf5a8185c09e9d368afc8e8e7409222164159aa
2014-01-10 10:55:17 -06:00
Mike Duff
a264cb06a1
Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
...
Former-commit-id: b841e795f2a18bf902ec373c9f79b191db177fde
2014-01-09 10:29:21 -06:00
Brad Gonzales
12860c79f9
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: e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd
2014-01-08 13:37:17 -06:00
Max Schenkelberg
cc2080449c
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: b65366dcdfa48e431b5c8bf10a72879b111cfd8d
2014-01-06 17:03:45 -06:00
Brad Gonzales
b2b352a5ae
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: 3db5d79b914436b8d0feed600fc586d7d3884706
2013-12-17 11:57:06 -06:00
Brad Gonzales
d0ae47d053
Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
...
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168
Former-commit-id: f4c1739687685a22847a09490724e84825032146
2013-12-17 09:43:12 -06:00
