Commit graph

1952 commits

Author SHA1 Message Date
Brad Gonzales
04829d37e2 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: 053f20c70b [formerly c245f741b9e78d8e4503698336d9929536e72e0d]
Former-commit-id: 95a1914c71
2013-11-20 11:58:33 -06:00
Bryan Kowal
da148196ac Issue #2552 - replace Logger with UFStatus
Former-commit-id: ff968c9884 [formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]
Former-commit-id: 0bdb25bf43
2013-11-19 17:11:36 -06:00
Nate Jensen
be3d016f93 Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
Former-commit-id: 6927e960b2 [formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]
Former-commit-id: 5885d8027b
2013-11-19 11:25:19 -06:00
Nate Jensen
a238ba2ba3 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]
Former-commit-id: 0146ae59df
2013-11-18 11:39:12 -06:00
Brad Gonzales
490c95d010 Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
Added missing comma to com.raytheon.edex.plugin.text.

Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162

Former-commit-id: aa8fb36fc1 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]
Former-commit-id: 53d4de12d9
2013-11-15 08:00:47 -06:00
Nate Jensen
d96cdbe761 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]
Former-commit-id: 78b01f61c4
2013-11-14 17:41:24 -06:00
Richard Peter
1a7dd7723b Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]
Former-commit-id: 0bb5e2a61e
2013-11-14 17:21:48 -06:00
Brian Clements
ab24330f23 Issue #2361 fixed ncwf hibernate pickup
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]
Former-commit-id: 00490c2db2
2013-11-14 17:12:02 -06:00
Mike Duff
b929b7aa02 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]
Former-commit-id: 47a0477587
2013-11-14 17:07:54 -06:00
Nate Jensen
a8a1e396fe Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]
Former-commit-id: c2aacfc437
2013-11-14 16:34:28 -06:00
Bryan Kowal
a6ea71d46f 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: be78fab116 [formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]
Former-commit-id: ce16efc9a1
2013-11-14 15:17:28 -06:00
Richard Peter
2b95bcfb31 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]
Former-commit-id: c42f931118
2013-11-14 14:56:59 -06:00
Richard Peter
96b4944b41 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]
Former-commit-id: 0074b774f0
2013-11-14 14:40:23 -06:00
Lee Venable
17fef206fc Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]
Former-commit-id: bc7f5e556d
2013-11-14 14:33:18 -06:00
Richard Peter
3dc0ad184c Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]
Former-commit-id: 3f5c590c5f
2013-11-14 13:30:09 -06:00
Nate Jensen
a6be904c69 Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]
Former-commit-id: c5cf68cc45
2013-11-14 13:29:30 -06:00
Bryan Kowal
a2261b9ff3 Issue #2540 - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching

Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1

Former-commit-id: 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]
Former-commit-id: 7e35ea310f
2013-11-14 11:57:11 -06:00
Steve Harris
ef852ac125 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 473488f5b8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]
Former-commit-id: 4d25eb11c8
2013-11-13 23:20:18 -06:00
Richard Peter
64afe42e74 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]
Former-commit-id: e88f5777a7
2013-11-13 16:43:26 -06:00
Brian Clements
49c8bd5ee9 Issue #2505 removed recco from deployment
added update script to drop recco from db


Former-commit-id: 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]
Former-commit-id: 8cbe2c06a8
2013-11-13 13:45:44 -06:00
Bryan Kowal
01735ca0c4 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]
Former-commit-id: 0544b66f4e
2013-11-13 13:16:55 -06:00
Steve Harris
0123596fd9 14.1.1-8 baseline
Former-commit-id: aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]
Former-commit-id: c7d36eb6ad
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
fe7c6886c4 Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]
Former-commit-id: 1c46226a11
2013-11-13 10:52:07 -06:00
Brian Clements
ef2acc6562 Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements


Former-commit-id: dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]
Former-commit-id: 37f4f41d2d
2013-11-13 10:04:13 -06:00
Brian Clements
0e5d3e9e69 Issue #2546 added fix for TAFs that contain legacy valid times
added unit test


Former-commit-id: 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]
Former-commit-id: df1542a66c
2013-11-13 08:07:29 -06:00
Nate Jensen
80227c4750 Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]
Former-commit-id: f0b386b632
2013-11-12 16:55:31 -06:00
Dave Hladky
53866e481a Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]
Former-commit-id: e3a259182c
2013-11-12 14:55:41 -06:00
Nate Jensen
a1315f1072 Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
Former-commit-id: 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]
Former-commit-id: c60228c854
2013-11-12 14:41:34 -06:00
Richard Peter
c8ff79a7f5 Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]
Former-commit-id: f12839a9e5
2013-11-12 13:47:04 -06:00
Nate Jensen
39679b0608 Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
Former-commit-id: 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]
Former-commit-id: 64aa00bad6
2013-11-12 12:46:38 -06:00
Brad Gonzales
866a11a9f0 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: 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]
Former-commit-id: aea0e847aa
2013-11-12 12:42:16 -06:00
Brian Clements
ba12c7467d Issue #2539 removed java 7 specific code from exception subclass
Former-commit-id: 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]
Former-commit-id: 4050eb5f3e
2013-11-12 12:41:50 -06:00
Nate Jensen
18d790a423 Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]
Former-commit-id: eed4c8604b
2013-11-12 12:13:58 -06:00
Richard Peter
b8b01f6305 Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
Former-commit-id: 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]
Former-commit-id: 61fc3eba44
2013-11-12 11:18:56 -06:00
Richard Peter
59671c1e7d Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]
Former-commit-id: 460a7b8b5d
2013-11-12 11:11:36 -06:00
Nate Jensen
368d73449e Issue #2361 static lazy initialization of SubscriptionOverlapService's
JAXBManager

Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac

Former-commit-id: 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]
Former-commit-id: 2cdc7e5e63
2013-11-12 11:03:51 -06:00
Dave Hladky
753b36cfea Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]
Former-commit-id: 976eece1b1
2013-11-12 10:58:50 -06:00
Nate Jensen
d758e5ab57 Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]
Former-commit-id: da8a858727
2013-11-12 10:55:40 -06:00
Brad Gonzales
efdc64b7b3 Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]
Former-commit-id: ff5edde334
2013-11-12 10:50:06 -06:00
Nate Jensen
68866c322c Merge "Issue #2377 fixed error handling in QPF config" into development
Former-commit-id: 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]
Former-commit-id: d8f2ffbceb
2013-11-12 10:39:51 -06:00
Nate Jensen
b87efc6860 Merge "Issue #2539 added GZIP support to WFS REST" into development
Former-commit-id: f1b8eecca7 [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]
Former-commit-id: 8c4608630d
2013-11-12 10:39:44 -06:00
Nate Jensen
5427e68fd2 Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]
Former-commit-id: 7a73c65430
2013-11-12 10:37:54 -06:00
Nate Jensen
90320ab47a Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]
Former-commit-id: 23fe7de462
2013-11-12 09:29:46 -06:00
Bryan Kowal
5c38f0bfd6 Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number

Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0

Former-commit-id: 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]
Former-commit-id: 75e6914df1
2013-11-11 17:00:17 -06:00
Brian Clements
c6f8609b39 Issue #2377 fixed error handling in QPF config
Former-commit-id: e2ac7ae212 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]
Former-commit-id: 684bd4dc50
2013-11-11 16:18:16 -06:00
Nate Jensen
9dc69e316f Issue #2361 undo earlier changes that potentially break uengine based
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]
Former-commit-id: a2935193b5
2013-11-11 16:14:35 -06:00
Brian Clements
24905af3c4 Issue #2539 added GZIP support to WFS REST
small code cleanup in providers


Former-commit-id: 36a0be2db1 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]
Former-commit-id: 061515b485
2013-11-11 16:08:09 -06:00
Nate Jensen
64df0d8d8f Merge "Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development
Former-commit-id: 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]
Former-commit-id: 05ee46c4bc
2013-11-11 14:05:11 -06:00
Richard Peter
8db2d589e3 Merge "Issue #2506 Refactored RegistryEvent constructors." into development
Former-commit-id: 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]
Former-commit-id: 51649b56e5
2013-11-11 13:09:24 -06:00
Bryan Kowal
e937ba954b Issue #2297 - fix 14.2.1 merge
Former-commit-id: e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]
Former-commit-id: 411e0fa7c4
2013-11-11 13:04:21 -06:00