Dave Hladky
7e763a5a22
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: 0ac4de6ad0333bf8b36d0ac4de6ad0333bf8b36dccaaa1cfeaccaaa1cfea93ca9cfe6a7611339cd8cb94f9fc97
2014-05-05 12:15:14 -05:00
Dave Hladky
a06db5a4e7
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: e2a4bb6755c352643c79e2a4bb6755c352643c793b00ae03cc3b00ae03ccea791b5ca5bf42c8d7405b11e45636
2014-04-30 17:38:28 -05:00
Brian.Dyke
f16c305ae4
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: e56bd61ee6278aab6b6fe56bd61ee6278aab6b6f63137ed69c63137ed69cfcf13ae9f78160209e525d31c9ec9a
2014-04-30 12:57:09 -04:00
Dave Hladky
4ce5dfcd92
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 91bd735d4761fc2fea5191bd735d4761fc2fea5145059e722a45059e722a117a3953afae84d2991e6c83fd0929
2014-04-21 12:26:47 -05:00
Richard Peter
5fab51d41b
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: 7bd6a079130e25ae35c17bd6a079130e25ae35c11c150e6e8b1c150e6e8b50a1b270c5f13c86bc3e9b3f8f9649
2014-02-27 15:18:26 -06:00
Brad Gonzales
b0421675ff
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: 379c0fb46c19460ed0d7379c0fb46c19460ed0d7ba4e308328ba4e3083281b764881113be33809449aa1cb299e
2014-02-18 11:10:44 -06:00
Mike Duff
bd52f67e0c
Issue #2636 - Scheduling refactor. Single scheduling method now.
...
Review comments
Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58
Former-commit-id: 2ca26aaa39eee642ac9b2ca26aaa39eee642ac9beb46191ba9eb46191ba938aeb23274684390e599e8dea0d0dc
2014-02-04 14:01:29 -06:00
Max Schenkelberg
d99c6b49e3
Issue #2620 Fixed manifest issues for baseline p2 export
...
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3
Former-commit-id: 1256748c4268aa6660451256748c4268aa66604587a6db785387a6db7853424f2282f025746852919903335f77
2014-01-20 13:54:27 -06:00
Dave Hladky
25745e2782
Issue #1736 Add registry bandwidth tracking
...
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6
Former-commit-id: 6607e5fe30483ec5d22f6607e5fe30483ec5d22f593f24023d593f24023d09aa3a6c624060748634dc5f5f3c87
2013-12-04 11:58:49 -06:00
Brad Gonzales
b7fca60f7d
Issue #2506 Added subscription notification service to bandwidth manager.
...
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: cbdb9dfb4fcd221e5263cbdb9dfb4fcd221e5263ff5edde334ff5edde3341987184f87efdc64b7b31b084e4efa
2013-11-12 10:50:06 -06:00
Brad Gonzales
04f9dfb84a
Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
...
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
and other recommendations from peer review. Removed count attribute
from RegistryStatisticsEvent. Changed construction of SubsriptionRequestEvents
to set numRecords attribute.
Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2
Former-commit-id: e4251ad380d2dac35b65e4251ad380d2dac35b6564c6e5abff64c6e5abfffa4e8d989784e14a5a624d4f281553
2013-08-15 09:35:10 -05:00
Dustin Johnson
5f55b64857
Issue #2106 Create SubscriptionRetrievalAttributes to only load Subscription objects when required
...
Amend: Peer review comments, also fixed bug where subscriptions weren't being loaded on changing bandwidth
Change-Id: I8b5a122b0434d54dcfcbff9df6283edad68d7eb1
Former-commit-id: a821cdac28050b38fa9aa821cdac28050b38fa9a5f383655715f383655712756292e276992ae7a11273928f386
2013-07-12 09:01:05 -05:00
Dustin Johnson
4ac1c2cbdb
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: c76fa3bc2a0a9e7ed740c76fa3bc2a0a9e7ed74031e01a9f9a31e01a9f9afff0172786187a1e49ef1fab733472
2013-05-29 09:02:47 -05:00
Dustin Johnson
ff9f489fea
Issue #1906 Remove new registry plugin from datadelivery feature
...
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598
Former-commit-id: e44d3a8715c8241840c5e44d3a8715c8241840c5977702e876977702e876ee0572026a81706939418095deee57
2013-04-16 10:36:56 -05:00
Dustin Johnson
be4fe08b9d
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 2983ed29e471365cd9452983ed29e471365cd94519301830361930183036f5a3b5710748a96911c806b39b848b
2013-03-13 08:39:08 -05:00
Dustin Johnson
2f7bdb18f9
Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
...
Amend:
Use isEmpty() where possible in BandwidthManager.
Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec
Former-commit-id: 73f884753a1161125c8473f884753a1161125c8454c3980cba54c3980cba67d6a4ac99c0a1ae396a5da3043a97
2013-03-04 14:55:50 -06:00
Dustin Johnson
35b13ba973
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: 0d548bd66f8307af022c0d548bd66f8307af022cef32853dc1ef32853dc173a5667256e504a474f9e48bf48821
2013-02-11 14:21:57 -06:00
Bryan Kowal
1996f92f7e
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: ab8b346489c8a43edd9eab8b346489c8a43edd9ed6b4cb65f4d6b4cb65f46d7f57c62a146c43a6060136f9d5a3
2013-01-07 12:16:01 -06:00
