Nate Jensen
2c61b8f4d6
Issue #2361 fix style manager's jaxb context
...
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68
Former-commit-id: 328991e577
[formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]
Former-commit-id: 16329ab06b
2013-11-22 09:15:24 -06:00
Nate Jensen
32cbfd6150
Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
...
Former-commit-id: d851e6fc97
[formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]
Former-commit-id: ddb0eaf0ff
2013-11-21 10:12:11 -06:00
Nate Jensen
ab96dde78a
Merge "Issue #2448 Fixed problem that set subscription start time to first cycle time. Fixed problem that set subscription end time to end of day." into development
...
Former-commit-id: 695262552f
[formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]
Former-commit-id: 982a664301
2013-11-21 08:36:59 -06:00
Nate Jensen
b3028b4f39
Issue #2033 fix plots working with multiple plotModels dirs contributed
...
by different plugins
Change-Id: I2d1ff75c62395ead5154398002610401faa4388d
Former-commit-id: 2b6799712d
[formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]
Former-commit-id: 9371c63c41
2013-11-20 17:33:53 -06:00
Brad Gonzales
c7959336f5
Issue #2448 Fixed problem that set subscription start time to first cycle time.
...
Fixed problem that set subscription end time to end of day.
Change-Id: Icccdbe4e38581f5194f6fde8d52f280d1a456a65
Former-commit-id: d2cfc5986a
[formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]
Former-commit-id: 93b47ce68b
2013-11-20 15:49:27 -06:00
Greg Armendariz
6efadcdeed
Merge "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." into development
...
Former-commit-id: bc6c4e2b32
[formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]
Former-commit-id: 93daf9aff4
2013-11-20 12:26:30 -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
Brian Clements
d35fc591d2
Issue #2393 removed pypies interpolation
...
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code
Former-commit-id: 0f40ae2b99
[formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]
Former-commit-id: fe58826a1e
2013-11-20 08:40:12 -06:00
Bryan Kowal
c938d03deb
Issue #2552 - replace Logger with UFStatus
...
Former-commit-id: 0bdb25bf43
[formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]
Former-commit-id: ff968c9884
2013-11-19 17:11:36 -06:00
Lee Venable
b6321334e6
Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
...
Former-commit-id: d42c36f365
[formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]
Former-commit-id: f8f0a0e41e
2013-11-19 15:12:38 -06:00
Nate Jensen
f7034f933e
Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
...
Former-commit-id: a610825ef9
[formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]
Former-commit-id: c6d6b07e3f
2013-11-19 14:11:01 -06:00
Richard Peter
c82e143fe1
Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
...
Former-commit-id: b296fd1d02
[formerly d3559746302f09db933f9b8deecfe410e63d8430]
Former-commit-id: 4c9bcf718a
2013-11-19 13:18:05 -06:00
Nate Jensen
83c28fd04b
Issue #2361 don't initialize derived parameters on shutdown
...
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583
Former-commit-id: 5aee685557
[formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]
Former-commit-id: c90a7d7b3c
2013-11-19 12:59:10 -06:00
Mike Duff
c7c20c6ce8
Issue #1531 - Made bandwidth utilization graph resizable.
...
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475
Former-commit-id: 71093a685e
[formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]
Former-commit-id: ed73a7e55a
2013-11-19 12:51:06 -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
Steve Harris
920e06b8ff
Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
...
Former-commit-id: 39ab54c912
[formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]
Former-commit-id: c37908caa8
2013-11-19 10:08:45 -06:00
Mike Duff
f8d5563973
Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
...
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2
Former-commit-id: 665d9e7651
[formerly cacc7a8560c589b24ea98191f152c31479c5631e]
Former-commit-id: c908647259
2013-11-19 08:55:27 -06:00
Nate Jensen
accbd46ad6
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
...
Former-commit-id: 3d51d80170
[formerly b6420738e49d37840789c88089ecc8bab1103284]
Former-commit-id: edf51dffc9
2013-11-18 12:50:38 -06:00
Nate Jensen
493cdb287c
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
...
Former-commit-id: 827b7f5a93
[formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]
Former-commit-id: 0dbe79344a
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
6b6c46afa8
Issue #2543 fix gl buffer formating problems
...
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: e7a068e595
[formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]
Former-commit-id: 105e3e359a
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
15ae95075d
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 9ff1751f4e
[formerly 166957a22c3447fa2407b13362eece24943675c9]
Former-commit-id: e392185d78
2013-11-18 11:44:56 -06:00
Nate Jensen
93e93de742
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 0146ae59df
[formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]
Former-commit-id: 4f47800cae
2013-11-18 11:39:12 -06:00
Steve Harris
542a0946f2
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
...
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: 6d9efac6ef
[formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]
Former-commit-id: 0a36987a01
2013-11-15 13:15:25 -06:00
Steve Harris
dc4f3b7594
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 2f0d53c9b2
[formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]
Former-commit-id: 1015e180f1
2013-11-15 13:05:40 -06:00
Steve Harris
a32eadf384
14.1.1-9 baseline
...
Former-commit-id: 5a0a40e67c
[formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]
Former-commit-id: f8f995b697
2013-11-15 12:47:49 -05:00
Brad Gonzales
938683ba4d
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: 53d4de12d9
[formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]
Former-commit-id: aa8fb36fc1
2013-11-15 08:00:47 -06:00
Nate Jensen
757ca42a5f
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 78b01f61c4
[formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]
Former-commit-id: dd99aa3f47
2013-11-14 17:41:24 -06:00
Mike Duff
0d83797a4e
Issue #2548 - fix malformed comment
...
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 95fda38cc5
[formerly 52462f299735aacee3db09faa6db9f28ba91f552]
Former-commit-id: 414cb1cf68
2013-11-14 17:30:55 -06:00
Richard Peter
157e739623
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 0bb5e2a61e
[formerly dba301df2f593baa951c14b684e7ce4794e32019]
Former-commit-id: 14b1e924a1
2013-11-14 17:21:48 -06:00
Brian Clements
55682480e1
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: 00490c2db2
[formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]
Former-commit-id: cacdf313c5
2013-11-14 17:12:02 -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
Nate Jensen
3b11ea8c5b
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: c2aacfc437
[formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]
Former-commit-id: b4bcd14a85
2013-11-14 16:34:28 -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
Richard Peter
800effdc5a
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: c42f931118
[formerly 13d284277bed2f0f731547ec443a262556df997c]
Former-commit-id: 8fb79e7b73
2013-11-14 14:56:59 -06:00
Lee Venable
bd81ec8807
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: f0ebee3bb3
[formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]
Former-commit-id: 834c2ac8da
2013-11-14 14:43:18 -06:00
Mike Duff
f6c4ca2bc0
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: a80964bc7c
[formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]
Former-commit-id: 87a4b1bec4
2013-11-14 14:40:33 -06:00
Richard Peter
2c753c427c
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: 0074b774f0
[formerly f7f30006cdaf3c8e99d166463c226b504f458b83]
Former-commit-id: 79bdd34f4f
2013-11-14 14:40:23 -06:00
Lee Venable
6086c06f66
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: bc7f5e556d
[formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]
Former-commit-id: d431f3c0f4
2013-11-14 14:33:18 -06:00
Richard Peter
5c5e71a01b
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 3f5c590c5f
[formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]
Former-commit-id: 4d18c7d493
2013-11-14 13:30:09 -06:00
Nate Jensen
a4eb19fc79
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: c5cf68cc45
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]
Former-commit-id: 9acda0b9f2
2013-11-14 13:29:30 -06:00
Bryan Kowal
48cc679bce
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: 7e35ea310f
[formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]
Former-commit-id: 2029c34f24
2013-11-14 11:57:11 -06:00
Steve Harris
77ea1782c3
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 4d25eb11c8
[formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]
Former-commit-id: 473488f5b8
2013-11-13 23:20:18 -06:00
Richard Peter
adc30e817e
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: e88f5777a7
[formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]
Former-commit-id: 2f3eee1439
2013-11-13 16:43:26 -06:00
Greg Armendariz
06e3f849f0
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
...
Former-commit-id: 3f6281fdbe
[formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]
Former-commit-id: 83ac36721b
2013-11-13 15:30:55 -06:00
Brian Clements
3551b731e0
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 8cbe2c06a8
[formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]
Former-commit-id: 95f1621d3e
2013-11-13 13:45:44 -06:00
Bryan Kowal
178d95e59d
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 0544b66f4e
[formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]
Former-commit-id: 86dd200844
2013-11-13 13:16:55 -06:00
Steve Harris
eb470599f3
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 2e7a594d51
[formerly ebde6dc849a1ca9753f959423109186c836b4525]
Former-commit-id: 0a37219d2a
2013-11-13 11:34:17 -06:00
Steve Harris
90bc008a50
14.1.1-8 baseline
...
Former-commit-id: c7d36eb6ad
[formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]
Former-commit-id: aa6c977e7b
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
c294d5d77a
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
...
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: 1c46226a11
[formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]
Former-commit-id: 5cd030f096
2013-11-13 10:52:07 -06:00
Brian Clements
0d80fa7dc1
Issue #1314 fixed WFS output problem found when testing KeyLocker
...
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 37f4f41d2d
[formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]
Former-commit-id: dfd88151e6
2013-11-13 10:04:13 -06:00