Commit graph

114 commits

Author SHA1 Message Date
Dave Hladky
333bf8b36d 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
Brian.Dyke
278aab6b6f 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
Richard Peter
d6e335b766 Merge changes Iaec4c848,I9a720b8d into development
* changes:
  Issue #3046  Dupe checker for DD gridded retrievals got broken. Change-Id: Iaec4c848e0a9ef06610153ce03f7c4d45deb870a
  Issue #2887 Previously missed check for start/end of sub (isExpired()). Change-Id: I9a720b8db129ff7b82547531240d055499a57cfe


Former-commit-id: ad4ea6af2c125219ee915df379a43bfdcbd560c1
2014-04-22 14:28:20 -05:00
Dave Hladky
aa8fdb1e5a Issue #3046 Dupe checker for DD gridded retrievals got broken.
Change-Id: Iaec4c848e0a9ef06610153ce03f7c4d45deb870a

Former-commit-id: 2c957466d5a4877ab7c20ddf75ea6fa8e6333c76
2014-04-22 11:48:02 -05:00
Nate Jensen
a37a2afe18 Issue #2060 dropping grid dataURI column
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e

Former-commit-id: 1aab87d9572089a09351ebdfb8fbcef884866feb
2014-04-21 17:34:39 -05:00
Dave Hladky
61fc2fea51 Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Richard Peter
dbba727f3d Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 6e015b3f61c20635077d6e8271e9b763e5a32fe1
2014-04-14 13:10:11 -05:00
Dave Hladky
1671baaf10 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
0e25ae35c1 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
1d256bfcee Issue #2469 Fixed default rules implementation
Former-commit-id: 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72
2014-02-24 13:06:52 -06:00
Nate Jensen
75ca70fba6 Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 36d571557def95e0eb1350c4e68cbe3e225f282a
2014-02-10 16:48:29 -06:00
Dave Hladky
6172c83afc Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 0b85e00cecdca6c5dcb6deee138f1a002515ac3c
2014-02-05 14:49:26 -06:00
Steve Harris
1738185503 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
e94023097e 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
a49cfc6a74 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
Dave Hladky
c06fd8317c Issue #2741 Fixed nullpointers in Retrieval and BWM
Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576

Former-commit-id: 3c47b3cb0ee18e485082e8a53d43b38722c5dce4
2014-01-26 18:15:09 -06:00
Dave Hladky
523e100fd0 Issue #2584 Step one of versioning for DD
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00

Former-commit-id: 878f95f025dc07ec6ce73f715cef57193493e9eb
2014-01-24 14:44:12 -06:00
Steve Harris
24ab7cff49 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
Nate Jensen
d682bcee93 Merge "Issue #2678 Fix for multiple threads grabbing a retrieval for processing." into omaha_14.2.1
Former-commit-id: 81e57beaa231d696b7d40d6afbda365a27f6cae8
2014-01-15 17:36:11 -06:00
Brad Gonzales
3e3fcfa9af 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
129163bf87 Issue #2693 Data set information infrastructure for availability offset calculations
Change-Id: I0f8d90a753ce37d37c682ff17613eb9a44554a3b

Former-commit-id: 48fad391deb95616556628424b1a1799c2929f89
2014-01-15 17:08:03 -06:00
Dave Hladky
08625addba 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
183ca614df 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
07a4420596 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
16046a4dde 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
Mike Duff
fa314e5eb6 Issue #2636 - Changed delay to offset
Former-commit-id: b5fefc92c0b80613b90acb29f70b96c459167843
2013-12-18 15:35:47 -06:00
Mike Duff
f04e249e23 Issue #2636 - Calculate a data set availability delay for each dataset.
Former-commit-id: 6c5fd79bd2a74422053b064d968de3ca440ecec1
2013-12-18 14:52:11 -06:00
Mike Duff
d378d9194a Issue #2625 - fix no data errors in bandwidth utilization graph
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime

Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7

Former-commit-id: 9e37fa3a052d49830b36e6187280615cb6517d47
2013-12-11 11:29:38 -06:00
Richard Peter
2085a9cd33 Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: 081a19d5cfca3d717a332357dbaead199767e0b8
2013-12-03 11:41:21 -06:00
Dave Hladky
04c7e2cffc Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
Former-commit-id: e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd
2013-11-21 14:46:47 -06:00
Dave Hladky
b6f1468b7e Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: de110d3747096601a122f64cc5d6037823213e92
2013-11-12 10:58:50 -06:00
Brad Gonzales
fe15e874f7 Issue #2506 fixed issues with shared distributed ingest.
Amend: Updated comment in StoreRetrievedData.
       Removed separate messageing to clear BandwidthSubscriptions.
       Add fix and test case for SBN deserialization with content following the ending xml tag.
       Removed unneeded changes.
       Added XmlWMOMessage class.

Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd

Former-commit-id: 0b667fbd94788a8a5b598ae5f5586d4b710518a4
2013-11-08 15:29:05 -06:00
Mike Duff
00bb57b481 Issue #2450 - Send notifications to Notification Center when subscriptions expire.
peer review comments

Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653

Former-commit-id: fc6fe49db0576c70e2068cd8fac125553806e4c0
2013-11-06 12:23:09 -06:00
Richard Peter
1d85220363 Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e
2013-10-29 12:18:55 -05:00
Dave Hladky
988bb90523 Issue #2469 Refined deletion of adhoc subs.
Former-commit-id: f8d93b233f32623864f86edf822b77b68aa5e0a0
2013-10-24 09:32:41 -05:00
Dave Hladky
ba2e1ed3fc Issue #2454 Ice model, general ensemble model troubles, null cycle times
Former-commit-id: 5fd82b153d87228037e594c838dc3c445c8874aa
2013-10-22 16:48:54 -05:00
Dave Hladky
6076f46549 Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: c504c44750f5f441be41c20fdb78a363c620fb3d
2013-10-16 09:06:00 -05:00
Brad Gonzales
25710edd9e Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: a01619f78bac065e7d42e28882157778aba09b75
2013-10-11 10:36:53 -05:00
Brad Gonzales
73e757c284 Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30

Former-commit-id: f776626738e4cc995bb16e87b8da66ff90289bd8
2013-10-09 17:58:12 -05:00
Dave Hladky
fbe4078bc5 Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
Former-commit-id: c299ed7a5bb02980ecb30b0ab38752d2878d50a7
2013-10-08 10:25:36 -05:00
Brad Gonzales
21acb75f24 Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
Amend: Refactored WMO header applier.
       Fixes for WMO header applier.
       Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
       Removed manual ingest from registry mode.
       Simplified data delivery distribution matching pattern.
       Added serialize test for wfs response.
       Updated comments.
       Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
       Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
       HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.

Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7

Former-commit-id: 8bf8efa14520aaba532ca7a2e82e4c1fa24adca8
2013-10-07 17:06:38 -05:00
Richard Peter
2e062048e1 Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: 204c2034a08cd69fc7286639f37e5ff936ecf49e
2013-10-07 16:19:11 -05:00
Dave Hladky
e0ec10d073 Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5
2013-10-04 10:36:27 -05:00
Nate Jensen
effa4f4f26 Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7

Former-commit-id: f8d8a0033729878c8c6d94c00fd861ddc81f9d96
2013-10-01 11:25:45 -05:00
Richard Peter
693810a877 Merge "Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests." into development
Former-commit-id: 61a6a3d0151652ce5c2862f23b42ce9aa888715c
2013-09-20 10:23:47 -05:00
Brad Gonzales
c81825ce57 Issue #2383 Updates to fix issues with adhoc point queries and bandwith manager tests.
Amend:  Reverted BandwidthDaoUtil.setAdhocMostRecentUrlAndTime to Dave's fixes, with one
        minor change.  Added additional handling to start and end bucket calculation in
        InMemoryBandwidthBucketDao.  Addtional logging.  Removed exception logging of
        subscriptions.

Change-Id: Ie51c0accd7f39d31379e49e97542bae75bde5a1c

Former-commit-id: 148cc6d96ed17127590827d166325c4748384689
2013-09-19 12:54:31 -05:00
Dave Hladky
8e5d3d9742 Issue #2388 Multiple code jars in path, Nate's logger finds.
Former-commit-id: ad02f4640d747328257f9b7a3f2ca2300fcc7bba
2013-09-19 10:59:07 -05:00
Dave Hladky
f1fc14ce90 Merge branch 'dd_pre_release_2.1' into development
Former-commit-id: 076dd7338edcf45a33f6485f190831acd344b954
2013-09-11 15:07:23 -05:00
Mike Duff
0d602a6c3f Issue #2180 - handle delete of credentials
Change-Id: Ie8f1cdba92df03d94a4d7b009b8330eced10e036

Former-commit-id: 1dfcfc80308a182f0f21f028e19285fa39c53d6e
2013-09-11 12:08:12 -05:00
Mike Duff
bd62cb1127 Issue #2314 - Various fixes to the DD Notification Dialog
Change-Id: Id10a89c161009d88bfffa88a8bb488ec6efae359

Former-commit-id: 8664ae9ee596962b37a756beca801818abac4fff
2013-09-04 15:20:20 -05:00