Nate Jensen
4f47800cae
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac
2013-11-18 11:39:12 -06:00
Brad Gonzales
aa8fb36fc1
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: f570f6fcd64a96b7c61eecdfae6a765ec643e718
2013-11-15 08:00:47 -06:00
Nate Jensen
dd99aa3f47
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 264b7c80cbd0559c175aef0a99d8f8407b6af7d0
2013-11-14 17:41:24 -06:00
Richard Peter
14b1e924a1
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: dba301df2f593baa951c14b684e7ce4794e32019
2013-11-14 17:21:48 -06:00
Brian Clements
cacdf313c5
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: 4924917e28275d9bb8bb21feceb6016ce2c91c40
2013-11-14 17:12:02 -06:00
Mike Duff
47011a70db
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2
2013-11-14 17:07:54 -06:00
Nate Jensen
b4bcd14a85
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356
2013-11-14 16:34:28 -06:00
Richard Peter
8fb79e7b73
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 13d284277bed2f0f731547ec443a262556df997c
2013-11-14 14:56:59 -06:00
Richard Peter
79bdd34f4f
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: f7f30006cdaf3c8e99d166463c226b504f458b83
2013-11-14 14:40:23 -06:00
Lee Venable
d431f3c0f4
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: dbb67d3e8dd56c057626f499b2e3aa6b06eac41f
2013-11-14 14:33:18 -06:00
Richard Peter
4d18c7d493
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 3e92bb969aef3508f08eb55a2ef1903030abc525
2013-11-14 13:30:09 -06:00
Nate Jensen
9acda0b9f2
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d
2013-11-14 13:29:30 -06:00
Bryan Kowal
2029c34f24
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: c0595b49cab0d0ef636427ed3b31ea805f8adb43
2013-11-14 11:57:11 -06:00
Steve Harris
473488f5b8
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 2117af3beb252132a10f44aab162a1ca17ef3abd
2013-11-13 23:20:18 -06:00
Richard Peter
2f3eee1439
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f
2013-11-13 16:43:26 -06:00
Brian Clements
95f1621d3e
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: f4e66b8afce682014a0fa1ef9585b7ee6480e1e1
2013-11-13 13:45:44 -06:00
Bryan Kowal
86dd200844
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638
2013-11-13 13:16:55 -06:00
Steve Harris
aa6c977e7b
14.1.1-8 baseline
...
Former-commit-id: 41e87fe87d5074f138649c5ca8053e658488fbd0
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
5cd030f096
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: ce2db6d930faf1166bec9956fb21ea51e2329d40
2013-11-13 10:52:07 -06:00
Brian Clements
dfd88151e6
Issue #1314 fixed WFS output problem found when testing KeyLocker
...
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: d8e8b2323da3444cbff8b625f6b5098850888ee2
2013-11-13 10:04:13 -06:00
Brian Clements
191ffc6e63
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: 6d33448f0f6962a3da2a5c51f27253173f40cb93
2013-11-13 08:07:29 -06:00
Nate Jensen
accfefae6d
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
...
Former-commit-id: 833e94630c023f49704c8f4a36054b79e85ce4fe
2013-11-12 16:55:31 -06:00
Dave Hladky
643a150777
Issue #2542 Jetty upgraded
...
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 8de606bc467ba4d567bc2825f2aa10211774ff7d
2013-11-12 14:55:41 -06:00
Nate Jensen
5e02427d6e
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
...
Former-commit-id: 685d0f17845c90d4bd5a6d81da66f47285b08c8e
2013-11-12 14:41:34 -06:00
Richard Peter
9af1de07d4
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: 116b4409d4657b5dba8c9e3e52e2198661cb9691
2013-11-12 13:47:04 -06:00
Nate Jensen
88af1ddfcb
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
...
Former-commit-id: 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb
2013-11-12 12:46:38 -06:00
Brad Gonzales
8f70fb1d0c
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
Brian Clements
8b0e85f82c
Issue #2539 removed java 7 specific code from exception subclass
...
Former-commit-id: 5ea90c5f6e6a95a2f063908e0f117973f5cce584
2013-11-12 12:41:50 -06:00
Nate Jensen
3f86a3735e
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
...
Former-commit-id: 2279e785ab3e47008afee489c1a4e96972f26b79
2013-11-12 12:13:58 -06:00
Richard Peter
8afc87e570
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
...
Former-commit-id: adb5c06b63444331d7d470ddb6e7aff038cc40c1
2013-11-12 11:18:56 -06:00
Richard Peter
306bd6fae1
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: 333073fc97c9d454d0e41f8fbe01be3a19b18184
2013-11-12 11:11:36 -06:00
Nate Jensen
1ee5d91af2
Issue #2361 static lazy initialization of SubscriptionOverlapService's
...
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: f42d92e543ab2ecf516e159a0756de7cb3417b88
2013-11-12 11:03:51 -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
Nate Jensen
bca5793e3d
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
...
Former-commit-id: 621fb8fce876fdd3bde1b37d43d5f00945cd50f5
2013-11-12 10:55:40 -06:00
Brad Gonzales
cd221e5263
Issue #2506 Added subscription notification service to bandwidth manager.
...
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd
2013-11-12 10:50:06 -06:00
Nate Jensen
3054868350
Merge "Issue #2377 fixed error handling in QPF config" into development
...
Former-commit-id: 3a9f89bff3e1b54059cda1cd2320be8dc1833c04
2013-11-12 10:39:51 -06:00
Nate Jensen
f1b8eecca7
Merge "Issue #2539 added GZIP support to WFS REST" into development
...
Former-commit-id: e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3
2013-11-12 10:39:44 -06:00
Nate Jensen
b52bdb1cec
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: df601fc0d4c9085c03eec4e12f17878c757ddddf
2013-11-12 10:37:54 -06:00
Nate Jensen
3ed50ff500
Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
...
Former-commit-id: 7a8934c9005f25a16874be26e06625d56df5c024
2013-11-12 09:29:46 -06:00
Bryan Kowal
8e1c0fb8eb
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: 315ca002de4045f0d7ae6b298012365a052a7430
2013-11-11 17:00:17 -06:00
Brian Clements
e2ac7ae212
Issue #2377 fixed error handling in QPF config
...
Former-commit-id: 8e8c57301c6167fa161fd55be0e3fae3f974918b
2013-11-11 16:18:16 -06:00
Nate Jensen
8628b7755e
Issue #2361 undo earlier changes that potentially break uengine based
...
local apps
Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65
Former-commit-id: 110cff66bb2cf847730562570a9415851e0362c2
2013-11-11 16:14:35 -06:00
Brian Clements
36a0be2db1
Issue #2539 added GZIP support to WFS REST
...
small code cleanup in providers
Former-commit-id: 943310ed8b34f62d73dee1dff32d5c3b9f424e3c
2013-11-11 16:08:09 -06:00
Nate Jensen
7dda17a660
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: 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec
2013-11-11 14:05:11 -06:00
Richard Peter
13989d9c6e
Merge "Issue #2506 Refactored RegistryEvent constructors." into development
...
Former-commit-id: dd8f83135b04ff4510b1f860846f1a6a3db09f47
2013-11-11 13:09:24 -06:00
Bryan Kowal
e2a02ca247
Issue #2297 - fix 14.2.1 merge
...
Former-commit-id: e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b
2013-11-11 13:04:21 -06:00
Steve Harris
fbfe1a5faf
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
...
Former-commit-id: a4c8e9a5fb9d50844da854e453b6146c2a6e75c3
2013-11-11 11:45:35 -06:00
Max Schenkelberg
e58a5df04b
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.
...
Change-Id: Ic82f45447113425a08909be4c5229502882db022
Former-commit-id: 58ccc575973ea9a1778659e17daff8577747dec5
2013-11-11 11:09:00 -06:00
Nate Jensen
0dbc31b756
Merge "Issue #1314 removed common.spatial plugin" into development
...
Former-commit-id: 823cb0e07793ec5baa1863088634a312364b3d8b
2013-11-11 08:48:44 -06:00
Steve Harris
766940dedb
Issue #2214 - merge fix: Removed duplicate annotation @Override
...
Former-commit-id: d398883ce95b61d0a1befb3943a636c4c213784d
2013-11-11 08:15:30 -06:00
