xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6107 commits 31 branches 40 tags 3.8 GiB
Commit graph

6107 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ron Anderson
307f61e609 Issue #3194 Fix GeoTIFF import 
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a

Former-commit-id: a8ba16fc93 [formerly 52931af5ce] [formerly a8ba16fc93 [formerly 52931af5ce] [formerly 2a680b73ea [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]]
Former-commit-id: 2a680b73ea
Former-commit-id: 8f0eb1fd10 [formerly b7338080e2]
Former-commit-id: 0d54a37b6c
 2014-05-22 09:53:47 -05:00
Brian Clements
1bb316fbb1 Omaha #2733 restored geomag distribution registration 
added placeholder pattern so the plugin doesn't generate warnings


Former-commit-id: 2563b644bd [formerly 2ebc0a6ae5] [formerly 2563b644bd [formerly 2ebc0a6ae5] [formerly 21efc74635 [formerly fa73924a9c98705d00e6b68203e0cbe418e4cf01]]]
Former-commit-id: 21efc74635
Former-commit-id: d4ecee9f39 [formerly e78872a6ac]
Former-commit-id: 7aae4fa258
 2014-05-22 09:13:52 -05:00
Nate Jensen
363f71d74f Merge "Omaha #3093 add hprof output for grid cached data." into omaha_14.4.1 
Former-commit-id: 48e05989c0 [formerly dee7b221b2] [formerly 48e05989c0 [formerly dee7b221b2] [formerly 7350bd5f07 [formerly 83e3d888511ec9f99fc534175314ecf5e054f725]]]
Former-commit-id: 7350bd5f07
Former-commit-id: e15707fefd [formerly 9f3e64da32]
Former-commit-id: c950d06758
 2014-05-22 08:53:00 -05:00
Nate Jensen
388837038c Merge "Omaha #3093 Add option to hprof tool to zero primitive arrays for compression." into omaha_14.4.1 
Former-commit-id: 2089860011 [formerly 339217ddb6] [formerly 2089860011 [formerly 339217ddb6] [formerly 8a7f83e86e [formerly e385a0bb73510e3d1d366073976a05a74444e2c5]]]
Former-commit-id: 8a7f83e86e
Former-commit-id: 6d1ff3a394 [formerly c80c08e292]
Former-commit-id: 445dd1a0d4
 2014-05-22 08:47:00 -05:00
Nate Jensen
e5e03c4f08 Merge "Omaha #2913 Remove ability to create images from uengine." into omaha_14.4.1 
Former-commit-id: db3889a955 [formerly 74443038fc] [formerly db3889a955 [formerly 74443038fc] [formerly 02108895f0 [formerly feb218207bc20ba7cab026379e2ef0d2c0efb58c]]]
Former-commit-id: 02108895f0
Former-commit-id: aed63519e3 [formerly 86d8f9cabb]
Former-commit-id: 4a97c8c53b
 2014-05-22 08:45:16 -05:00
Matthew Howard
bcae526dc8 Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1 
Former-commit-id: 00e44aada9 [formerly 95b9746871] [formerly 00e44aada9 [formerly 95b9746871] [formerly e17f8a0082 [formerly 5893d06b990cec295338595b006a45bb762b4b73]]]
Former-commit-id: e17f8a0082
Former-commit-id: 56a231e0b0 [formerly 725fff1b13]
Former-commit-id: eb700ea256
 2014-05-22 07:50:50 -05:00
Brad Gonzales
4599cb6e4a 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: 7d84f97bf8 [formerly 165f9a6e45] [formerly 7d84f97bf8 [formerly 165f9a6e45] [formerly 1dd2a8bf65 [formerly 71e43fad4acee381d7ffb7ca8ba0438283cd99f6]]]
Former-commit-id: 1dd2a8bf65
Former-commit-id: 07aa2f5871 [formerly de22cb1649]
Former-commit-id: a3a02dcc3a
 2014-05-21 15:22:58 -05:00
Brian Clements
318397a353 Omaha #3179 added modes file deployment, moved modes.xml to new folder 
Former-commit-id: a740a1370f [formerly 952901624f] [formerly a740a1370f [formerly 952901624f] [formerly e291a20abf [formerly fd8a4b49641aaf70c49608215d15209330dee669]]]
Former-commit-id: e291a20abf
Former-commit-id: 935a9cdb8d [formerly de05d7c313]
Former-commit-id: d3aec6899d
 2014-05-21 15:20:40 -05:00
Ben Steffensmeier
ca1d7cb08d Omaha #3093 add hprof output for grid cached data. 
Former-commit-id: 68c8895ee3 [formerly 202321d897] [formerly 68c8895ee3 [formerly 202321d897] [formerly 405eabac07 [formerly d509822129823efcdf67dd9c028bc72af99b1039]]]
Former-commit-id: 405eabac07
Former-commit-id: 6fbadff061 [formerly 402693a5c4]
Former-commit-id: 1e0868826d
 2014-05-21 14:48:45 -05:00
Ben Steffensmeier
ef3e243b48 Omaha #2913 Remove ability to create images from uengine. 
Former-commit-id: c134e4ebaa [formerly ab739befec] [formerly c134e4ebaa [formerly ab739befec] [formerly b7d15aac22 [formerly f843fb4cdd78f4f847f0a2d45fe78106af88b3b4]]]
Former-commit-id: b7d15aac22
Former-commit-id: 784de8a81e [formerly 0ebab2abb5]
Former-commit-id: d894a852e9
 2014-05-21 14:40:00 -05:00
Ben Steffensmeier
4a08127782 Omaha #3093 Add option to hprof tool to zero primitive arrays for compression. 
Former-commit-id: ede28797fd [formerly 5554946186] [formerly ede28797fd [formerly 5554946186] [formerly df62609973 [formerly 6a80964572cf331b433ae8dc222ac209dd35bf63]]]
Former-commit-id: df62609973
Former-commit-id: 0e8bd044cf [formerly b165082aad]
Former-commit-id: 2ddde07e7f
 2014-05-21 12:30:57 -05:00
Benjamin Phillippe
cf7e0967c7 Omaha #3192 Fix broken build after CXF upgrade 
Former-commit-id: e77c501f36 [formerly 1ee8ceef1b] [formerly e77c501f36 [formerly 1ee8ceef1b] [formerly 930b5b9621 [formerly 8a1b9ed7d11aebed7c76b9701f236eaa150d0562]]]
Former-commit-id: 930b5b9621
Former-commit-id: 1441de9050 [formerly 6c15b2c81e]
Former-commit-id: ec9042bb70
 2014-05-21 10:36:39 -05:00
Zhidong.Hao
1b25474707 ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button 
Change-Id: I764436168339ce46ab01b27c9078455e6a543176

Former-commit-id: 2773af6884 [formerly bcdb0dba95] [formerly 2773af6884 [formerly bcdb0dba95] [formerly 77ac5458d0 [formerly d4be1e866c561717a9a7697b3ff451efdd184fe6]]]
Former-commit-id: 77ac5458d0
Former-commit-id: b529afd928 [formerly a65061a58f]
Former-commit-id: 17a525443c
 2014-05-21 09:15:41 -04:00
Richard Peter
680a584473 Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1 
Former-commit-id: dcaedf5d43 [formerly db4c6c8c22] [formerly dcaedf5d43 [formerly db4c6c8c22] [formerly f19fda01ad [formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]]]
Former-commit-id: f19fda01ad
Former-commit-id: 9faf57cf68 [formerly 02b136759b]
Former-commit-id: 79a88d24ef
 2014-05-20 17:14:29 -05:00
Brian Clements
ebc9bfa351 Omaha #2536 merged edex.textdb into text plugins 
Former-commit-id: c55124bcc7 [formerly 5b5295e5ad] [formerly c55124bcc7 [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]
Former-commit-id: da7d5888b0
Former-commit-id: e4bb70cbe9 [formerly 003917f0ed]
Former-commit-id: 30fb567666
 2014-05-20 16:07:20 -05:00
Richard Peter
6bccbaccd1 Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1 
Former-commit-id: ab3a7a2804 [formerly 13ac6e8337] [formerly ab3a7a2804 [formerly 13ac6e8337] [formerly 2d4d89b3f0 [formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]]]
Former-commit-id: 2d4d89b3f0
Former-commit-id: 3264e7bd93 [formerly 0b8c3e67a1]
Former-commit-id: 580dd1ed1d
 2014-05-20 14:56:44 -05:00
Nate Jensen
9d1afa6876 Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1 
Former-commit-id: 77c77c6b8f [formerly 1e408e7017] [formerly 77c77c6b8f [formerly 1e408e7017] [formerly 966cf1f96f [formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]]]
Former-commit-id: 966cf1f96f
Former-commit-id: eb086ff461 [formerly 88aa9471e1]
Former-commit-id: 95ed06119c
 2014-05-20 14:51:05 -05:00
Nate Jensen
4fa11092b9 Merge "Omaha #2913 Remove dead code using JAI" into omaha_14.4.1 
Former-commit-id: 9f2dad4104 [formerly 4fe2982f39] [formerly 9f2dad4104 [formerly 4fe2982f39] [formerly 27560965ac [formerly dce3936281178cbb211441edd23feef1cb321be5]]]
Former-commit-id: 27560965ac
Former-commit-id: c11cb6f202 [formerly 019864ca32]
Former-commit-id: 5e095e0cde
 2014-05-20 14:49:35 -05:00
Brad Gonzales
26953a7864 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: c4890beb96 [formerly 6b0e578fc1] [formerly c4890beb96 [formerly 6b0e578fc1] [formerly e560ce4880 [formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]]]
Former-commit-id: e560ce4880
Former-commit-id: 6825727400 [formerly e2412ecb43]
Former-commit-id: fea1c9febe
 2014-05-20 14:13:18 -05:00
Ben Steffensmeier
58e5704651 Omaha #2913 Remove dead code using JAI 
Former-commit-id: 59a108822e [formerly d5d3f5605a] [formerly 59a108822e [formerly d5d3f5605a] [formerly d48333444c [formerly 767fc083618827ad06beff9f6728ea9dd42528f6]]]
Former-commit-id: d48333444c
Former-commit-id: a56f475076 [formerly 98ad1b079e]
Former-commit-id: 4b940cb599
 2014-05-20 13:36:15 -05:00
Brian.Dyke
b0b377e811 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java

Former-commit-id: 822ad181bf [formerly 2fd18d14d6] [formerly 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]
Former-commit-id: db68b80bbd
Former-commit-id: 937b9bb9ce [formerly ebcaebb28d]
Former-commit-id: f42d40c3a3
 2014-05-20 14:35:34 -04:00
Ron Anderson
31da20ef5b Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update 
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465

Former-commit-id: b794dd04e1 [formerly 3b404f4083] [formerly b794dd04e1 [formerly 3b404f4083] [formerly 809548b283 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]]
Former-commit-id: 809548b283
Former-commit-id: fd6e80dd27 [formerly 029201d4b9]
Former-commit-id: 3f20fc86df
 2014-05-20 11:10:26 -05:00
Brian.Dyke
774897735a Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1 
Former-commit-id: 88a5ecefaa [formerly e5f951bf89] [formerly 88a5ecefaa [formerly e5f951bf89] [formerly 8c2cccb930 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]
Former-commit-id: 8c2cccb930
Former-commit-id: bb2089f2df [formerly 89d2843610]
Former-commit-id: fe658cb381
 2014-05-20 12:08:29 -04:00
Brian Clements
f0ce9a6ca8 Omaha #3172 fixed ui filtering for contacts and sessions 
Former-commit-id: 455af3612f [formerly b774503931] [formerly 455af3612f [formerly b774503931] [formerly 8dce7e9b85 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: c4447fc6c4 [formerly 4078bbaa63]
Former-commit-id: 213aab834f
 2014-05-20 11:04:57 -05:00
Bryan Kowal
72c92e6571 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: 5ca6dfbf90 [formerly c6518e7378] [formerly 5ca6dfbf90 [formerly c6518e7378] [formerly 76cd1c2ac8 [formerly 9ad4422eb9911f8fbf0c5db40103ee8a1d925570]]]
Former-commit-id: 76cd1c2ac8
Former-commit-id: 5f438c4a08 [formerly b6baecf271]
Former-commit-id: 112cca8b8a
 2014-05-20 11:02:31 -05:00
Brian.Dyke
5d6603320b CM-MERGE:OB13.5.5-9 into 14.1.2 
Former-commit-id: 8435ace4f8 [formerly 545e7f6ce9] [formerly 8435ace4f8 [formerly 545e7f6ce9] [formerly abf0f995cd [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]
Former-commit-id: abf0f995cd
Former-commit-id: 9af8951a2a [formerly fa13621d8e]
Former-commit-id: 0f5964b03f
 2014-05-20 11:56:30 -04:00
Benjamin Phillippe
e79ec56394 Omaha #3192 Code fix related to upgrade of CXF to 2.7.10 
Former-commit-id: 619601891a [formerly 319a4a3cac] [formerly 619601891a [formerly 319a4a3cac] [formerly 43423e38dc [formerly 4befa5f83ac0a9340a4b146953102a7e2f90f1b1]]]
Former-commit-id: 43423e38dc
Former-commit-id: 6c0bdb06a6 [formerly c7c3056d09]
Former-commit-id: 2921e13eab
 2014-05-20 10:33:22 -05:00
Nate Jensen
508d1a8224 Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1 
Former-commit-id: f3f64b1e5a [formerly 8d7125544b] [formerly f3f64b1e5a [formerly 8d7125544b] [formerly eff69410eb [formerly 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569]]]
Former-commit-id: eff69410eb
Former-commit-id: cc8ba31981 [formerly 7def9ead8e]
Former-commit-id: 1b18fd4584
 2014-05-19 16:21:37 -05:00
Richard Peter
69fea4c8b3 Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1 
Former-commit-id: 80a5f2fc1b [formerly 40b7623c87] [formerly 80a5f2fc1b [formerly 40b7623c87] [formerly 87da8bd952 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]]
Former-commit-id: 87da8bd952
Former-commit-id: c799f78f5d [formerly 8baf897297]
Former-commit-id: 1776389eb7
 2014-05-19 16:07:51 -05:00
Brian Clements
008c911f03 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: b5e961d6b4 [formerly 0e18d45bdf] [formerly b5e961d6b4 [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: 6769aff618 [formerly e4433c5e10]
Former-commit-id: 3c6a10e154
 2014-05-19 15:54:36 -05:00
Brian Clements
1645c509e8 Omaha #2536 fix text-request spring file 
Former-commit-id: 5032c80d82 [formerly 21723fca36] [formerly 5032c80d82 [formerly 21723fca36] [formerly f47d49d5dd [formerly 9e06d55f20798b7be657318a2b147a56539fd7ab]]]
Former-commit-id: f47d49d5dd
Former-commit-id: 6eb1113239 [formerly d3c896bb8f]
Former-commit-id: f0a8c8ca08
 2014-05-19 15:23:25 -05:00
Ben Steffensmeier
eeebf5ae7b Omaha #3133 remove topo from alertviz feature. 
Former-commit-id: c4f9bab999 [formerly 24b879764f] [formerly c4f9bab999 [formerly 24b879764f] [formerly 31c323151c [formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]]]
Former-commit-id: 31c323151c
Former-commit-id: 87118964b1 [formerly 68aba0cdd5]
Former-commit-id: 0e0229c560
 2014-05-19 14:21:23 -05:00
Nate Jensen
80b9e5ee6b 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: 9996d67317 [formerly 76bfba5945] [formerly 9996d67317 [formerly 76bfba5945] [formerly 94d032dbc4 [formerly 353d0ddca384a33fe529c0b920595a99c0f40548]]]
Former-commit-id: 94d032dbc4
Former-commit-id: 6fb3e37a29 [formerly 65ecb7e926]
Former-commit-id: 423bf2f21f
 2014-05-19 13:36:26 -05:00
Brian.Dyke
3d35be33cb Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1 
Former-commit-id: c4b7b8dd74 [formerly dbd3bb54e8] [formerly c4b7b8dd74 [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f2885c9996 [formerly f30bd7d9ae]
Former-commit-id: 39d8bd9004
 2014-05-19 14:07:04 -04:00
David Gillingham
ca1e1d19cb 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: 137dbb9783 [formerly 04557f3854] [formerly 137dbb9783 [formerly 04557f3854] [formerly 1f1db083ca [formerly 9185eea7409452fe004185dfa51d78f5adb656d4]]]
Former-commit-id: 1f1db083ca
Former-commit-id: 76496a18cb [formerly 0de24e8a44]
Former-commit-id: 06d487fd52
 2014-05-19 12:50:10 -05:00
Richard Peter
f2d7ad8575 Merge "Omaha #2782: Fix DD logging." into omaha_14.4.1 
Former-commit-id: c9c1a21d21 [formerly 5040a60883] [formerly c9c1a21d21 [formerly 5040a60883] [formerly d1a6be5011 [formerly 04b7ca1e76c3dbc402f3487806bf3d754533fbaa]]]
Former-commit-id: d1a6be5011
Former-commit-id: 22c6494eb6 [formerly b5e201e008]
Former-commit-id: 30a62144c2
 2014-05-19 12:47:56 -05:00
Richard Peter
f56a989679 Issue #2726: Fix route start up order race condition 
Change-Id: I3461f3e7c79ba099eb6c3eafa5b0345aa0fbf585

Former-commit-id: 74f1c41e68 [formerly 17b07813ba] [formerly 74f1c41e68 [formerly 17b07813ba] [formerly 974303044a [formerly 802f537f26d88d43811df7c97382f6082f79a391]]]
Former-commit-id: 974303044a
Former-commit-id: 696cf7e8c6 [formerly 8d3e897cb5]
Former-commit-id: 77b7ad1a7e
 2014-05-19 12:43:56 -05:00
Nate Jensen
3464072389 Merge "Omaha #3133 remove org.apache.mina from radar server" into omaha_14.4.1 
Former-commit-id: ce2252c177 [formerly 2c813b09bf] [formerly ce2252c177 [formerly 2c813b09bf] [formerly bc7a46f7e7 [formerly 35ab1fb83203c8ed275b12e7b4ce62bd2bf91ad6]]]
Former-commit-id: bc7a46f7e7
Former-commit-id: e4a17f999a [formerly eee87188e4]
Former-commit-id: e1cd5b853d
 2014-05-19 12:42:07 -05:00
Richard Peter
2244c1ef03 Omaha #2782: Fix DD logging. 
Change-Id: Id377941213f50ab2ea6f0c1e72a64579d126b168

Former-commit-id: 7fb6487460 [formerly 685ba4c0c5] [formerly 7fb6487460 [formerly 685ba4c0c5] [formerly b7e630bda7 [formerly b257c36bf2203e00e1f615a345b942987edfcf7a]]]
Former-commit-id: b7e630bda7
Former-commit-id: 0bdf468942 [formerly 209e076385]
Former-commit-id: 2bdb31d097
 2014-05-19 12:41:09 -05:00
Brian.Dyke
b65a3a3214 CM-MERGE:OB13.5.5-8 into 14.1.2 
Former-commit-id: 2eae2be646 [formerly b29db01a59] [formerly 2eae2be646 [formerly b29db01a59] [formerly 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]
Former-commit-id: 06c2478539
Former-commit-id: 3558d8f162 [formerly 9baa09f4bc]
Former-commit-id: c88e8d41b6
 2014-05-19 13:26:45 -04:00
Shawn Hooper
9edb54c13a Merge "Revert "ASM #512 - Need radar data watchdog functionality"" into asm_14.3.1 
Former-commit-id: 476c78a2d7 [formerly 189e3cc1f2] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]
Former-commit-id: 342398e6a3
Former-commit-id: 32ca0c8d1c [formerly 5a8f0dbd69]
Former-commit-id: 3ea1e218e7
 2014-05-19 12:18:46 -05:00
Richard Peter
8a71079141 Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1 
Former-commit-id: 1e9c2b27b6 [formerly 0f9015e824] [formerly 1e9c2b27b6 [formerly 0f9015e824] [formerly 0480bfa478 [formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]]]
Former-commit-id: 0480bfa478
Former-commit-id: f3e7d16402 [formerly 802a043085]
Former-commit-id: fa926cd515
 2014-05-19 12:12:05 -05:00
Nate Jensen
b5ed8c1960 Omaha #3133 remove org.apache.mina from radar server 
Change-Id: I62e71f4766cb84c5dfc923a52ae8ced97798a089

Former-commit-id: 9b9338a23f [formerly 3de37239b4] [formerly 9b9338a23f [formerly 3de37239b4] [formerly 4294684ec6 [formerly 8ef634c2c2d45313bcc7c973f101cab445900e24]]]
Former-commit-id: 4294684ec6
Former-commit-id: 5da01d7f7e [formerly 40714c9226]
Former-commit-id: 04692e46e2
 2014-05-19 11:50:11 -05:00
Nate Jensen
b7f846ac6d Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1 
Former-commit-id: b93e410f60 [formerly cb6ef0e9a3] [formerly b93e410f60 [formerly cb6ef0e9a3] [formerly d79ef53ad0 [formerly 6f3d40c96cafe8f0f05d539534607067a2a37776]]]
Former-commit-id: d79ef53ad0
Former-commit-id: c5d944c52f [formerly 8a31eaf6e1]
Former-commit-id: 0bc127a4e9
 2014-05-19 11:46:10 -05:00
Shawn Hooper
06f37867ea Revert "ASM #512 - Need radar data watchdog functionality" 
This reverts commit e4559309601c5d4a3096c42cd56f1d3167c0fd0e [formerly 7e036b2bbc] [formerly 0c8c5ef728 [formerly 9988804887] [formerly 0c8c5ef728 [formerly 9988804887] [formerly 7e036b2bbc [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]]].

Change-Id: I730af948f1d0cfcf2167524ea934ffc8a57ece87

Former-commit-id: 28660769ec [formerly 4a4ca91f69] [formerly 28660769ec [formerly 4a4ca91f69] [formerly 20541c39ca [formerly 75d287edfc717bb0d085a9723c417edbce035237]]]
Former-commit-id: 20541c39ca
Former-commit-id: 00df339111 [formerly beb73c09f3]
Former-commit-id: e6e4ba572d
 2014-05-19 11:27:43 -05:00
Brian Clements
de232ae55c Omaha #2536 merged uf.edex.textdbsrv into text plugins 
split into uf.common.dataplugin.text and uf.edex.plugin.text


Former-commit-id: 4d40a98ad7 [formerly a06d332ff4] [formerly 4d40a98ad7 [formerly a06d332ff4] [formerly 2f5cffbe15 [formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]]]
Former-commit-id: 2f5cffbe15
Former-commit-id: 7761b74112 [formerly 8ddae2fc54]
Former-commit-id: f61d1ac976
 2014-05-19 10:53:37 -05:00
Ben Steffensmeier
c85c8b6283 Omaha #3164 Disable thin client request compression when it doesn't work. 
Former-commit-id: d697592de2 [formerly ccf53a4c99] [formerly d697592de2 [formerly ccf53a4c99] [formerly 25f901a102 [formerly ce132a929437f18f531503701bb09e33261ae4c4]]]
Former-commit-id: 25f901a102
Former-commit-id: 9ddc32ee05 [formerly 7f46683fb0]
Former-commit-id: 92f4c86dac
 2014-05-19 10:40:50 -05:00
Gang.Zhang
7cd2402325 ASM #95 - Fix 0.0 for NO DATA Issue caused failed back. 
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac

Former-commit-id: 6e034005e0 [formerly 94fea6748f] [formerly 6e034005e0 [formerly 94fea6748f] [formerly 9c1587b92d [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]
Former-commit-id: 9c1587b92d
Former-commit-id: ec6053c3f7 [formerly baa1546e39]
Former-commit-id: b82d8bf6fb
 2014-05-19 15:40:41 +01:00
brian.dyke
b2e3c50ec0 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: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
 2014-05-19 09:45:37 -04:00
Brian.Dyke
eefa4dbf96 CM-MERGE:OB13.5.5-7 into 14.1.2 
Former-commit-id: 509616ba6a [formerly f8ed9c7944] [formerly 509616ba6a [formerly f8ed9c7944] [formerly e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]
Former-commit-id: e9bd17a21f
Former-commit-id: e563eb3376 [formerly 409a48b907]
Former-commit-id: acf4cbbd78
 2014-05-19 07:55:42 -04:00