Steve Harris
3c9f653212
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: f79a449b6b376482d3b1518822ed83f79a449b6b376482d3b1518822ed83b6af2db9f5518822ed83b6af2db9f50fbeb1a1651dfc15a77e14b1ea307fd226dfb021e30dfd21ee
2014-05-22 14:31:06 -05:00
Steve Harris
2118803e86
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: 74c5b0454c0a3b23d0554899c4f56a74c5b0454c0a3b23d0554899c4f56a2059fc9c0e4899c4f56a2059fc9c0eaa266f6ded805aae1a700df4af413be7e48b2abb5aca60f422
2014-05-22 14:05:06 -05:00
Nate Jensen
8a8ccf1864
Merge "Omaha #3179 added modes file deployment, moved modes.xml to new folder" into omaha_14.4.1
...
Former-commit-id: 4d7f4a29db1cb8903c73341170eb054d7f4a29db1cb8903c73341170eb05cc233ddcf7341170eb05cc233ddcf76854b7230ad107a80acb4fd1f27ddf78c8a8f367c101fb193b
2014-05-22 12:25:26 -05:00
Roger Ferrel
5dc637b676
Issue #3181 Add check for valid array index.
...
Change-Id: I8e0a37bdd094b341da2ce42922a16d840d1ab468
Former-commit-id: 466bfed41efb4ac9acc7a1f25b8748466bfed41efb4ac9acc7a1f25b8748adf6d95c01a1f25b8748adf6d95c019df0147324f719199e17060d9e5003b923a09ded21e303627a
2014-05-22 11:20:26 -05:00
Ben Steffensmeier
291c07af05
Omaha #2913 Fix grib manifest depenency version.
...
Former-commit-id: 893e9fb191554806296099bbb52689893e9fb191554806296099bbb52689f4d1e7730199bbb52689f4d1e773011a645dc1cb58e45cc7a37974c63671287f283decbf397acc36
2014-05-22 11:12:52 -05:00
Lee Venable
5608238369
Merge "Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version." into omaha_14.4.1
...
Former-commit-id: 141e06c56b867116ab361822a27f2b141e06c56b867116ab361822a27f2b5e81d6dbb31822a27f2b5e81d6dbb31f4b83b9093675204b31f42c8779336ab4f39604cdf6bb7b9f
2014-05-22 09:57:56 -05:00
Richard Peter
97b637b40e
Merge "Omaha #2733 restored geomag distribution registration" into omaha_14.4.1
...
Former-commit-id: 86f23ff627c314ba8c2831d1c868ac86f23ff627c314ba8c2831d1c868acb4e52dfa8b31d1c868acb4e52dfa8b8f07b68c90e8cb8cf349245319d31284ed482bf4fe5166e0a2
2014-05-22 09:54:26 -05:00
Ron Anderson
b5414458d7
Issue #3194 Fix GeoTIFF import
...
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 4c33bf1b30a8ba16fc9352931af5ce4c33bf1b30a8ba16fc9352931af5ce2a680b73ea52931af5ce2a680b73ea53f238a71a8f0eb1fd10b7338080e20d54a37b6c307f61e609
2014-05-22 09:53:47 -05:00
Brian Clements
f5a9bffd4c
Omaha #2733 restored geomag distribution registration
...
added placeholder pattern so the plugin doesn't generate warnings
Former-commit-id: a0fea525832563b644bd2ebc0a6ae5a0fea525832563b644bd2ebc0a6ae521efc746352ebc0a6ae521efc746356a46acc274d4ecee9f39e78872a6ac7aae4fa2581bb316fbb1
2014-05-22 09:13:52 -05:00
Nate Jensen
e1789bdd8f
Merge "Omaha #3093 add hprof output for grid cached data." into omaha_14.4.1
...
Former-commit-id: bfc67a603648e05989c0dee7b221b2bfc67a603648e05989c0dee7b221b27350bd5f07dee7b221b27350bd5f0775d6272fcae15707fefd9f3e64da32c950d06758363f71d74f
2014-05-22 08:53:00 -05:00
Nate Jensen
d8aefff0a0
Merge "Omaha #3093 Add option to hprof tool to zero primitive arrays for compression." into omaha_14.4.1
...
Former-commit-id: e46beca6b72089860011339217ddb6e46beca6b72089860011339217ddb68a7f83e86e339217ddb68a7f83e86e690c8559e16d1ff3a394c80c08e292445dd1a0d4388837038c
2014-05-22 08:47:00 -05:00
Nate Jensen
4b6f97bece
Merge "Omaha #2913 Remove ability to create images from uengine." into omaha_14.4.1
...
Former-commit-id: 9e547e0273db3889a95574443038fc9e547e0273db3889a95574443038fc02108895f074443038fc02108895f0239231603caed63519e386d8f9cabb4a97c8c53be5e03c4f08
2014-05-22 08:45:16 -05:00
Brad Gonzales
8a5466edce
Omaha #3156 Removed geronimo servlet 2.5 jar from dependencies.txt and added it to rpms/awips2.qpid/0.18/SOURCES/awips2/.
...
Change-Id: I92c8380cdabcb1d4a8ced7fb5ff7d5add0708d82
Former-commit-id: b0e8fea5d27d84f97bf8165f9a6e45b0e8fea5d27d84f97bf8165f9a6e451dd2a8bf65165f9a6e451dd2a8bf652fa397951507aa2f5871de22cb1649a3a02dcc3a4599cb6e4a
2014-05-21 15:22:58 -05:00
Brian Clements
783f246203
Omaha #3179 added modes file deployment, moved modes.xml to new folder
...
Former-commit-id: f795b57f87a740a1370f952901624ff795b57f87a740a1370f952901624fe291a20abf952901624fe291a20abf34c5ce3d39935a9cdb8dde05d7c313d3aec6899d318397a353
2014-05-21 15:20:40 -05:00
Ben Steffensmeier
0f41447004
Omaha #3093 add hprof output for grid cached data.
...
Former-commit-id: 5ad982817068c8895ee3202321d8975ad982817068c8895ee3202321d897405eabac07202321d897405eabac076dff3cdf276fbadff061402693a5c41e0868826dca1d7cb08d
2014-05-21 14:48:45 -05:00
Ben Steffensmeier
aee8298e3c
Omaha #2913 Remove ability to create images from uengine.
...
Former-commit-id: c84ba8e188c134e4ebaaab739befecc84ba8e188c134e4ebaaab739befecb7d15aac22ab739befecb7d15aac22bb3093fb97784de8a81e0ebab2abb5d894a852e9ef3e243b48
2014-05-21 14:40:00 -05:00
Ben Steffensmeier
7b2b305edd
Omaha #3093 Add option to hprof tool to zero primitive arrays for compression.
...
Former-commit-id: 15c7e3bb2dede28797fd555494618615c7e3bb2dede28797fd5554946186df626099735554946186df62609973f23007e32b0e8bd044cfb165082aad2ddde07e7f4a08127782
2014-05-21 12:30:57 -05:00
Benjamin Phillippe
e8735e5b57
Omaha #3192 Fix broken build after CXF upgrade
...
Former-commit-id: d9fb9f74efe77c501f361ee8ceef1bd9fb9f74efe77c501f361ee8ceef1b930b5b96211ee8ceef1b930b5b9621c92fe2880c1441de90506c15b2c81eec9042bb70cf7e0967c7
2014-05-21 10:36:39 -05:00
Richard Peter
4bdd9aa874
Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
...
Former-commit-id: 4967854d11dcaedf5d43db4c6c8c224967854d11dcaedf5d43db4c6c8c22f19fda01addb4c6c8c22f19fda01ad1709bda0419faf57cf6802b136759b79a88d24ef680a584473
2014-05-20 17:14:29 -05:00
Brian Clements
20cb82cc98
Omaha #2536 merged edex.textdb into text plugins
...
Former-commit-id: c885bf9426c55124bcc75b5295e5adc885bf9426c55124bcc75b5295e5adda7d5888b05b5295e5adda7d5888b039ab0e1a08e4bb70cbe9003917f0ed30fb567666ebc9bfa351
2014-05-20 16:07:20 -05:00
Richard Peter
ed4d9a6467
Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
...
Former-commit-id: 9df96cc326ab3a7a280413ac6e83379df96cc326ab3a7a280413ac6e83372d4d89b3f013ac6e83372d4d89b3f074de8945c03264e7bd930b8c3e67a1580dd1ed1d6bccbaccd1
2014-05-20 14:56:44 -05:00
Nate Jensen
fe94471068
Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
...
Former-commit-id: 8dc368318677c77c6b8f1e408e70178dc368318677c77c6b8f1e408e7017966cf1f96f1e408e7017966cf1f96f8f0913851feb086ff46188aa9471e195ed06119c9d1afa6876
2014-05-20 14:51:05 -05:00
Nate Jensen
4b8b0082f3
Merge "Omaha #2913 Remove dead code using JAI" into omaha_14.4.1
...
Former-commit-id: 136ff2254b9f2dad41044fe2982f39136ff2254b9f2dad41044fe2982f3927560965ac4fe2982f3927560965ac1573a87550c11cb6f202019864ca325e095e0cde4fa11092b9
2014-05-20 14:49:35 -05:00
Brad Gonzales
ad3caf4a8f
Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
...
Amend: updated manifest.
Removed static imports.
Refactored String constants to Pattern constants in TafConstants.
Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
fixed .project. Updated yet more Patterns.
Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc
Former-commit-id: 35afb44d4bc4890beb966b0e578fc135afb44d4bc4890beb966b0e578fc1e560ce48806b0e578fc1e560ce48803a75e82e7a6825727400e2412ecb43fea1c9febe26953a7864
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
7d9d7e3b8a
Omaha #2913 Remove dead code using JAI
...
Former-commit-id: f010aa30b459a108822ed5d3f5605af010aa30b459a108822ed5d3f5605ad48333444cd5d3f5605ad48333444ce34301d284a56f47507698ad1b079e4b940cb59958e5704651
2014-05-20 13:36:15 -05:00
Ron Anderson
6fa737a051
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
...
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: 0e02e83629b794dd04e13b404f40830e02e83629b794dd04e13b404f4083809548b2833b404f4083809548b283f80e9822d5fd6e80dd27029201d4b93f20fc86df31da20ef5b
2014-05-20 11:10:26 -05:00
Brian Clements
0f25e9985e
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 83654c374a455af3612fb77450393183654c374a455af3612fb7745039318dce7e9b85b7745039318dce7e9b8599aa4f0609c4447fc6c44078bbaa63213aab834ff0ce9a6ca8
2014-05-20 11:04:57 -05:00
Bryan Kowal
f60d0ff125
Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version.
...
amend: remove debug code
Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3
Former-commit-id: 2ed7be0b505ca6dfbf90c6518e73782ed7be0b505ca6dfbf90c6518e737876cd1c2ac8c6518e737876cd1c2ac83da0250e225f438c4a08b6baecf271112cca8b8a72c92e6571
2014-05-20 11:02:31 -05:00
Benjamin Phillippe
47908e5586
Omaha #3192 Code fix related to upgrade of CXF to 2.7.10
...
Former-commit-id: afe9235d33619601891a319a4a3cacafe9235d33619601891a319a4a3cac43423e38dc319a4a3cac43423e38dcef67f5b9e76c0bdb06a6c7c3056d092921e13eabe79ec56394
2014-05-20 10:33:22 -05:00
Nate Jensen
cb5a4c33a7
Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
...
Former-commit-id: 8adbef2eb1f3f64b1e5a8d7125544b8adbef2eb1f3f64b1e5a8d7125544beff69410eb8d7125544beff69410eba443660d7dcc8ba319817def9ead8e1b18fd4584508d1a8224
2014-05-19 16:21:37 -05:00
Richard Peter
877097044b
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
...
Former-commit-id: 48236cfcee80a5f2fc1b40b7623c8748236cfcee80a5f2fc1b40b7623c8787da8bd95240b7623c8787da8bd952fb6f0d55cbc799f78f5d8baf8972971776389eb769fea4c8b3
2014-05-19 16:07:51 -05:00
Brian Clements
738a2c4513
Omaha #3180 fixed inviting strangers and multiple users in collaboration
...
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited
Former-commit-id: 5bf4c253f6b5e961d6b40e18d45bdf5bf4c253f6b5e961d6b40e18d45bdf573ffcb0bf0e18d45bdf573ffcb0bfbb827663c36769aff618e4433c5e103c6a10e154008c911f03
2014-05-19 15:54:36 -05:00
Brian Clements
9efe6030ad
Omaha #2536 fix text-request spring file
...
Former-commit-id: aa51a7559d5032c80d8221723fca36aa51a7559d5032c80d8221723fca36f47d49d5dd21723fca36f47d49d5ddea774be0df6eb1113239d3c896bb8ff0a8c8ca081645c509e8
2014-05-19 15:23:25 -05:00
Ben Steffensmeier
b43c70b8c9
Omaha #3133 remove topo from alertviz feature.
...
Former-commit-id: a0ee307eaac4f9bab99924b879764fa0ee307eaac4f9bab99924b879764f31c323151c24b879764f31c323151c993d4eef8587118964b168aba0cdd50e0229c560eeebf5ae7b
2014-05-19 14:21:23 -05:00
Nate Jensen
f82739a56a
Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1
...
Former-commit-id: 2213e727a59996d6731776bfba59452213e727a59996d6731776bfba594594d032dbc476bfba594594d032dbc464bbc05d596fb3e37a2965ecb7e926423bf2f21f80b9e5ee6b
2014-05-19 13:36:26 -05:00
David Gillingham
d6103a9ff1
Omaha #3157 : Refactor TPCWatchSrv, SPCWatchSrv, and WCLWatchSrv to correctly handle multiple active GFE sites. Update active table code to allow multiple configured SPC and TPC sites from VTECPartners.py.
...
Change-Id: Ie7565f0932054477580baf7e06e26357916fd746
Former-commit-id: ca29043593137dbb978304557f3854ca29043593137dbb978304557f38541f1db083ca04557f38541f1db083caaa1ecf1c3d76496a18cb0de24e8a4406d487fd52ca1e1d19cb
2014-05-19 12:50:10 -05:00
Richard Peter
90321f45b8
Merge "Omaha #2782 : Fix DD logging." into omaha_14.4.1
...
Former-commit-id: 5308b3b4a7c9c1a21d215040a608835308b3b4a7c9c1a21d215040a60883d1a6be50115040a60883d1a6be50116a2067121522c6494eb6b5e201e00830a62144c2f2d7ad8575
2014-05-19 12:47:56 -05:00
Richard Peter
9e8e1f32e0
Issue #2726 : Fix route start up order race condition
...
Change-Id: I3461f3e7c79ba099eb6c3eafa5b0345aa0fbf585
Former-commit-id: 27f56c3f3674f1c41e6817b07813ba27f56c3f3674f1c41e6817b07813ba974303044a17b07813ba974303044a1632ebe79a696cf7e8c68d3e897cb577b7ad1a7ef56a989679
2014-05-19 12:43:56 -05:00
Nate Jensen
2b48210526
Merge "Omaha #3133 remove org.apache.mina from radar server" into omaha_14.4.1
...
Former-commit-id: 2b954429b4ce2252c1772c813b09bf2b954429b4ce2252c1772c813b09bfbc7a46f7e72c813b09bfbc7a46f7e77962394c80e4a17f999aeee87188e4e1cd5b853d3464072389
2014-05-19 12:42:07 -05:00
Richard Peter
410ca58f47
Omaha #2782 : Fix DD logging.
...
Change-Id: Id377941213f50ab2ea6f0c1e72a64579d126b168
Former-commit-id: 1a8b6a54107fb6487460685ba4c0c51a8b6a54107fb6487460685ba4c0c5b7e630bda7685ba4c0c5b7e630bda731e13940de0bdf468942209e0763852bdb31d0972244c1ef03
2014-05-19 12:41:09 -05:00
Shawn Hooper
14897ec277
Merge "Revert "ASM #512 - Need radar data watchdog functionality"" into asm_14.3.1
...
Former-commit-id: 30173aa114476c78a2d7189e3cc1f230173aa114476c78a2d7189e3cc1f2342398e6a3189e3cc1f2342398e6a3b4b991322e32ca0c8d1c5a8f0dbd693ea1e218e79edb54c13a
2014-05-19 12:18:46 -05:00
Richard Peter
cad8249e2c
Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
...
Former-commit-id: 5e9b10b8bf1e9c2b27b60f9015e8245e9b10b8bf1e9c2b27b60f9015e8240480bfa4780f9015e8240480bfa4785a2f5b67adf3e7d16402802a043085fa926cd5158a71079141
2014-05-19 12:12:05 -05:00
Nate Jensen
063cd0d83b
Omaha #3133 remove org.apache.mina from radar server
...
Change-Id: I62e71f4766cb84c5dfc923a52ae8ced97798a089
Former-commit-id: 968d4828e39b9338a23f3de37239b4968d4828e39b9338a23f3de37239b44294684ec63de37239b44294684ec63e014a14975da01d7f7e40714c922604692e46e2b5ed8c1960
2014-05-19 11:50:11 -05:00
Nate Jensen
47def6ec0f
Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1
...
Former-commit-id: 6acbf3b921b93e410f60cb6ef0e9a36acbf3b921b93e410f60cb6ef0e9a3d79ef53ad0cb6ef0e9a3d79ef53ad072f76d8ab8c5d944c52f8a31eaf6e10bc127a4e9b7f846ac6d
2014-05-19 11:46:10 -05:00
Shawn Hooper
6e9bc30bd9
Revert "ASM #512 - Need radar data watchdog functionality"
...
This reverts commit e4559309601c5d4a3096c42cd56f1d3167c0fd0e [formerly 7e036b2bbcd74a7c54600c8c5ef7289988804887d74a7c54600c8c5ef72899888048877e036b2bbc99888048873f8ffcfaaf28660769ec4a4ca91f693f8ffcfaaf28660769ec4a4ca91f6920541c39ca4a4ca91f6920541c39cac476d35ad000df339111beb73c09f3e6e4ba572d06f37867ea
2014-05-19 11:27:43 -05:00
Brian Clements
8314a7e231
Omaha #2536 merged uf.edex.textdbsrv into text plugins
...
split into uf.common.dataplugin.text and uf.edex.plugin.text
Former-commit-id: 1d1f0ae9aa4d40a98ad7a06d332ff41d1f0ae9aa4d40a98ad7a06d332ff42f5cffbe15a06d332ff42f5cffbe1509827edcad7761b741128ddae2fc54f61d1ac976de232ae55c
2014-05-19 10:53:37 -05:00
Ben Steffensmeier
e356891ae3
Omaha #3164 Disable thin client request compression when it doesn't work.
...
Former-commit-id: cc0f87de86d697592de2ccf53a4c99cc0f87de86d697592de2ccf53a4c9925f901a102ccf53a4c9925f901a10243ed1dafb49ddc32ee057f46683fb092f4c86dacc85c8b6283
2014-05-19 10:40:50 -05:00
brian.dyke
5c9495ee04
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 4d161aaf909626317825011d121e4b4d161aaf909626317825011d121e4b58683ad040011d121e4b58683ad040a2add518802e105c1d5dbc4649765ab42011fc76b2e3c50ec0
2014-05-19 09:45:37 -04:00
Ben Steffensmeier
696731cf74
Omaha #3163 Remove all references to WORD_WRAP in A2 plugins.
...
Former-commit-id: acf070aa0c6a3d5f869e885448b04dacf070aa0c6a3d5f869e885448b04da52718783a885448b04da52718783a242f8e6c8b5607277ae268244ce2d7405e99e4ceeabe045d36
2014-05-16 14:40:50 -05:00
Ben Steffensmeier
24156d4084
Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore.
...
Former-commit-id: f5f6b5a31f01379cd329748ecc5facf5f6b5a31f01379cd329748ecc5fac8446ace149748ecc5fac8446ace1490f7ba1afa52e88a0b80082d9c403d2353b7c4090c347188e0a
2014-05-16 13:36:31 -05:00
