Commit graph

5374 commits

Author SHA1 Message Date
Steve Harris
0c2c5ad4bd Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: a2318f04eea89a258400dea526daa4fe67b69271
2014-03-17 15:55:41 -05:00
Steve Harris
24fe6a248f Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 543090e28936ce680e21cda802cfac73ff31ca58
2014-03-17 15:53:31 -05:00
Dave Hladky
373f052de8 Issue #2904 Nullpointer potential in MesoTabular product.
Former-commit-id: e3139396104ee0d4ffc1dea7fd20782d00eb5ade
2014-03-17 15:22:42 -05:00
Matthew Howard
1d15cda9fd Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
Former-commit-id: 1b46d5c169709a9498a5eb9963286a6223089af4
2014-03-14 19:47:32 -05:00
Nate Jensen
9cf43e7de6 Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: 131d45e260ab446e9764d0fcc1f542ef012ff352
2014-03-14 14:14:37 -05:00
Rici.Yu
58f9857344 ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: cfb3459d6314afa396c89b90bf42ab539fd15d8c
2014-03-14 14:39:56 -04:00
Brian.Dyke
9c412e444e Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 0ea874227f20f9f7fe19fc8371e10711023c3f53
2014-03-14 11:13:30 -04:00
Ron Anderson
6e6570fd5a Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled.
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc

Former-commit-id: efc59e6541342bfc3e826934e4a9a5d85dc2801b
2014-03-14 10:11:00 -05:00
Brian.Dyke
30084d7f84 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 39f4506422c590b7520957923a5b00fd16aa19d0
2014-03-14 10:15:53 -04:00
Brian.Dyke
f999e48df0 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 3605f0373a6ce7b417d942991e50029c2d0c964b
2014-03-14 08:44:39 -04:00
Brian.Dyke
bc6a7bf946 OB_14.1.1-23 baseline
Former-commit-id: b3292d88eee345fca27d9ca645ec2686d0114e5c
2014-03-14 08:18:16 -04:00
Ron Anderson
107daf22ae Issue #2908 Update org.apache.commons.pool to 1.5.4. Change GeoTools to use the separate org.apache.commons projects that are in the baseline.
Change-Id: I05de2eaadc2766a8a0deee6ac816f29119800774

Former-commit-id: 60ace911a0b1496d3bb74a85ff3c6b89ca70c267
2014-03-13 18:01:22 -05:00
Bryan Kowal
6ba13b2b44 Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
Former-commit-id: 5f0d983aa7cd428d532aa3b418eaddf21e31718a
2014-03-13 17:39:32 -05:00
Kevin P. Johnson
4c833d3389 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: fad7cf2e6661aa0bcc9c37499e0560b708f192f0
2014-03-13 20:42:12 +00:00
Nate Jensen
42649882fa Merge "Issue #2718 Fix org.geotools version in common.base.feature/feature.xml" into development
Former-commit-id: 63bab83be86d4ad70569187e7948c230819f8b7d
2014-03-13 12:58:10 -05:00
Ron Anderson
dcb7b9c88f Issue #2718 Fix org.geotools version in common.base.feature/feature.xml
Change-Id: I2e435e5cc7e3a65c116b3ca3ba3bd4f6c736082d

Former-commit-id: 98ca1d990e02bd70dacca7c951bf0212f93bdccc
2014-03-13 12:54:44 -05:00
Nate Jensen
befff7be3a Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development
Former-commit-id: a221c18b0195cb5b8dd284c4f3ef1266a8efd999
2014-03-13 12:41:14 -05:00
Nate Jensen
cc1cb28eed Issue #2907 split edex.redbook plugin into common and edex redbook plugins
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe

Former-commit-id: 62923fbae80131fab6256923bc32bc46e46940ba
2014-03-13 12:23:35 -05:00
Ron Anderson
dd8bfdf941 Issue #2909 Remove useLegacyMergeSort java parameter
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: 3aeb50672f8de7b973f234e0ab351416cbf7670b
2014-03-13 11:54:15 -05:00
Nate Jensen
27625eb93a Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development
Former-commit-id: ee5c599bf4822f73e488e42240c5794189e2d70f
2014-03-13 11:16:00 -05:00
Ron Anderson
bcfaf40ebf Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: efc65ad66fc4df90319f821f289e13dc9dbeb3a0
2014-03-13 11:11:53 -05:00
Nate Jensen
8ac509f37f Merge "Issue #2898 Fix recycling of best res resource." into development
Former-commit-id: 274b83f84f4bdda381c450b0853711564cae65a6
2014-03-13 10:14:58 -05:00
Ben Steffensmeier
d115db1a66 Issue #2898 Fix recycling of best res resource.
Former-commit-id: 1693e5e369a199dd2a824815e0c3e638fc7b0be3
2014-03-12 18:05:10 -05:00
Nate Jensen
f8180587d4 Merge "Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean." into development
Former-commit-id: b723095f6d5d59b67370c7292f88f339d349993a
2014-03-12 16:05:19 -05:00
Nate Jensen
3dd9c9bffb Merge "Issue #2871 Clean up ECMWF bundles." into development
Former-commit-id: 86e55d14186870cc44f7d0a81e56f2175c66f1df
2014-03-12 15:35:21 -05:00
Ben Steffensmeier
75120a09cd Issue #2528 Fix satellite units/style.
Former-commit-id: 7e38454a31aa55c606c155a108253c0433ecb517
2014-03-12 14:19:49 -05:00
Juliya Dynina
b296595184 Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2
Former-commit-id: f28ab35657154bb028f3ca710ccc0b42d7c04b70
2014-03-12 11:36:38 -05:00
Richard Peter
6cf5eb346a Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development
Former-commit-id: 50e64a8948daed61e4c9422ef33732a018468e2a
2014-03-12 11:21:06 -05:00
Mike Duff
b434ab5bb3 Issue #2858 - Implement NDM menus for ncep/hydro SPC
Peer review comments

Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5

Former-commit-id: a74573fef8cc09ed15341d9873ae1dd2ba561478
2014-03-12 11:19:18 -05:00
Ben Steffensmeier
fe55c49373 Issue #2871 Clean up ECMWF bundles.
Former-commit-id: 5eb5f909c575205e3a261c3cce7ef7b05a57dd22
2014-03-12 11:16:42 -05:00
Nate Jensen
10a2e5c602 Merge "Issue #2827 fixed collab dataserver returning empty body with 200" into development
Former-commit-id: 190b1ef82b04ee7b0787f05fc4bb4a356b2a9903
2014-03-12 10:59:42 -05:00
Mike Duff
e01c5c3534 Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean.
Change-Id: I533e0831529038cb4205e38e706369ca74f4f824

Former-commit-id: 13f134bafc5331939e23ce0e14d350593bb7c2e1
2014-03-12 10:52:18 -05:00
Nate Jensen
c5647be7e0 Merge "Issue #2702 Updated openfire version in component spec." into development
Former-commit-id: 2b8374ea8be4b36e3c6276ced6938a3e97c42201
2014-03-12 10:02:42 -05:00
Richard Peter
7ebbc0cf78 Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 3f0cf9200a42adb2bd7dbd70e50642e940d6b822
2014-03-12 09:47:29 -05:00
Brad Gonzales
bf0d052043 Issue #2702 Updated openfire version in component spec.
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498

Former-commit-id: 276c38754b7f917c229750ce06d387a8b63245d4
2014-03-12 08:48:36 -05:00
Brian Clements
d44c55e976 Issue #2827 fixed collab dataserver returning empty body with 200
we check if a file exists in and out of the lock when reading
if the file is deleted between checks, the inner check attempts to return an error
we had already access the output stream from the response object so it is committed to 200
fixed by waiting to get the output stream until after the second check


Former-commit-id: 31c42d161146b0367435c66535d4da700a572f24
2014-03-12 08:27:22 -05:00
Greg Armendariz
6acf5fefcc Merge "Issue #2851 - initial 64-bit build of the bignsharp DLL" into development
Former-commit-id: 5346beaf24ad66cfffab9e115c8d22b4c2fe2f95
2014-03-11 19:56:55 -05:00
Lee Venable
36f72f23dc Merge "Issue #2865 - added more null and dispose checks" into development
Former-commit-id: 5c21cbb43cda9274a77b2358749ba53b397ef0e1
2014-03-11 17:43:48 -05:00
Nate Jensen
249d0f3ded Merge "Issue #2791 Fix fill value filter." into development
Former-commit-id: 871280fb9fac9b09908243b1753abb087b204f23
2014-03-11 17:33:54 -05:00
Ben Steffensmeier
1a45efe2a5 Issue #2791 Fix fill value filter.
Former-commit-id: e845b829ba4518ac41f0ac26c22c3d83a5504375
2014-03-11 17:27:26 -05:00
Bryan Kowal
438e594868 Issue #2851 - initial 64-bit build of the bignsharp DLL
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll: PE32 executable for MS Windows (DLL) (console) Intel 80386 32-bit
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll: PE32+ executable for MS Windows (DLL) (console) Mono/.Net assembly

Amend: update Java version and Plugin version

Change-Id: I377e8b51eb9d7fd9964092040d1bcde3f9bcfd27

Former-commit-id: 3189f870d55219372438213441fd1359a6bb5cc4
2014-03-11 16:47:11 -05:00
Richard Peter
f59d1433db Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: 555358125bfb925a2c8ed0d393911b4d045d18b1
2014-03-11 16:43:37 -05:00
Lee Venable
1f9d1af221 Issue #2865 - added more null and dispose checks
Former-commit-id: c2aa1d021c49e522a3b4a9dd17a55317a13e91e1
2014-03-11 16:30:33 -05:00
Dave Hladky
76e216d319 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: 31a35e35b75bc9e6efc43af1da0b184c1828ff45
2014-03-11 15:53:59 -05:00
Loubna.Bousaidi
ce2bea0a04 ASM #380 - Hydro--TimeSeries:error thrown when click Table button
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: d2161a0fdd0bad7f8266a8b30659021edecaa549
2014-03-11 18:58:26 +00:00
Nate Jensen
a1bf3e9874 Merge "Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory. Added a -buildRPM target to build.sh to build a specific RPM." into development
Former-commit-id: 8d4e32df3a8374e571a3a9d3994e45ea825c418f
2014-03-11 12:35:53 -05:00
Nate Jensen
afbdf6962c Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
Former-commit-id: d463531d4cf3bce8862ce1c29b12e9a594d8c63b
2014-03-11 12:35:44 -05:00
David Gillingham
187196b519 Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7
2014-03-11 11:54:25 -05:00
Nate Jensen
4ee98a10cd Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development
Former-commit-id: 22518ce352166afc70950d631b5df8cbcc063a3d
2014-03-11 11:30:27 -05:00
Brad Gonzales
48b6c75bb3 Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work
with openfire 3.9.1.  Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.

Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a

Former-commit-id: 606b269f39ed58e855d9fcba2487fccbaac3c28c
2014-03-11 11:27:44 -05:00