Nate Jensen
951c1ff2f3
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 4f47800cae4f47800cae0146ae59dfa238ba2ba3
2013-11-18 11:39:12 -06:00
Brad Gonzales
4499a8d1de
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: aa8fb36fc1aa8fb36fc153d4de12d9490c95d010
2013-11-15 08:00:47 -06:00
Nate Jensen
f2c777ff48
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: dd99aa3f47dd99aa3f4778b01f61c4d96cdbe761
2013-11-14 17:41:24 -06:00
Richard Peter
38d2c6564a
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 14b1e924a114b1e924a10bb5e2a61e1a7dd7723b
2013-11-14 17:21:48 -06:00
Brian Clements
e7c355df52
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: cacdf313c5cacdf313c500490c2db2ab24330f23
2013-11-14 17:12:02 -06:00
Mike Duff
5fdf101af6
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 47011a70db47011a70db47a0477587b929b7aa02
2013-11-14 17:07:54 -06:00
Nate Jensen
7ec18ba0b1
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: b4bcd14a85b4bcd14a85c2aacfc437a8a1e396fe
2013-11-14 16:34:28 -06:00
Richard Peter
e7d8e5e560
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 8fb79e7b738fb79e7b73c42f9311182b95bcfb31
2013-11-14 14:56:59 -06:00
Richard Peter
e2a16fd876
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: 79bdd34f4f79bdd34f4f0074b774f096b4944b41
2013-11-14 14:40:23 -06:00
Lee Venable
84de0beae4
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: d431f3c0f4d431f3c0f4bc7f5e556d17fef206fc
2013-11-14 14:33:18 -06:00
Richard Peter
ace2a71092
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 4d18c7d4934d18c7d4933f5c590c5f3dc0ad184c
2013-11-14 13:30:09 -06:00
Nate Jensen
e83a828209
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9acda0b9f29acda0b9f2c5cf68cc45a6be904c69
2013-11-14 13:29:30 -06:00
Bryan Kowal
79045d620b
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: 2029c34f242029c34f247e35ea310fa2261b9ff3
2013-11-14 11:57:11 -06:00
Steve Harris
39e8f5ecc1
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 473488f5b8473488f5b84d25eb11c8ef852ac125
2013-11-13 23:20:18 -06:00
Richard Peter
58c8106da8
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: 2f3eee14392f3eee1439e88f5777a764afe42e74
2013-11-13 16:43:26 -06:00
Brian Clements
d94f44d406
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 95f1621d3e95f1621d3e8cbe2c06a849c8bd5ee9
2013-11-13 13:45:44 -06:00
Bryan Kowal
1a905e8a3c
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 86dd20084486dd2008440544b66f4e01735ca0c4
2013-11-13 13:16:55 -06:00
Steve Harris
42ece4fb6a
14.1.1-8 baseline
...
Former-commit-id: aa6c977e7baa6c977e7bc7d36eb6ad0123596fd9
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
64a37e7672
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: 5cd030f0965cd030f0961c46226a11fe7c6886c4
2013-11-13 10:52:07 -06:00
Brian Clements
ac221125f4
Issue #1314 fixed WFS output problem found when testing KeyLocker
...
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: dfd88151e6dfd88151e637f4f41d2def2acc6562
2013-11-13 10:04:13 -06:00
Brian Clements
b511453153
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: 191ffc6e63191ffc6e63df1542a66c0e5d3e9e69
2013-11-13 08:07:29 -06:00
Nate Jensen
633faf692b
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
...
Former-commit-id: accfefae6daccfefae6df0b386b63280227c4750
2013-11-12 16:55:31 -06:00
Dave Hladky
86363574b3
Issue #2542 Jetty upgraded
...
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 643a150777643a150777e3a259182c53866e481a
2013-11-12 14:55:41 -06:00
Nate Jensen
a53cf1a079
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
...
Former-commit-id: 5e02427d6e5e02427d6ec60228c854a1315f1072
2013-11-12 14:41:34 -06:00
Richard Peter
0cf51fce74
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: 9af1de07d49af1de07d4f12839a9e5c8ff79a7f5
2013-11-12 13:47:04 -06:00
Nate Jensen
f618186c69
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
...
Former-commit-id: 88af1ddfcb88af1ddfcb64aa00bad639679b0608
2013-11-12 12:46:38 -06:00
Brad Gonzales
bad9b3242a
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: 8f70fb1d0c8f70fb1d0caea0e847aa866a11a9f0
2013-11-12 12:42:16 -06:00
Brian Clements
94a9ea2ff0
Issue #2539 removed java 7 specific code from exception subclass
...
Former-commit-id: 8b0e85f82c8b0e85f82c4050eb5f3eba12c7467d
2013-11-12 12:41:50 -06:00
Nate Jensen
1f4af0c06a
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
...
Former-commit-id: 3f86a3735e3f86a3735eeed4c8604b18d790a423
2013-11-12 12:13:58 -06:00
Richard Peter
c60b0849b3
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
...
Former-commit-id: 8afc87e5708afc87e57061fc3eba44b8b01f6305
2013-11-12 11:18:56 -06:00
Richard Peter
c8ef435295
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: 306bd6fae1306bd6fae1460a7b8b5d59671c1e7d
2013-11-12 11:11:36 -06:00
Nate Jensen
66ff41e961
Issue #2361 static lazy initialization of SubscriptionOverlapService's
...
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: 1ee5d91af21ee5d91af22cdc7e5e63368d73449e
2013-11-12 11:03:51 -06:00
Dave Hladky
e410d1f44b
Issue #2448 fix scheduling for start/stop of subscription.
...
Former-commit-id: b6f1468b7eb6f1468b7e976eece1b1753b36cfea
2013-11-12 10:58:50 -06:00
Nate Jensen
f1b25ed227
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
...
Former-commit-id: bca5793e3dbca5793e3dda8a858727d758e5ab57
2013-11-12 10:55:40 -06:00
Brad Gonzales
1b084e4efa
Issue #2506 Added subscription notification service to bandwidth manager.
...
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: cd221e5263cd221e5263ff5edde334efdc64b7b3
2013-11-12 10:50:06 -06:00
Nate Jensen
f55aa5aea0
Merge "Issue #2377 fixed error handling in QPF config" into development
...
Former-commit-id: 30548683503054868350d8f2ffbceb68866c322c
2013-11-12 10:39:51 -06:00
Nate Jensen
81749eac08
Merge "Issue #2539 added GZIP support to WFS REST" into development
...
Former-commit-id: f1b8eecca7f1b8eecca78c4608630db87efc6860
2013-11-12 10:39:44 -06:00
Nate Jensen
80c38e1433
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: b52bdb1cecb52bdb1cec7a73c654305427e68fd2
2013-11-12 10:37:54 -06:00
Nate Jensen
da95b6f03e
Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
...
Former-commit-id: 3ed50ff5003ed50ff50023fe7de46290320ab47a
2013-11-12 09:29:46 -06:00
Bryan Kowal
2565306c95
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: 8e1c0fb8eb8e1c0fb8eb75e6914df15c38f0bfd6
2013-11-11 17:00:17 -06:00
Brian Clements
6b051e1513
Issue #2377 fixed error handling in QPF config
...
Former-commit-id: e2ac7ae212e2ac7ae212684bd4dc50c6f8609b39
2013-11-11 16:18:16 -06:00
Nate Jensen
5c30fd5b5c
Issue #2361 undo earlier changes that potentially break uengine based
...
local apps
Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65
Former-commit-id: 8628b7755e8628b7755ea2935193b59dc69e316f
2013-11-11 16:14:35 -06:00
Brian Clements
587c9ad61c
Issue #2539 added GZIP support to WFS REST
...
small code cleanup in providers
Former-commit-id: 36a0be2db136a0be2db1061515b48524905af3c4
2013-11-11 16:08:09 -06:00
Nate Jensen
175cc8dd74
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: 7dda17a6607dda17a66005ee46c4bc64df0d8d8f
2013-11-11 14:05:11 -06:00
Richard Peter
a40c837424
Merge "Issue #2506 Refactored RegistryEvent constructors." into development
...
Former-commit-id: 13989d9c6e13989d9c6e51649b56e58db2d589e3
2013-11-11 13:09:24 -06:00
Bryan Kowal
18bb3ef947
Issue #2297 - fix 14.2.1 merge
...
Former-commit-id: e2a02ca247e2a02ca247411e0fa7c4e937ba954b
2013-11-11 13:04:21 -06:00
Steve Harris
76ca0835e7
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
...
Former-commit-id: fbfe1a5faffbfe1a5faf8a2e9f1725b4fe17406f
2013-11-11 11:45:35 -06:00
Max Schenkelberg
60616f7ef0
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: e58a5df04be58a5df04bbd903f6641c85532a180
2013-11-11 11:09:00 -06:00
Nate Jensen
f15ae53437
Merge "Issue #1314 removed common.spatial plugin" into development
...
Former-commit-id: 0dbc31b7560dbc31b75606acf1b8a0de2623e273
2013-11-11 08:48:44 -06:00
Steve Harris
cb9e4afe53
Issue #2214 - merge fix: Removed duplicate annotation @Override
...
Former-commit-id: 766940dedb766940dedb3a5028a42decfc04214c
2013-11-11 08:15:30 -06:00
