Commit graph

4342 commits

Author SHA1 Message Date
Ben Steffensmeier
5ee4468108 Issue #2574 Add DataURIFieldConverter for GridCoverages.
Former-commit-id: cf6ef77d78 [formerly 08be03d3fa] [formerly cf6ef77d78 [formerly 08be03d3fa] [formerly bdb0e111ea [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]]
Former-commit-id: bdb0e111ea
Former-commit-id: d8f5e957d3 [formerly f7b1015dca]
Former-commit-id: b1de6a34eb
2013-11-25 12:17:36 -06:00
Nate Jensen
441577fb39 Merge "Issue #2359 add ability to ignore messages based on threads, ie ignore shef" into development
Former-commit-id: 102e82445c [formerly 00fa91223b] [formerly 102e82445c [formerly 00fa91223b] [formerly 38cc0b46f6 [formerly c4baf73e044c156a942290b8be603d9c9621d9fe]]]
Former-commit-id: 38cc0b46f6
Former-commit-id: b48359ab38 [formerly be4943ae3d]
Former-commit-id: 7ffe17a73e
2013-11-25 08:34:40 -06:00
Nate Jensen
a858617b6c Issue #2359 add ability to ignore messages based on threads, ie ignore
shef

Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48

Former-commit-id: db842ce2e6 [formerly 4a4f50155c] [formerly db842ce2e6 [formerly 4a4f50155c] [formerly ed1b94ea07 [formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]]
Former-commit-id: ed1b94ea07
Former-commit-id: c836673ac6 [formerly 3b0ed49de4]
Former-commit-id: 493f51eae7
2013-11-22 15:54:22 -06:00
Richard Peter
5bb7b93078 Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
Former-commit-id: 4b09affc7c [formerly b26e562845] [formerly 4b09affc7c [formerly b26e562845] [formerly be7c2ef08e [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]
Former-commit-id: be7c2ef08e
Former-commit-id: d1201473cd [formerly c51cc4bf17]
Former-commit-id: 91fcef9d3f
2013-11-22 12:38:05 -06:00
Nate Jensen
3d4b802ead Merge "Issue #2361 fix style manager's jaxb context" into development
Former-commit-id: 38fdf1edcf [formerly 9de7c7f434] [formerly 38fdf1edcf [formerly 9de7c7f434] [formerly 49ce4d4be3 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]]
Former-commit-id: 49ce4d4be3
Former-commit-id: e049c8aca2 [formerly 6ab6de4419]
Former-commit-id: 54c2d1e420
2013-11-22 10:08:13 -06:00
Nate Jensen
3e24b4827e Issue #2361 fix style manager's jaxb context
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 2c61b8f4d6 [formerly 16329ab06b] [formerly 2c61b8f4d6 [formerly 16329ab06b] [formerly 328991e577 [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]]
Former-commit-id: 328991e577
Former-commit-id: 24e99ec924 [formerly ebc3efdf80]
Former-commit-id: b6748206e5
2013-11-22 09:15:24 -06:00
Dave Hladky
2e254e0208 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
Former-commit-id: 233238d8df [formerly 04c7e2cffc] [formerly 233238d8df [formerly 04c7e2cffc] [formerly a9a3973319 [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]
Former-commit-id: a9a3973319
Former-commit-id: cebf79ad44 [formerly ebd6d5cbe1]
Former-commit-id: 54af53ffb4
2013-11-21 14:46:47 -06:00
Nate Jensen
f3bbaa5362 Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
Former-commit-id: 32cbfd6150 [formerly ddb0eaf0ff] [formerly 32cbfd6150 [formerly ddb0eaf0ff] [formerly d851e6fc97 [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]]
Former-commit-id: d851e6fc97
Former-commit-id: f5a2c7298a [formerly f60948fc36]
Former-commit-id: a5469c1d9e
2013-11-21 10:12:11 -06:00
Nate Jensen
ce8dd7468d 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: ab96dde78a [formerly 982a664301] [formerly ab96dde78a [formerly 982a664301] [formerly 695262552f [formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]]
Former-commit-id: 695262552f
Former-commit-id: 3d8c69c800 [formerly 198ff37bd7]
Former-commit-id: eb0f52cfca
2013-11-21 08:36:59 -06:00
Nate Jensen
3a5a066bf3 Issue #2033 fix plots working with multiple plotModels dirs contributed
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: b3028b4f39 [formerly 9371c63c41] [formerly b3028b4f39 [formerly 9371c63c41] [formerly 2b6799712d [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]]
Former-commit-id: 2b6799712d
Former-commit-id: 87dc5fb261 [formerly 3e88de72dc]
Former-commit-id: 19b467c208
2013-11-20 17:33:53 -06:00
Brad Gonzales
65eefe2846 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: c7959336f5 [formerly 93b47ce68b] [formerly c7959336f5 [formerly 93b47ce68b] [formerly d2cfc5986a [formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]]
Former-commit-id: d2cfc5986a
Former-commit-id: 4a83ff7971 [formerly 04d7bff784]
Former-commit-id: 70f66e5f7a
2013-11-20 15:49:27 -06:00
Greg Armendariz
5d5f7c9d44 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: 6efadcdeed [formerly 93daf9aff4] [formerly 6efadcdeed [formerly 93daf9aff4] [formerly bc6c4e2b32 [formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]]
Former-commit-id: bc6c4e2b32
Former-commit-id: dd31a09cf9 [formerly ce2ef25207]
Former-commit-id: c94e59646b
2013-11-20 12:26:30 -06:00
Brad Gonzales
fc4850d7b2 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: 5576ac6134 [formerly 053f20c70b] [formerly 5576ac6134 [formerly 053f20c70b] [formerly 95a1914c71 [formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]
Former-commit-id: 95a1914c71
Former-commit-id: 3c86e33ea4 [formerly 04829d37e2]
Former-commit-id: 6e19c4dab1
2013-11-20 11:58:33 -06:00
Ben Steffensmeier
6cd151b427 Issue #2532 Fix grid displays of grids larger than the world.
Former-commit-id: 6d878e3361 [formerly d3ed1ba356] [formerly 6d878e3361 [formerly d3ed1ba356] [formerly 41753c40b5 [formerly e607da0bb204d61cbc998595f52406605c1953e0]]]
Former-commit-id: 41753c40b5
Former-commit-id: 7f441392b8 [formerly 07743c4369]
Former-commit-id: 1bc4453a8d
2013-11-20 11:11:03 -06:00
Brian Clements
6b8a853240 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: d35fc591d2 [formerly fe58826a1e] [formerly d35fc591d2 [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 10e63616ff [formerly b762864f88]
Former-commit-id: 2e4dc2000e
2013-11-20 08:40:12 -06:00
Bryan Kowal
ce6f126469 Issue #2552 - replace Logger with UFStatus
Former-commit-id: c938d03deb [formerly ff968c9884] [formerly c938d03deb [formerly ff968c9884] [formerly 0bdb25bf43 [formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]]
Former-commit-id: 0bdb25bf43
Former-commit-id: be5b0b83c9 [formerly da148196ac]
Former-commit-id: 91367f57b6
2013-11-19 17:11:36 -06:00
Lee Venable
fd377ca4cc Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
Former-commit-id: b6321334e6 [formerly f8f0a0e41e] [formerly b6321334e6 [formerly f8f0a0e41e] [formerly d42c36f365 [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]
Former-commit-id: d42c36f365
Former-commit-id: c680cc3ea9 [formerly da5cfb3d8e]
Former-commit-id: d3b12f6973
2013-11-19 15:12:38 -06:00
Nate Jensen
3cbf29226a Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
Former-commit-id: f7034f933e [formerly c6d6b07e3f] [formerly f7034f933e [formerly c6d6b07e3f] [formerly a610825ef9 [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]
Former-commit-id: a610825ef9
Former-commit-id: 789f050b27 [formerly 04de350ae7]
Former-commit-id: ac93e07973
2013-11-19 14:11:01 -06:00
Richard Peter
c5143e94e1 Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
Former-commit-id: c82e143fe1 [formerly 4c9bcf718a] [formerly c82e143fe1 [formerly 4c9bcf718a] [formerly b296fd1d02 [formerly d3559746302f09db933f9b8deecfe410e63d8430]]]
Former-commit-id: b296fd1d02
Former-commit-id: 93dbc58a93 [formerly ba8fae576c]
Former-commit-id: 8efa7a1512
2013-11-19 13:18:05 -06:00
Nate Jensen
9cbe1a123e Issue #2361 don't initialize derived parameters on shutdown
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

Former-commit-id: 83c28fd04b [formerly c90a7d7b3c] [formerly 83c28fd04b [formerly c90a7d7b3c] [formerly 5aee685557 [formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]]
Former-commit-id: 5aee685557
Former-commit-id: 48632a81b3 [formerly e9adf706ba]
Former-commit-id: cf87d1c335
2013-11-19 12:59:10 -06:00
Mike Duff
e380af2664 Issue #1531 - Made bandwidth utilization graph resizable.
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475

Former-commit-id: c7c20c6ce8 [formerly ed73a7e55a] [formerly c7c20c6ce8 [formerly ed73a7e55a] [formerly 71093a685e [formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]]
Former-commit-id: 71093a685e
Former-commit-id: 8f9b847eff [formerly 437df90354]
Former-commit-id: fcc96787c3
2013-11-19 12:51:06 -06:00
Nate Jensen
dcf7114d6b Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
Former-commit-id: 50590a241f [formerly 6927e960b2] [formerly 50590a241f [formerly 6927e960b2] [formerly 5885d8027b [formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]]
Former-commit-id: 5885d8027b
Former-commit-id: aba433c4bb [formerly be3d016f93]
Former-commit-id: 0015c66955
2013-11-19 11:25:19 -06:00
Steve Harris
99232f6c6c Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
Former-commit-id: 920e06b8ff [formerly c37908caa8] [formerly 920e06b8ff [formerly c37908caa8] [formerly 39ab54c912 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]]
Former-commit-id: 39ab54c912
Former-commit-id: 7b9bc1ae90 [formerly 94a60728ca]
Former-commit-id: 77d9b628fe
2013-11-19 10:08:45 -06:00
Mike Duff
dd80768cc2 Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: f8d5563973 [formerly c908647259] [formerly f8d5563973 [formerly c908647259] [formerly 665d9e7651 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]
Former-commit-id: 665d9e7651
Former-commit-id: 8221f50e8a [formerly 5afa90b967]
Former-commit-id: d254f954c4
2013-11-19 08:55:27 -06:00
Nate Jensen
1926ac3647 Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: accbd46ad6 [formerly edf51dffc9] [formerly accbd46ad6 [formerly edf51dffc9] [formerly 3d51d80170 [formerly b6420738e49d37840789c88089ecc8bab1103284]]]
Former-commit-id: 3d51d80170
Former-commit-id: 7da95f7b57 [formerly f07f543cd3]
Former-commit-id: a5abd4dad0
2013-11-18 12:50:38 -06:00
Nate Jensen
553a32f5a3 Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: 493cdb287c [formerly 0dbe79344a] [formerly 493cdb287c [formerly 0dbe79344a] [formerly 827b7f5a93 [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]
Former-commit-id: 827b7f5a93
Former-commit-id: 3de7e3576b [formerly 6900d4e47f]
Former-commit-id: b6fe32de06
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
9fa1dbbfa5 Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 6b6c46afa8 [formerly 105e3e359a] [formerly 6b6c46afa8 [formerly 105e3e359a] [formerly e7a068e595 [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]
Former-commit-id: e7a068e595
Former-commit-id: 51c04680e2 [formerly e605758e57]
Former-commit-id: 9bd35b793d
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
7de35d0111 Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: 15ae95075d [formerly e392185d78] [formerly 15ae95075d [formerly e392185d78] [formerly 9ff1751f4e [formerly 166957a22c3447fa2407b13362eece24943675c9]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 0788a82a99 [formerly 1875f56695]
Former-commit-id: 55f26e277f
2013-11-18 11:44:56 -06:00
Nate Jensen
7e76b097c7 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 93e93de742 [formerly 4f47800cae] [formerly 93e93de742 [formerly 4f47800cae] [formerly 0146ae59df [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]
Former-commit-id: 0146ae59df
Former-commit-id: d9d0eb7354 [formerly a238ba2ba3]
Former-commit-id: 951c1ff2f3
2013-11-18 11:39:12 -06:00
Steve Harris
87ce579deb 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: 542a0946f2 [formerly 0a36987a01] [formerly 542a0946f2 [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3f9df61017 [formerly 869b505f80]
Former-commit-id: c26818afe6
2013-11-15 13:15:25 -06:00
Steve Harris
c4e9fe1c94 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: dc4f3b7594 [formerly 1015e180f1] [formerly dc4f3b7594 [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: 156395b85b [formerly d97edb20d1]
Former-commit-id: 7127a1e665
2013-11-15 13:05:40 -06:00
Steve Harris
ed58bc7f71 14.1.1-9 baseline
Former-commit-id: a32eadf384 [formerly f8f995b697] [formerly a32eadf384 [formerly f8f995b697] [formerly 5a0a40e67c [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: eab5bb1147 [formerly 8c136f202d]
Former-commit-id: ea382798b5
2013-11-15 12:47:49 -05:00
Brad Gonzales
2c7e62ee89 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: 938683ba4d [formerly aa8fb36fc1] [formerly 938683ba4d [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]
Former-commit-id: 53d4de12d9
Former-commit-id: 4ec5ee7f74 [formerly 490c95d010]
Former-commit-id: 4499a8d1de
2013-11-15 08:00:47 -06:00
Nate Jensen
2e81364691 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 757ca42a5f [formerly dd99aa3f47] [formerly 757ca42a5f [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d0d712ec6f [formerly d96cdbe761]
Former-commit-id: f2c777ff48
2013-11-14 17:41:24 -06:00
Mike Duff
44c4259ccc Issue #2548 - fix malformed comment
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 0d83797a4e [formerly 414cb1cf68] [formerly 0d83797a4e [formerly 414cb1cf68] [formerly 95fda38cc5 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]
Former-commit-id: 95fda38cc5
Former-commit-id: a13aa64b65 [formerly 7be43c4a52]
Former-commit-id: 0f2626f79f
2013-11-14 17:30:55 -06:00
Richard Peter
8247da7774 Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 157e739623 [formerly 14b1e924a1] [formerly 157e739623 [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 65e8ad1a62 [formerly 1a7dd7723b]
Former-commit-id: 38d2c6564a
2013-11-14 17:21:48 -06:00
Brian Clements
1a2b934e97 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: 55682480e1 [formerly cacdf313c5] [formerly 55682480e1 [formerly cacdf313c5] [formerly 00490c2db2 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 878a677d18 [formerly ab24330f23]
Former-commit-id: e7c355df52
2013-11-14 17:12:02 -06:00
Mike Duff
769e81cd23 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 8cc9c1de59 [formerly 47011a70db] [formerly 8cc9c1de59 [formerly 47011a70db] [formerly 47a0477587 [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]
Former-commit-id: 47a0477587
Former-commit-id: 44cc3d8776 [formerly b929b7aa02]
Former-commit-id: 5fdf101af6
2013-11-14 17:07:54 -06:00
Nate Jensen
f6abd529f7 Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: 3b11ea8c5b [formerly b4bcd14a85] [formerly 3b11ea8c5b [formerly b4bcd14a85] [formerly c2aacfc437 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]
Former-commit-id: c2aacfc437
Former-commit-id: f0a0287230 [formerly a8a1e396fe]
Former-commit-id: 7ec18ba0b1
2013-11-14 16:34:28 -06:00
Bryan Kowal
bc25cbe7ad 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: 782675951b [formerly be78fab116] [formerly 782675951b [formerly be78fab116] [formerly ce16efc9a1 [formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]
Former-commit-id: ce16efc9a1
Former-commit-id: 512fc1a7c1 [formerly a6ea71d46f]
Former-commit-id: 4275b195ce
2013-11-14 15:17:28 -06:00
Richard Peter
2025e073ef Merge branch 'development' into development_on_RHEL6
Former-commit-id: 800effdc5a [formerly 8fb79e7b73] [formerly 800effdc5a [formerly 8fb79e7b73] [formerly c42f931118 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]
Former-commit-id: c42f931118
Former-commit-id: e5dc8e2027 [formerly 2b95bcfb31]
Former-commit-id: e7d8e5e560
2013-11-14 14:56:59 -06:00
Lee Venable
194a6760b7 Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: bd81ec8807 [formerly 834c2ac8da] [formerly bd81ec8807 [formerly 834c2ac8da] [formerly f0ebee3bb3 [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: e9b8ee42c7 [formerly 7d04b2e4ce]
Former-commit-id: ad77be1b44
2013-11-14 14:43:18 -06:00
Mike Duff
2b91b4b9ef Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: f6c4ca2bc0 [formerly 87a4b1bec4] [formerly f6c4ca2bc0 [formerly 87a4b1bec4] [formerly a80964bc7c [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]
Former-commit-id: a80964bc7c
Former-commit-id: 48093514a6 [formerly 4557a06f42]
Former-commit-id: cf077ed7f9
2013-11-14 14:40:33 -06:00
Richard Peter
705339a320 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: 2c753c427c [formerly 79bdd34f4f] [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: b4aac09ff4 [formerly 96b4944b41]
Former-commit-id: e2a16fd876
2013-11-14 14:40:23 -06:00
Lee Venable
ab512eaeb1 Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: 6086c06f66 [formerly d431f3c0f4] [formerly 6086c06f66 [formerly d431f3c0f4] [formerly bc7f5e556d [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 69934b9b32 [formerly 17fef206fc]
Former-commit-id: 84de0beae4
2013-11-14 14:33:18 -06:00
Richard Peter
7375a3b961 Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 5c5e71a01b [formerly 4d18c7d493] [formerly 5c5e71a01b [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 6af248f212 [formerly 3dc0ad184c]
Former-commit-id: ace2a71092
2013-11-14 13:30:09 -06:00
Nate Jensen
6441290b40 Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: a4eb19fc79 [formerly 9acda0b9f2] [formerly a4eb19fc79 [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: e41f57da67 [formerly a6be904c69]
Former-commit-id: e83a828209
2013-11-14 13:29:30 -06:00
Bryan Kowal
ae5e6b3927 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: 48cc679bce [formerly 2029c34f24] [formerly 48cc679bce [formerly 2029c34f24] [formerly 7e35ea310f [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 4759e48c5c [formerly a2261b9ff3]
Former-commit-id: 79045d620b
2013-11-14 11:57:11 -06:00
Steve Harris
8307fe3a9f Merge branch 'development' into development_on_RHEL6
Former-commit-id: 77ea1782c3 [formerly 473488f5b8] [formerly 77ea1782c3 [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: a75acc5499 [formerly ef852ac125]
Former-commit-id: 39e8f5ecc1
2013-11-13 23:20:18 -06:00
Richard Peter
0581cc53e5 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: adc30e817e [formerly 2f3eee1439] [formerly adc30e817e [formerly 2f3eee1439] [formerly e88f5777a7 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]
Former-commit-id: e88f5777a7
Former-commit-id: ed258e9421 [formerly 64afe42e74]
Former-commit-id: 58c8106da8
2013-11-13 16:43:26 -06:00