Dave Hladky
0ac4de6ad0
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: ccaaa1cfea
[formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]
Former-commit-id: 333bf8b36d
2014-05-05 12:15:14 -05:00
Brian.Dyke
e56bd61ee6
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: 63137ed69c
[formerly 64c3766ed570885a796f846b889d40413e8250c6]
Former-commit-id: 278aab6b6f
2014-04-30 12:57:09 -04:00
Dave Hladky
f51497a3ce
Issue #2887 Previously missed check for start/end of sub (isExpired()).
...
Change-Id: I9a720b8db129ff7b82547531240d055499a57cfe
Former-commit-id: 0d78546434
[formerly 9af92514064e0c994be6d285f66f17c922e9d428]
Former-commit-id: 5bc1f147c9
2014-04-21 15:30:45 -05:00
Dave Hladky
91bd735d47
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 45059e722a
[formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]
Former-commit-id: 61fc2fea51
2014-04-21 12:26:47 -05:00
Richard Peter
7acdf727ce
Merge "Issue #2810 Added comparator to BandwidthAllocations Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85" into development
...
Former-commit-id: 7093d6ff0e
[formerly 79f857137cdc4bba40c3d6804c72dab8a4fe6ae0]
Former-commit-id: 545203a833
2014-04-04 14:39:46 -05:00
Dave Hladky
49d2b31fab
Issue #2810 Added comparator to BandwidthAllocations
...
Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85
Former-commit-id: fb642de109
[formerly f36998ca1d3bf606bb34cc8747fb17620ee78681]
Former-commit-id: 78bae7e97b
2014-04-03 14:05:42 -05:00
Richard Peter
2323545c09
Merge "Issue #2789 Implement Version transformations Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c" into development
...
Former-commit-id: 7c879fe6f0
[formerly 0801ff25548b90506133897fdb90284ac108672c]
Former-commit-id: 6c3a453491
2014-04-03 13:08:05 -05:00
Dave Hladky
4fab01e109
Issue #2789 Implement Version transformations
...
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c
Former-commit-id: 5064730dfa
[formerly 50279c71ad037d462f195c5f785165d2eee26f87]
Former-commit-id: e80005a1c4
2014-04-03 09:44:14 -05:00
Dave Hladky
2d18b657a8
Issue #2889 user who issued change now shows in notification center
...
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: 9479219b73
[formerly adc364d92a7fcb2a255a2f448efb56ef48492280]
Former-commit-id: 1671baaf10
2014-04-02 14:06:25 -05:00
Ron Anderson
ab69d3e318
Issue #2718 Update to GeoTools 10.5
...
Undo reformatting of ncep code
Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util
Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a
Former-commit-id: bcfaf40ebf
[formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]
Former-commit-id: 1c727465ee
2014-03-13 11:11:53 -05:00
Benjamin Phillippe
d339e232f4
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: 5483d6d7ae
[formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]
Former-commit-id: ed050996a2
2014-03-03 10:57:16 -06:00
Lee Venable
e9226e7140
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: 4e7c3c0cbe
[formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]
Former-commit-id: 0cf2dba731
2014-02-18 12:19:41 -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
Dave Hladky
24a4fab603
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: 7ee101d7c7
[formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]
Former-commit-id: 5c11dd09bb
2014-02-18 09:14:38 -06:00
Richard Peter
82fc0a2ed3
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 36d3d21b57
[formerly daacb19de029a15f94338c84a85116d0435f79be]
Former-commit-id: 64f0cabaef
2014-02-05 18:20:36 -06:00
Mike Duff
bafe19bbd5
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 6b01c2957f
[formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]
Former-commit-id: 101c08818d
2014-02-05 16:08:01 -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
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
4440c27ff6
Issue #2636 - Changed subscription code to use gmt calendar.
...
Former-commit-id: 1caacacfe3
[formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]
Former-commit-id: 6e01cdb78e
2014-01-28 11:09:33 -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
1ea52fdbcd
Merge "Issue #2584 Step one of versioning for DD Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00" into omaha_14.2.1
...
Former-commit-id: 805f63c0ec
[formerly b6d4e063c3f99ba78a933435a87090e813643836]
Former-commit-id: 6c9a4394b7
2014-01-26 17:01:17 -06:00
Dave Hladky
e15b9e2ba9
Issue #2584 Step one of versioning for DD
...
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00
Former-commit-id: 690b5b73cf
[formerly 878f95f025dc07ec6ce73f715cef57193493e9eb]
Former-commit-id: 523e100fd0
2014-01-24 14:44:12 -06:00
Brad Gonzales
2fb15c41ba
Issue #2709 Fix for recurring subscription active period end.
...
Change-Id: I05778e95fe703c7301205ad14909c843d720fd2e
Former-commit-id: fa10363d40
[formerly ddfc4d07aa4591f39ee5590de2d1bb67837e6229]
Former-commit-id: e1e7f1c250
2014-01-24 08:38:42 -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
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
Mike Duff
292ef2c068
Issue #2459 - Add unscheduled as a slot attribute
...
Former-commit-id: 47069bd7a4
[formerly 4cd670bc12e09f1acc778e8760615e92561e3ce3]
Former-commit-id: 0f655c96e3
2014-01-16 10:06:17 -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
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
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
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
Mike Duff
7fe007d482
Issue #2636 - Changed delay to offset
...
Former-commit-id: 14d9978528
[formerly b5fefc92c0b80613b90acb29f70b96c459167843]
Former-commit-id: fa314e5eb6
2013-12-18 15:35:47 -06:00
Mike Duff
a4036f49a9
Issue #2636 - Calculate a data set availability delay for each dataset.
...
Former-commit-id: fb96084864
[formerly 6c5fd79bd2a74422053b064d968de3ca440ecec1]
Former-commit-id: f04e249e23
2013-12-18 14:52:11 -06:00
Benjamin Phillippe
ed890ce9d9
Issue #1829 Refactored EBXML registry objects
...
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d
Former-commit-id: ed77440c28
[formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]
Former-commit-id: 0b0e70b667
2013-12-05 10:20:24 -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
Benjamin Phillippe
f4144fca06
Issue #2534 Added reciprocated registry replication subscriptions
...
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27
Former-commit-id: 31b53f4ad9
[formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]
Former-commit-id: 212bbeb379
2013-11-27 12:07:59 -06:00
Dave Hladky
233238d8df
Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
...
Former-commit-id: a9a3973319
[formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]
Former-commit-id: 04c7e2cffc
2013-11-21 14:46:47 -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
Nate Jensen
50590a241f
Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
...
Former-commit-id: 5885d8027b
[formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]
Former-commit-id: 6927e960b2
2013-11-19 11:25:19 -06:00
Mike Duff
8cc9c1de59
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 47a0477587
[formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]
Former-commit-id: 47011a70db
2013-11-14 17:07:54 -06:00
Bryan Kowal
782675951b
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: ce16efc9a1
[formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]
Former-commit-id: be78fab116
2013-11-14 15:17:28 -06:00
Brad Gonzales
62e4cafa27
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: aea0e847aa
[formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]
Former-commit-id: 8f70fb1d0c
2013-11-12 12:42:16 -06:00
Benjamin Phillippe
0abf405014
Issue #1678 Added support for stored query publishing and invocation on the registry
...
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f
Former-commit-id: b5db1f38c3
[formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]
Former-commit-id: b84235a80a
2013-11-07 18:36:46 -06:00
Benjamin Phillippe
98b56cf02a
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: d8de923f8b
[formerly 0a67c8d68548ed8daa76d782ca3213956b984795]
Former-commit-id: a7e53870fb
2013-11-01 09:20:00 -05:00
Dave Hladky
0eba787d3e
Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
...
Change-Id: I75269bad24731990720d30683ebf5f27344661f3
Former-commit-id: 9161962813
[formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]
Former-commit-id: 4227f3a59f
2013-11-01 08:23:16 -05:00
Mike Duff
c1bd170f8a
Issue #2292 - refactor and move overlap/duplicate checks to edex.
...
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: 3fc811102e
[formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]
Former-commit-id: f123fa11f5
2013-10-31 09:22:50 -05:00
Nate Jensen
13eafc05c2
Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
...
Former-commit-id: e4aa2b8a94
[formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]
Former-commit-id: 4b19d287ea
2013-10-28 09:07:04 -05:00
Dave Hladky
577e2b84e9
Issue #2484 Added originatingSite to id for Subscription registry objects.
...
Former-commit-id: 36d7c60914
[formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]
Former-commit-id: 3c33f6e5ea
2013-10-24 13:52:45 -05:00
Dave Hladky
7659bcd183
Issue #2454 Ice model, general ensemble model troubles, null cycle times
...
Former-commit-id: 94b5bd79f9
[formerly 5fd82b153d87228037e594c838dc3c445c8874aa]
Former-commit-id: ba2e1ed3fc
2013-10-22 16:48:54 -05:00