Nate Jensen
2cc539c3d3
Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
...
Former-commit-id: 275bdc13ed50590a241f6927e960b25885d8027b6927e960b25885d8027bbe3d016f93aba433c4bb
2013-11-19 11:25:19 -06:00
Nate Jensen
f9cdff25f0
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 9740e25c5e93e93de7424f47800cae0146ae59df4f47800cae0146ae59dfa238ba2ba3d9d0eb7354
2013-11-18 11:39:12 -06:00
Brad Gonzales
66a8a30092
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: 437c29c7f4938683ba4daa8fb36fc153d4de12d9aa8fb36fc153d4de12d9490c95d0104ec5ee7f74
2013-11-15 08:00:47 -06:00
Nate Jensen
d8f4ecc2d7
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 462878bf86757ca42a5fdd99aa3f4778b01f61c4dd99aa3f4778b01f61c4d96cdbe761d0d712ec6f
2013-11-14 17:41:24 -06:00
Richard Peter
586b11c80d
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 979fa16d04157e73962314b1e924a10bb5e2a61e14b1e924a10bb5e2a61e1a7dd7723b65e8ad1a62
2013-11-14 17:21:48 -06:00
Brian Clements
7625e0ef16
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: e8c8314abe55682480e1cacdf313c500490c2db2cacdf313c500490c2db2ab24330f23878a677d18
2013-11-14 17:12:02 -06:00
Mike Duff
0f848918e8
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 223901d9cf8cc9c1de5947011a70db47a047758747011a70db47a0477587b929b7aa0244cc3d8776
2013-11-14 17:07:54 -06:00
Nate Jensen
31392685aa
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: 2d5752d3d63b11ea8c5bb4bcd14a85c2aacfc437b4bcd14a85c2aacfc437a8a1e396fef0a0287230
2013-11-14 16:34:28 -06:00
Bryan Kowal
e810496889
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: 8b274264c9782675951bbe78fab116ce16efc9a1be78fab116ce16efc9a1a6ea71d46f512fc1a7c1
2013-11-14 15:17:28 -06:00
Richard Peter
b9da33bcea
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 9bebb21be8800effdc5a8fb79e7b73c42f9311188fb79e7b73c42f9311182b95bcfb31e5dc8e2027
2013-11-14 14:56:59 -06:00
Richard Peter
625647a717
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: 6502f1f6952c753c427c79bdd34f4f0074b774f079bdd34f4f0074b774f096b4944b41b4aac09ff4
2013-11-14 14:40:23 -06:00
Lee Venable
b93b05165c
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: d42589d14f6086c06f66d431f3c0f4bc7f5e556dd431f3c0f4bc7f5e556d17fef206fc69934b9b32
2013-11-14 14:33:18 -06:00
Richard Peter
df3e6735af
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 7c5e85a2885c5e71a01b4d18c7d4933f5c590c5f4d18c7d4933f5c590c5f3dc0ad184c6af248f212
2013-11-14 13:30:09 -06:00
Nate Jensen
ddcca3463d
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68a4eb19fc799acda0b9f2c5cf68cc459acda0b9f2c5cf68cc45a6be904c69e41f57da67
2013-11-14 13:29:30 -06:00
Bryan Kowal
8a0b0667de
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: 7b9c8a617448cc679bce2029c34f247e35ea310f2029c34f247e35ea310fa2261b9ff34759e48c5c
2013-11-14 11:57:11 -06:00
Steve Harris
d6ef4ae259
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 361df767a877ea1782c3473488f5b84d25eb11c8473488f5b84d25eb11c8ef852ac125a75acc5499
2013-11-13 23:20:18 -06:00
Richard Peter
42ac155685
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: 9e4949eeb9adc30e817e2f3eee1439e88f5777a72f3eee1439e88f5777a764afe42e74ed258e9421
2013-11-13 16:43:26 -06:00
Brian Clements
b5b94646cf
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 3204a2f7b53551b731e095f1621d3e8cbe2c06a895f1621d3e8cbe2c06a849c8bd5ee9d2f0b73626
2013-11-13 13:45:44 -06:00
Bryan Kowal
ce40d40304
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 1d519f9778178d95e59d86dd2008440544b66f4e86dd2008440544b66f4e01735ca0c4a2b1211c52
2013-11-13 13:16:55 -06:00
Steve Harris
1902ca9cfb
14.1.1-8 baseline
...
Former-commit-id: 8606fed72490bc008a50aa6c977e7bc7d36eb6adaa6c977e7bc7d36eb6ad0123596fd9b7ca6163e3
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
7cbc9b4ef3
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: 7b53fc40d4c294d5d77a5cd030f0961c46226a115cd030f0961c46226a11fe7c6886c41a19965daf
2013-11-13 10:52:07 -06:00
Brian Clements
c399d0394f
Issue #1314 fixed WFS output problem found when testing KeyLocker
...
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 09918496170d80fa7dc1dfd88151e637f4f41d2ddfd88151e637f4f41d2def2acc6562c3a0ea3400
2013-11-13 10:04:13 -06:00
Brian Clements
381a274111
Issue #2546 added fix for TAFs that contain legacy valid times
...
added unit test
Former-commit-id: 04a9d3ae08b0a5192dfa191ffc6e63df1542a66c191ffc6e63df1542a66c0e5d3e9e69bca5149811
2013-11-13 08:07:29 -06:00
Nate Jensen
793a7f6544
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
...
Former-commit-id: b59a0230e5f2f778c042accfefae6df0b386b632accfefae6df0b386b63280227c4750ec073efd45
2013-11-12 16:55:31 -06:00
Dave Hladky
b467763805
Issue #2542 Jetty upgraded
...
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 80ce7ec3e75313c8b68d643a150777e3a259182c643a150777e3a259182c53866e481af2f670bc00
2013-11-12 14:55:41 -06:00
Nate Jensen
8dacce7f9b
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
...
Former-commit-id: 568e9dacbaedb2b6d2175e02427d6ec60228c8545e02427d6ec60228c854a1315f1072c6e10ebdef
2013-11-12 14:41:34 -06:00
Richard Peter
51f9a7fe54
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
...
Former-commit-id: 8214774545c25ba195149af1de07d4f12839a9e59af1de07d4f12839a9e5c8ff79a7f5502d67591b
2013-11-12 13:47:04 -06:00
Nate Jensen
f673de2e99
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
...
Former-commit-id: 05068bb1f3db61d36b4e88af1ddfcb64aa00bad688af1ddfcb64aa00bad639679b06087a5f716d70
2013-11-12 12:46:38 -06:00
Brad Gonzales
725742f4ec
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: 50fb18601c62e4cafa278f70fb1d0caea0e847aa8f70fb1d0caea0e847aa866a11a9f07747d901f7
2013-11-12 12:42:16 -06:00
Brian Clements
3351401cb6
Issue #2539 removed java 7 specific code from exception subclass
...
Former-commit-id: e9b4f777e19f7e85450d8b0e85f82c4050eb5f3e8b0e85f82c4050eb5f3eba12c7467d4d3c2f488c
2013-11-12 12:41:50 -06:00
Nate Jensen
0c999d40dd
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
...
Former-commit-id: 1747b23290b71f2463da3f86a3735eeed4c8604b3f86a3735eeed4c8604b18d790a423b0600c60ce
2013-11-12 12:13:58 -06:00
Richard Peter
be32cf8237
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
...
Former-commit-id: 7bd2cdb1704d823820548afc87e57061fc3eba448afc87e57061fc3eba44b8b01f6305d66aaa7746
2013-11-12 11:18:56 -06:00
Richard Peter
112816a54c
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: 061fa071477ba466f5a6306bd6fae1460a7b8b5d306bd6fae1460a7b8b5d59671c1e7d3f68fc6eed
2013-11-12 11:11:36 -06:00
Nate Jensen
e2db59a055
Issue #2361 static lazy initialization of SubscriptionOverlapService's
...
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: a1fadcf38f6c016a6bb61ee5d91af22cdc7e5e631ee5d91af22cdc7e5e63368d73449e98cbafe95c
2013-11-12 11:03:51 -06:00
Dave Hladky
3d5ca2453b
Issue #2448 fix scheduling for start/stop of subscription.
...
Former-commit-id: af66d970ddefa18426a1b6f1468b7e976eece1b1b6f1468b7e976eece1b1753b36cfea3f5b80e5b3
2013-11-12 10:58:50 -06:00
Nate Jensen
493d79f524
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
...
Former-commit-id: 695f25ba663480148f14bca5793e3dda8a858727bca5793e3dda8a858727d758e5ab57ddebd81c73
2013-11-12 10:55:40 -06:00
Brad Gonzales
66d22943ed
Issue #2506 Added subscription notification service to bandwidth manager.
...
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: 2cc78d880ecbdb9dfb4fcd221e5263ff5edde334cd221e5263ff5edde334efdc64b7b31987184f87
2013-11-12 10:50:06 -06:00
Nate Jensen
d1e5b5e0dc
Merge "Issue #2377 fixed error handling in QPF config" into development
...
Former-commit-id: 881e9efc6874d7dfd7da3054868350d8f2ffbceb3054868350d8f2ffbceb68866c322c5899801877
2013-11-12 10:39:51 -06:00
Nate Jensen
d2f15c928c
Merge "Issue #2539 added GZIP support to WFS REST" into development
...
Former-commit-id: bf4406d124cd5b0576b0f1b8eecca78c4608630df1b8eecca78c4608630db87efc6860f240b80d6f
2013-11-12 10:39:44 -06:00
Nate Jensen
f91ac1953e
Issue #2361 remove using SerializationUtil for processing XML colormaps
...
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: 1174d221602c0c20f01eb52bdb1cec7a73c65430b52bdb1cec7a73c654305427e68fd29bf83be7e9
2013-11-12 10:37:54 -06:00
Nate Jensen
d3cadd78d6
Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
...
Former-commit-id: 178e212c4b8ff0d1129a3ed50ff50023fe7de4623ed50ff50023fe7de46290320ab47ac84ff18213
2013-11-12 09:29:46 -06:00
Bryan Kowal
5bfc4d4dda
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: d369a33bf06b5f93117e8e1c0fb8eb75e6914df18e1c0fb8eb75e6914df15c38f0bfd61a966d8ec2
2013-11-11 17:00:17 -06:00
Brian Clements
407884f08e
Issue #2377 fixed error handling in QPF config
...
Former-commit-id: 6faded726a23e9ac6aa8e2ac7ae212684bd4dc50e2ac7ae212684bd4dc50c6f8609b39368223de1f
2013-11-11 16:18:16 -06:00
Nate Jensen
e62a756cbc
Issue #2361 undo earlier changes that potentially break uengine based
...
local apps
Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65
Former-commit-id: cf88b536e0bb93c18e7d8628b7755ea2935193b58628b7755ea2935193b59dc69e316fe1138809e7
2013-11-11 16:14:35 -06:00
Brian Clements
9c04028981
Issue #2539 added GZIP support to WFS REST
...
small code cleanup in providers
Former-commit-id: 9934916ec702ab14579f36a0be2db1061515b48536a0be2db1061515b48524905af3c47cba0ca3c1
2013-11-11 16:08:09 -06:00
Nate Jensen
bdfe31ca9d
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: a349a980d3a3fd84d9ef7dda17a66005ee46c4bc7dda17a66005ee46c4bc64df0d8d8f208cc6a534
2013-11-11 14:05:11 -06:00
Richard Peter
9600b1a10e
Merge "Issue #2506 Refactored RegistryEvent constructors." into development
...
Former-commit-id: 8a3069e8e3d55e99dc2d13989d9c6e51649b56e513989d9c6e51649b56e58db2d589e30e1ec70a0d
2013-11-11 13:09:24 -06:00
Bryan Kowal
608f00417e
Issue #2297 - fix 14.2.1 merge
...
Former-commit-id: 8d412d7aa0fee6a5dc9ce2a02ca247411e0fa7c4e2a02ca247411e0fa7c4e937ba954bb1a6d2d828
2013-11-11 13:04:21 -06:00
Steve Harris
ef183dd7af
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
...
Former-commit-id: cf9f426faa33e02b548dfbfe1a5faf8a2e9f1725fbfe1a5faf8a2e9f1725b4fe17406f4e09ce78c8
2013-11-11 11:45:35 -06:00
Max Schenkelberg
ad9578db6f
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: 752c9574b42f794486e3e58a5df04bbd903f6641e58a5df04bbd903f6641c85532a1803f3b244b0d
2013-11-11 11:09:00 -06:00
