Commit graph

1978 commits

Author SHA1 Message Date
Ron Anderson
fb3b7b0a9f Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]
Former-commit-id: e30d6041ee
2013-12-04 17:10:48 -06:00
Richard Peter
8f9b6fa07c Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: 2a2473f3bb [formerly ff44393e90] [formerly ea7dac5993] [formerly 0281447166 [formerly ea7dac5993 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]
Former-commit-id: 0281447166
Former-commit-id: f8b518f19e6bc75858971de994088a9caa63f0de [formerly f6808e6623]
Former-commit-id: d937861d05
2013-12-04 12:00:40 -06:00
Dave Hladky
36f601253e Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: bce11dec14 [formerly 6607e5fe30] [formerly 483ec5d22f] [formerly 593f24023d [formerly 483ec5d22f [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]
Former-commit-id: 593f24023d
Former-commit-id: 035f4702c002daa8199c28c0d3ad1c8b496bd6ab [formerly 4060748634]
Former-commit-id: 09aa3a6c62
2013-12-04 11:58:49 -06:00
Richard Peter
5df468bf42 Issue #2170: Fix DataUriRouter Java 1.6 compliance
Change-Id: Iae25b28498f8fec8c76b764c3214f494acdde992

Former-commit-id: 8de680ac47 [formerly 987b86734f] [formerly b02490146a] [formerly 623fb3b71a [formerly b02490146a [formerly 6f38a006d33217389975a3cfeeda9c1bed928c13]]]
Former-commit-id: 623fb3b71a
Former-commit-id: cd13fd0803ec14ea5f01e028adf952d3cc210785 [formerly b627f93141]
Former-commit-id: 8b221db32d
2013-12-04 09:53:00 -06:00
Richard Peter
73ead1f113 Issue #2551: Update NCEP objects to extend PersistablePluginDataObject.
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 7a6363a221 [formerly 796293c036] [formerly 98117b4093] [formerly f8f3ebc6e9 [formerly 98117b4093 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 44511bfc2e531ad41861e79e71e290ead558ef3f [formerly 1a554d9632]
Former-commit-id: 00c44b3a08
2013-12-03 17:24:01 -06:00
Richard Peter
2cafd3a81b Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 7969ef9648 [formerly 760f215e8c] [formerly f6787c0b9f2cb0cae1c07a2111e91ecfc12f31f5 [formerly f5f75ec629]] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]
Former-commit-id: e82e1137f9
Former-commit-id: cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]
Former-commit-id: ee03dcf505
2013-12-03 16:25:31 -06:00
Richard Peter
c809c1d4de Merge "Issue #2537 Serialize empty enum sets. Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2" into development
Former-commit-id: 27802b5c05 [formerly 2ffe348d85] [formerly ce4a95a082] [formerly 37c08d3e82 [formerly ce4a95a082 [formerly ba1eadae31abadb655d3752a06c726aaf8f9adc5]]]
Former-commit-id: 37c08d3e82
Former-commit-id: 2ea31c1eecb49d380da4ab9010c20541fc000514 [formerly 8a301388e1]
Former-commit-id: 686de8b760
2013-12-03 12:53:26 -06:00
Ben Steffensmeier
225ab6a985 Issue #2537 Serialize empty enum sets.
Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2

Former-commit-id: a7b0bf7f5d [formerly 90950af8a2] [formerly f460896552] [formerly f7be93daa7 [formerly f460896552 [formerly 0dabccd03145857b75fe90260b4d52e1541c5591]]]
Former-commit-id: f7be93daa7
Former-commit-id: f6f3d8e3cf59df4cee317ea30921cc5eccf19bca [formerly 74e182ad5e]
Former-commit-id: 0ac69e2bda
2013-12-03 12:17:01 -06:00
Richard Peter
753bb7d8ba Issue #2051: Fix Shef PurgeText
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac

Former-commit-id: ad487befc7 [formerly c0c4dad633] [formerly 97fe8bd24b] [formerly a2028de5bc [formerly 97fe8bd24b [formerly f6d47991f62e99fa72ffafc2b6175eff8a0a83ac]]]
Former-commit-id: a2028de5bc
Former-commit-id: f6c2eea47423468305e8de35fb818c7b24ded26e [formerly 86d08ef574]
Former-commit-id: f75acec79c
2013-12-03 11:41:22 -06:00
Richard Peter
14ed9331d3 Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: f2d99af20e [formerly 5905c5d08d] [formerly 2085a9cd33] [formerly fbda83aeb9 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]]
Former-commit-id: fbda83aeb9
Former-commit-id: 92cc0eed5d5ca22d3b43329858c1619c9363e66a [formerly f7f9a4e57c]
Former-commit-id: 670e63d0dd
2013-12-03 11:41:21 -06:00
Richard Peter
212fccb765 Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development
Former-commit-id: daab4cdf27 [formerly 829744ced9] [formerly 10f32b5fc7] [formerly 02b11b3509 [formerly 10f32b5fc7 [formerly 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b]]]
Former-commit-id: 02b11b3509
Former-commit-id: 2cafe53ae959bca215aefcacc88290c16da44bc2 [formerly 3113fe26cd]
Former-commit-id: 35d4e7239f
2013-12-02 16:52:40 -06:00
Nate Jensen
a25621ae6d Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 77c23c6d0e [formerly 9b3f871c21] [formerly 6bf1fd8d3c] [formerly 72c322c667 [formerly 6bf1fd8d3c [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]]
Former-commit-id: 72c322c667
Former-commit-id: 58b83a2d53b306277cdc9a0820852147a2519f74 [formerly 2831ceb356]
Former-commit-id: 476f9da5ad
2013-12-02 16:10:26 -06:00
Brad Gonzales
2ac17d4f80 Issue #2541 Added exclude patterns to RequestPatterns.
Added an exclude pattern to grib.xml to exclude data delivery sbn files.

Change-Id: Id92865e1b58bdcf3744328bd0362636093a03521

Former-commit-id: 5a29ccf45a [formerly abafd2bc13] [formerly dc7e255d43] [formerly 8acfa99e77 [formerly dc7e255d43 [formerly 396a9a99863ce9a616eecde6466f1c4d43b8d566]]]
Former-commit-id: 8acfa99e77
Former-commit-id: ae02142a37272496582f2ecc88cfd8d603853aa7 [formerly dd8eb8c2b4]
Former-commit-id: f25d05d871
2013-12-02 11:44:09 -06:00
Benjamin Phillippe
615b5ce605 Issue #2534 Added reciprocated registry replication subscriptions
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: 67f6ee0999 [formerly f4144fca06] [formerly 212bbeb379] [formerly 31b53f4ad9 [formerly 212bbeb379 [formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 9bc982c030242d6a1ff819c729fdbb6438d12813 [formerly 2fa17aab7f]
Former-commit-id: 495f70a5cf
2013-11-27 12:07:59 -06:00
Nate Jensen
3eecc7fca3 Merge "Issue #2537 point data code cleanup." into development
Former-commit-id: 4d3135ae4a [formerly de593896f8] [formerly 9a4a4fba2d] [formerly d9ab670d45 [formerly 9a4a4fba2d [formerly 8ccafcec9155bdab49d4d41c3a463323946f1850]]]
Former-commit-id: d9ab670d45
Former-commit-id: 798f185f5ee43a9a59c7105331f7aa7b519c6504 [formerly 0a936e860a]
Former-commit-id: 1326b0ec0f
2013-11-26 17:48:53 -06:00
Ben Steffensmeier
e3b84502cb Issue #2528 Allow geostationary data to display on an identical projection.
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46

Former-commit-id: 7dd3dd2332 [formerly 5369a757ce] [formerly 048f968147] [formerly 59d806fa7e [formerly 048f968147 [formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]]
Former-commit-id: 59d806fa7e
Former-commit-id: c7a36153bad0dfab90f971ef314e2c47b661772c [formerly 37f6acbb99]
Former-commit-id: a78188ecb9
2013-11-26 17:38:29 -06:00
Ben Steffensmeier
b64e917cad Issue #2574 Fix conversion of null grid coverage in dataURI.
Former-commit-id: b790c592e3 [formerly e639a00fd8] [formerly 21f0abbca1] [formerly 6d14edd0a8 [formerly 21f0abbca1 [formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]]]
Former-commit-id: 6d14edd0a8
Former-commit-id: fbbf2251bce73f0459ef7cb44f9d765edb9c2fce [formerly 089bdf97cb]
Former-commit-id: c300d0ee8a
2013-11-26 15:19:31 -06:00
Ben Steffensmeier
65147cfb78 Issue #2537 point data code cleanup.
Former-commit-id: 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]
Former-commit-id: 7889c14b35
Former-commit-id: ad0bd85eb3b2bf617012e11ec19831b5f9d526eb [formerly 62ca7b1df6]
Former-commit-id: a4e3bf34b8
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
da8d574656 Issue #2574 Add DataURIFieldConverter for GridCoverages.
Former-commit-id: 7202b4a232 [formerly cf6ef77d78] [formerly 08be03d3fa] [formerly bdb0e111ea [formerly 08be03d3fa [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]]
Former-commit-id: bdb0e111ea
Former-commit-id: 5e670545fb6209a901b0d3032b1a1f721f3a2666 [formerly f7b1015dca]
Former-commit-id: d8f5e957d3
2013-11-25 12:17:36 -06:00
Ben Steffensmeier
56456894f1 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: dcfdc9a24b [formerly 8a7d3ceab1] [formerly 192772b92c8a86ee4d2a06670357a91aa3f822cd [formerly 927801985a]] [formerly 3696896b49 [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: a7cbce5b5d72746638add296db468539851abb4e [formerly 70ca78c7b5]
Former-commit-id: ca5e771451
2013-11-25 11:31:57 -06:00
Dave Hladky
ad8acfb5f4 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
Former-commit-id: 162dcb3f42 [formerly 233238d8df] [formerly 04c7e2cffc] [formerly a9a3973319 [formerly 04c7e2cffc [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]
Former-commit-id: a9a3973319
Former-commit-id: 72c3d32a8a4aa43ecf8d033ca096d32cb261c568 [formerly ebd6d5cbe1]
Former-commit-id: cebf79ad44
2013-11-21 14:46:47 -06:00
Nate Jensen
1627b502ff 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: d4f4868d96 [formerly ab96dde78a] [formerly 982a664301] [formerly 695262552f [formerly 982a664301 [formerly 8c71361680cbe5860cbd4d76c3908cfbef23068f]]]
Former-commit-id: 695262552f
Former-commit-id: 4c99413c1ea1c158d0f301ef0374d87a7997ca87 [formerly 198ff37bd7]
Former-commit-id: 3d8c69c800
2013-11-21 08:36:59 -06:00
Brad Gonzales
e28ac634ee 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: c27778c4df [formerly c7959336f5] [formerly 93b47ce68b] [formerly d2cfc5986a [formerly 93b47ce68b [formerly d8040be0d01c11fc7bfafe40a7afe509ba372ea0]]]
Former-commit-id: d2cfc5986a
Former-commit-id: 76f67795d1d943ade561899bea989a7a700107d8 [formerly 04d7bff784]
Former-commit-id: 4a83ff7971
2013-11-20 15:49:27 -06:00
Ben Steffensmeier
1b022bfd31 Issue #2528 Add brute force method of calculating geostationary envelope intersections.
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf

Former-commit-id: 4d86af4f02 [formerly 9627cf0f6f] [formerly 30d125f95a] [formerly 00af766143 [formerly 30d125f95a [formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]
Former-commit-id: 00af766143
Former-commit-id: cacb3acbd0ce426c88a1a423cb2359588872f550 [formerly 6faafa2dfc]
Former-commit-id: abdb1c504c
2013-11-20 15:36:27 -06:00
Greg Armendariz
73d62a6589 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: 04e24a343a [formerly 6efadcdeed] [formerly 93daf9aff4] [formerly bc6c4e2b32 [formerly 93daf9aff4 [formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]]
Former-commit-id: bc6c4e2b32
Former-commit-id: 14dad5a0dd830f24c2fd927b2961671ee2d5a727 [formerly ce2ef25207]
Former-commit-id: dd31a09cf9
2013-11-20 12:26:30 -06:00
Brad Gonzales
3aa399c82e 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: 2f37534433 [formerly 5576ac6134] [formerly 053f20c70b] [formerly 95a1914c71 [formerly 053f20c70b [formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]
Former-commit-id: 95a1914c71
Former-commit-id: 19437f081eb72b80741e738e53af17b271610621 [formerly 04829d37e2]
Former-commit-id: 3c86e33ea4
2013-11-20 11:58:33 -06:00
Brian Clements
6c28068d21 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: 42f7214967 [formerly d35fc591d2] [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 2a623a799e9a08a389ada1365b70ef555ee0c5d1 [formerly b762864f88]
Former-commit-id: 10e63616ff
2013-11-20 08:40:12 -06:00
Bryan Kowal
6fd3e0873b Issue #2552 - replace Logger with UFStatus
Former-commit-id: 9ac4bb7691 [formerly c938d03deb] [formerly ff968c9884] [formerly 0bdb25bf43 [formerly ff968c9884 [formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]]
Former-commit-id: 0bdb25bf43
Former-commit-id: bced7499ad52dec9e2951c50088549321f9c192b [formerly da148196ac]
Former-commit-id: be5b0b83c9
2013-11-19 17:11:36 -06:00
Nate Jensen
2cc539c3d3 Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
Former-commit-id: 275bdc13ed [formerly 50590a241f] [formerly 6927e960b2] [formerly 5885d8027b [formerly 6927e960b2 [formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]]
Former-commit-id: 5885d8027b
Former-commit-id: a8aba4eda4a927d292566c88bac7dcffae609ef3 [formerly be3d016f93]
Former-commit-id: aba433c4bb
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: 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 0146ae59df [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]
Former-commit-id: 0146ae59df
Former-commit-id: d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3]
Former-commit-id: d9d0eb7354
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: 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly aa8fb36fc1 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]
Former-commit-id: 53d4de12d9
Former-commit-id: e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010]
Former-commit-id: 4ec5ee7f74
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: 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761]
Former-commit-id: d0d712ec6f
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: 979fa16d04 [formerly 157e739623] [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 29857e1e475c9363f0f62efb31ac6cf02ee6e84f [formerly 1a7dd7723b]
Former-commit-id: 65e8ad1a62
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: e8c8314abe [formerly 55682480e1] [formerly a741cec01e3c674aef92a9cc8641d62be829d023 [formerly cacdf313c5]] [formerly 00490c2db2 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 8742dd3b5b719d9daf15294c04f9699017a3a49b [formerly ab24330f23]
Former-commit-id: 878a677d18
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: 223901d9cf [formerly 8cc9c1de59] [formerly 47011a70db] [formerly 47a0477587 [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]
Former-commit-id: 47a0477587
Former-commit-id: 33980f8e6df3009e6c047cfc2074778085a37612 [formerly b929b7aa02]
Former-commit-id: 44cc3d8776
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: 2d5752d3d6 [formerly 3b11ea8c5b] [formerly b4bcd14a85] [formerly c2aacfc437 [formerly b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]
Former-commit-id: c2aacfc437
Former-commit-id: dcba58ed57cf3e8859d8471e47fda78c0e7ef984 [formerly a8a1e396fe]
Former-commit-id: f0a0287230
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: 8b274264c9 [formerly 782675951b] [formerly be78fab116] [formerly ce16efc9a1 [formerly be78fab116 [formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]
Former-commit-id: ce16efc9a1
Former-commit-id: 5e386da33f46128ec2187010bd711c2f5ecf11d8 [formerly a6ea71d46f]
Former-commit-id: 512fc1a7c1
2013-11-14 15:17:28 -06:00
Richard Peter
b9da33bcea Merge branch 'development' into development_on_RHEL6
Former-commit-id: 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly c42f931118 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]
Former-commit-id: c42f931118
Former-commit-id: d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f [formerly 2b95bcfb31]
Former-commit-id: e5dc8e2027
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: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]
Former-commit-id: b4aac09ff4
2013-11-14 14:40:23 -06:00
Lee Venable
b93b05165c Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly bc7f5e556d [formerly d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 8b1c54f60a8cccda08a50dac70415ec886062e9b [formerly 17fef206fc]
Former-commit-id: 69934b9b32
2013-11-14 14:33:18 -06:00
Richard Peter
df3e6735af Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 493a9f0f3191b9c74a85050ff2e11f14b925c249 [formerly 3dc0ad184c]
Former-commit-id: 6af248f212
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: 9517c96d68 [formerly a4eb19fc79] [formerly b7f992b9856796b232897d2f5aa72126f4eed83b [formerly 9acda0b9f2]] [formerly c5cf68cc45 [formerly 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69]
Former-commit-id: e41f57da67
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: 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3]
Former-commit-id: 4759e48c5c
2013-11-14 11:57:11 -06:00
Steve Harris
d6ef4ae259 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 361df767a8 [formerly 77ea1782c3] [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 473488f5b8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: 282970560ec2ee6eee13b9272e753fbb7d551416 [formerly ef852ac125]
Former-commit-id: a75acc5499
2013-11-13 23:20:18 -06:00
Richard Peter
42ac155685 Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly e88f5777a7 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]
Former-commit-id: e88f5777a7
Former-commit-id: 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74]
Former-commit-id: ed258e9421
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: 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81 [formerly 49c8bd5ee9]
Former-commit-id: d2f0b73626
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: 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4]
Former-commit-id: a2b1211c52
2013-11-13 13:16:55 -06:00
Steve Harris
1902ca9cfb 14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]
Former-commit-id: b7ca6163e3
2013-11-13 12:32:17 -05:00
Benjamin Phillippe
7cbc9b4ef3 Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279

Former-commit-id: 7b53fc40d4 [formerly c294d5d77a] [formerly d1769bae732e9e8f04b6407fdf659ac6eeaae5c3 [formerly 5cd030f096]] [formerly 1c46226a11 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]
Former-commit-id: 1c46226a11
Former-commit-id: 02517e3b01d1874cc92736a35804499b6a45c0d6 [formerly fe7c6886c4]
Former-commit-id: 1a19965daf
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: 0991849617 [formerly 0d80fa7dc1] [formerly a1efb536e48a75742d84cd92212efeb7e692e012 [formerly dfd88151e6]] [formerly 37f4f41d2d [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: e50da8d67f3cc8f84bc4978a0aab417ea16a7c26 [formerly ef2acc6562]
Former-commit-id: c3a0ea3400
2013-11-13 10:04:13 -06:00