Commit graph

134 commits

Author SHA1 Message Date
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
Richard Peter
32957285fc Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
2014-04-28 16:27:40 -05:00
Brian.Dyke
3524838f9f Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509
2014-04-25 11:06:11 -04:00
Richard Peter
2f8da547ea Issue #2928: Update DD WebContainer to allow loading properties from environment
Change-Id: I1eb31303dd87f3235c78618a7f31778f8f4d6081

Former-commit-id: 119282c58744addb3fd1a5c4a1a165f98d6437a8
2014-04-23 16:01:40 -05:00
Richard Peter
341e8331db Issue #2928: Add default byte limit, set registry byte limit
Change-Id: I31f6687b30f501a30f78d4b289059d2de19528f6

Former-commit-id: e32d44051831d9b587ab398a19eb5afe7b7b5c58
2014-04-22 15:08:18 -05:00
Dave Hladky
45059e722a Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Benjamin Phillippe
b86fae838f Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5

Former-commit-id: 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983
2014-04-18 15:10:46 -05:00
Benjamin Phillippe
62062bf288 Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109

Former-commit-id: 92c584179ddbad65c115092d3bf82ca6fe114b09
2014-04-15 09:15:12 -05:00
Richard Peter
17196b5dcd 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
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
Steve Harris
1c64a5c025 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 857ae00bea95a7981cb4752c1a7c147d725173e3
2014-03-06 18:31:10 -06:00
Benjamin Phillippe
5483d6d7ae Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e
2014-03-03 10:57:16 -06: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
45413d0db4 Issue #2469 Fixed default rules implementation
Former-commit-id: 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72
2014-02-24 13:06:52 -06:00
Benjamin Phillippe
fc589ed84d Issue #2769 Removed aggressive Hibernate session flushes
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: 0440395a596d13bf8b4f1dda4857c185c6c8afa5
2014-02-04 10:24:11 -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
Dave Hladky
690b5b73cf Issue #2584 Step one of versioning for DD
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00

Former-commit-id: 878f95f025dc07ec6ce73f715cef57193493e9eb
2014-01-24 14:44:12 -06:00
Benjamin Phillippe
95b0f12880 Issue #2613 Registry performance enhancements. Better handling of delete events.
Change-Id: I56d3f5c37778e717810b6a698ec9405ed3cde00a

Former-commit-id: f863897fd512acae11364eb6b4737339b5951da0
2014-01-21 15:02:59 -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
Benjamin Phillippe
7516310ab1 Issue #2613 Rewrote poorly written section of code in NotificationListenerImpl
Change-Id: Ibcdd415667f379a20799a4166b12cc8cc5e05ed4

Former-commit-id: 4d4c7837ad1084b8c6007c660c59e3bd29f757cc
2014-01-17 12:07:34 -06:00
Dave Hladky
33aeec0cb4 Issue #2613 StandardCharsets NIO dependency removed.
Change-Id: I7ba841e1f1e480561d3c7302e8b00ecfaab41f24

Former-commit-id: a9e1fbf4f19beecc2935cb992380f27cb2298ddb
2014-01-16 09:21:35 -06:00
Benjamin Phillippe
83bec75737 Issue #2613 Registry peformance enhancements
-- Added indexes to registry tables
            -- Better cleanup when a registry leaves the federation
            -- Batching of queries in notification handler to reduce number of web service calls
            -- Added Hibernate flushes and clears to better manage memory

Change-Id: I88ec580694d2104458391a798667748c88f16dd0

Former-commit-id: 4344ffec77286a531b9be29e9ef94acd9c6ce342
2014-01-15 16:09:13 -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
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
Benjamin Phillippe
2e909bc207 Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: ce2bffa120b722cb3337658584a83c5161f07a51
2013-12-12 09:44:05 -06:00
Benjamin Phillippe
0cb4e61261 Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d
2013-12-11 12:20:12 -06:00
Benjamin Phillippe
ed77440c28 Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: 6eb387e69c2fc4837b58f99e4343a745162fb384
2013-12-05 10:20:24 -06:00
Dave Hladky
593f24023d Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 695365c03ac142960a22e6774f3a10fd5e16cd35
2013-12-04 11:58:49 -06:00
Benjamin Phillippe
31b53f4ad9 Issue #2534 Added reciprocated registry replication subscriptions
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: 2c52a6ee6f7d491d484c423359b8440975ad6d1e
2013-11-27 12:07:59 -06:00
Bryan Kowal
ce16efc9a1 Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration

Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0

Former-commit-id: 283853ead3588ef8ea296507b11a9ee9a23e9236
2013-11-14 15:17:28 -06:00
Benjamin Phillippe
1c46226a11 Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: ce2db6d930faf1166bec9956fb21ea51e2329d40
2013-11-13 10:52:07 -06:00
Brad Gonzales
aea0e847aa Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 7684f7bd51770a41e68700f1d4408a6aad5cd877
2013-11-12 12:42:16 -06:00
Benjamin Phillippe
b5db1f38c3 Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: d7d985926351d933c0bd10a3a5fd88ef4305853b
2013-11-07 18:36:46 -06:00
Benjamin Phillippe
6a3fc6c059 Issue #1679 Minor changes to support custom registry query plugins
Change-Id: I8ae98c80c243b710179e605a0ad1db302e86921b

Former-commit-id: 85e2b4a7717e24983b417a930402a8095d0c6021
2013-11-05 10:50:47 -06:00
Richard Peter
3d293fce88 Merge "Issue #1538 Moved data delivery specific web services out of registry plugins -- Added registry federation admin page -- Made registry service clients non-static" into development
Former-commit-id: 44665bcb3b4745532ce0febf26a6b5a000e1a0bc
2013-11-05 10:09:42 -06:00
Nate Jensen
5efd1b7218 Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9

Former-commit-id: ebf2c3c32945fefe8fd8c054b163fba238ac0ee5
2013-11-01 12:09:43 -05:00
Benjamin Phillippe
d8de923f8b Issue #1538 Moved data delivery specific web services out of registry plugins
-- Added registry federation admin page
            -- Made registry service clients non-static

Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad

Former-commit-id: 0a67c8d68548ed8daa76d782ca3213956b984795
2013-11-01 09:20:00 -05:00
Richard Peter
89b992c01c Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 5b492459c0156a49eb12dea54a38ecec532fb58d
2013-10-29 12:17:14 -05:00
Bryan Kowal
cda8d04831 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: 06a166ef6c963585eb65da223610a21665f9545a
2013-10-28 14:50:28 -05:00
Benjamin Phillippe
0905d6ffdd Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce

Former-commit-id: 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28
2013-10-24 11:51:11 -05:00
Richard Peter
1750224476 Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
Former-commit-id: 381be8f02831002b29a8a90831b1c116d023c48f
2013-10-23 16:53:22 -05:00
Richard Peter
6b4c675600 Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
Former-commit-id: 3054f3682a955395f381d3d9c78728c4a4492b69
2013-10-23 16:41:57 -05:00
Benjamin Phillippe
3a3fb00f78 Issue #1682 Fixed registry query that prevented deletions of subscriptions
Change-Id: I92da9f43cfb86711d6238c07a86cad94742777f2

Former-commit-id: b3ef0276414f5009f79e55e3b08c58daeeb56e26
2013-10-23 13:03:25 -05:00
Benjamin Phillippe
68eeb03630 Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer
Change-Id: I2d22199f9e1e35b3425e294ce3884ebb9d2cc99f

Former-commit-id: 18737abc6781a353b831d9c012cc293f60731f89
2013-10-23 11:05:38 -05:00
Benjamin Phillippe
ef0d0e2393 Issue #1538 Reworked registry database connection strategy
Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae

Former-commit-id: e9e4d1ae4bbe6098f637dbca64f684c90313d478
2013-10-23 10:48:40 -05:00
Benjamin Phillippe
d94f22fda8 Issue #1682 Fixed replication/query errors and added synchronous notification delivery
Change-Id: Ia6a07c3abf6c48ef18d354dc2866ed981e6f1478

Former-commit-id: 2f6dc771e86cf290bb72743f1855f02c616e57d5
2013-10-20 16:02:10 -05:00
Benjamin Phillippe
ed23a786d6 Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec
Change-Id: If6d3579305afbb279057a264033736fc126b7849

Former-commit-id: 5112ee9931a1678fee37dd725a28dd6fff1e7ec9
2013-10-18 09:20:40 -05:00
Dave Hladky
477fbd3d59 Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: c504c44750f5f441be41c20fdb78a363c620fb3d
2013-10-16 09:06:00 -05:00