Commit graph

5232 commits

Author SHA1 Message Date
Dave Hladky
1fdd0343e0 Issue #2904 Nullpointer potential in MesoTabular product.
Former-commit-id: 515d58dec7 [formerly b43bd1f861] [formerly 73d8618833] [formerly 515d58dec7 [formerly b43bd1f861] [formerly 73d8618833] [formerly 373f052de8 [formerly 73d8618833 [formerly e3139396104ee0d4ffc1dea7fd20782d00eb5ade]]]]
Former-commit-id: 373f052de8
Former-commit-id: c3cafc3e4e [formerly 2b841c55f6] [formerly b9db6e2f2b11d52e63d964ebd1d02a19300d2170 [formerly 4c2bbde8f1]]
Former-commit-id: e82697c46fba06637360f21b01ccd6fd57447375 [formerly 5a338fc1e4]
Former-commit-id: 51c411c3ed
2014-03-17 15:22:42 -05:00
Nate Jensen
913ded4fd3 Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: 5f8e5a3331 [formerly b5f3aee368] [formerly 78afc6040c] [formerly 5f8e5a3331 [formerly b5f3aee368] [formerly 78afc6040c] [formerly 9cf43e7de6 [formerly 78afc6040c [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]]]]
Former-commit-id: 9cf43e7de6
Former-commit-id: c4fe787a80 [formerly cf171e67ed] [formerly fab84c1417570b64126103092b6ab9ac3f6bb28e [formerly d4596770ee]]
Former-commit-id: 489cd6eab30b705e2916e5b32e18fe24b3be513a [formerly c6db5c24b1]
Former-commit-id: 0014f6142f
2014-03-14 14:14:37 -05:00
Brian.Dyke
f95e1ed18b 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: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 39ef07d49f [formerly 57f7e4b084] [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]]
Former-commit-id: b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4 [formerly 35427557c4]
Former-commit-id: 5fb2fe9266
2014-03-14 11:13:30 -04:00
Ron Anderson
b75886fac4 Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled.
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc

Former-commit-id: aa3418a8ae [formerly dcc068132a] [formerly 883cf26c5f] [formerly aa3418a8ae [formerly dcc068132a] [formerly 883cf26c5f] [formerly 6e6570fd5a [formerly 883cf26c5f [formerly efc59e6541342bfc3e826934e4a9a5d85dc2801b]]]]
Former-commit-id: 6e6570fd5a
Former-commit-id: 1022d5ef82 [formerly 13401793be] [formerly 1c0a3c2990525dbcd7f8e3618855a0958a2768d7 [formerly f93a657fb4]]
Former-commit-id: 10d95ec6d39f96b94beeac3b0d2b691fdda7e756 [formerly 2c8f0c7949]
Former-commit-id: 4ff78789c9
2014-03-14 10:11:00 -05:00
Brian.Dyke
85d43db6af Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 30084d7f84 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]]
Former-commit-id: 30084d7f84
Former-commit-id: 024d49d48b [formerly 916fec5a4f] [formerly ef3d48a76a5bbff4e7d32e4ab3916273c583f0ec [formerly 2109409b24]]
Former-commit-id: 45c14c936cdd09a6b0550940abd94e61b8350680 [formerly f20020876a]
Former-commit-id: 92ed2895fb
2014-03-14 10:15:53 -04:00
Brian.Dyke
b6b38c0121 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: a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]]
Former-commit-id: f999e48df0
Former-commit-id: 86ec9a50d4 [formerly 82756e3855] [formerly 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867 [formerly 3ab2df3507]]
Former-commit-id: 1bf9fe1b47eeea3a212497f6320423ebad1117f1 [formerly 76271269c5]
Former-commit-id: 516ba8e81a
2014-03-14 08:44:39 -04:00
Brian.Dyke
f417ded1bb OB_14.1.1-23 baseline
Former-commit-id: b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: 6c021d0eec [formerly e78e030b7c] [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d [formerly 8f72db144b]]
Former-commit-id: 15a710f2de86297f2fae98fe2c109c5d01b1953d [formerly c7fbd5dfe4]
Former-commit-id: be8f052cff
2014-03-14 08:18:16 -04:00
Ron Anderson
ea2fa38523 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: 3ac978316a [formerly ef8a3b2581] [formerly 0a6630a84d] [formerly 3ac978316a [formerly ef8a3b2581] [formerly 0a6630a84d] [formerly 107daf22ae [formerly 0a6630a84d [formerly 60ace911a0b1496d3bb74a85ff3c6b89ca70c267]]]]
Former-commit-id: 107daf22ae
Former-commit-id: 3b36bda0b9 [formerly c1cfe962c5] [formerly a324770d2d9c3cc29077362f1c9fe283000cbf44 [formerly 211e0427e4]]
Former-commit-id: 0e688b49e5e6e84b7cee4c016143bd98d4bd1908 [formerly c399d2a176]
Former-commit-id: c14cdeca70
2014-03-13 18:01:22 -05:00
Bryan Kowal
6fe29d2c4a Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
Former-commit-id: 0e4fbed3ef [formerly 3e90c26b14] [formerly 9b2af366c1] [formerly 0e4fbed3ef [formerly 3e90c26b14] [formerly 9b2af366c1] [formerly 6ba13b2b44 [formerly 9b2af366c1 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]]]]
Former-commit-id: 6ba13b2b44
Former-commit-id: 35d9056fee [formerly f0ff052afc] [formerly 816b374f58a9d0828d47626217f16d7f05d481b6 [formerly 2b053a3bc8]]
Former-commit-id: a303233de138617fede7bf0b42801e75a29b7e04 [formerly 9cfde0458f]
Former-commit-id: a099c8d647
2014-03-13 17:39:32 -05:00
Kevin P. Johnson
fd16da4ae4 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: c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]]
Former-commit-id: 4c833d3389
Former-commit-id: 54316530e4 [formerly 32b372db4b] [formerly 6cd2437734cdee7992443a141d1ae3334e20f72d [formerly 17a4229072]]
Former-commit-id: 692a687b6edde3278b185df9e4ad90705444abee [formerly eb12ec9c14]
Former-commit-id: 90a9e642e3
2014-03-13 20:42:12 +00:00
Nate Jensen
3912038146 Merge "Issue #2718 Fix org.geotools version in common.base.feature/feature.xml" into development
Former-commit-id: 06fa63341d [formerly 727457dd9d] [formerly 620d9cf832] [formerly 06fa63341d [formerly 727457dd9d] [formerly 620d9cf832] [formerly 42649882fa [formerly 620d9cf832 [formerly 63bab83be86d4ad70569187e7948c230819f8b7d]]]]
Former-commit-id: 42649882fa
Former-commit-id: cdcdd6beec [formerly 26607b92a0] [formerly 4c6c27343a5db435fe0f7bc41bc3b6add420bab9 [formerly 38752f1e3c]]
Former-commit-id: b9b6d37b155ab9bce00cd973990aeca33bfcca14 [formerly 17beadd927]
Former-commit-id: a1f39157e3
2014-03-13 12:58:10 -05:00
Ron Anderson
d552e2751d Issue #2718 Fix org.geotools version in common.base.feature/feature.xml
Change-Id: I2e435e5cc7e3a65c116b3ca3ba3bd4f6c736082d

Former-commit-id: 5bd859c9d3 [formerly 6061100cb0] [formerly fc7a19bdf6] [formerly 5bd859c9d3 [formerly 6061100cb0] [formerly fc7a19bdf6] [formerly dcb7b9c88f [formerly fc7a19bdf6 [formerly 98ca1d990e02bd70dacca7c951bf0212f93bdccc]]]]
Former-commit-id: dcb7b9c88f
Former-commit-id: 2393c9dc47 [formerly 9f93a09c9f] [formerly 018515cf4cd2bfdd7cac8cc5f16c530773dc4cdc [formerly c2cadc6f93]]
Former-commit-id: c0cbe61c229f100a7728be09f5f2403675b668fe [formerly 4dfd1495f0]
Former-commit-id: 62eac84e82
2014-03-13 12:54:44 -05:00
Nate Jensen
737feb1c33 Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development
Former-commit-id: 57ba744427 [formerly 57faf2b7b1] [formerly a2a46becc8] [formerly 57ba744427 [formerly 57faf2b7b1] [formerly a2a46becc8] [formerly befff7be3a [formerly a2a46becc8 [formerly a221c18b0195cb5b8dd284c4f3ef1266a8efd999]]]]
Former-commit-id: befff7be3a
Former-commit-id: 127d260e38 [formerly 071ae3b61f] [formerly 1e5e1d618095429d94f96d6e10274a9f50958b2f [formerly 3f2ff13d14]]
Former-commit-id: 0cf9da3fe58dc2adcdc06bc826e061275824bb89 [formerly a47e73f056]
Former-commit-id: 677ae81c6a
2014-03-13 12:41:14 -05:00
Nate Jensen
288848e15b Issue #2907 split edex.redbook plugin into common and edex redbook plugins
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe

Former-commit-id: 0597c51f2e [formerly 692ec623b2] [formerly 087307a781] [formerly 0597c51f2e [formerly 692ec623b2] [formerly 087307a781] [formerly cc1cb28eed [formerly 087307a781 [formerly 62923fbae80131fab6256923bc32bc46e46940ba]]]]
Former-commit-id: cc1cb28eed
Former-commit-id: 235d98173d [formerly 027a141c94] [formerly 613b1f0300b324dd34716e78d0468f23f6b5842b [formerly daf6997a59]]
Former-commit-id: 5a7d08b0fbbf547a71e9f7dae7f3514bf2f92cc7 [formerly 1485f7ff48]
Former-commit-id: b1b0f40cdf
2014-03-13 12:23:35 -05:00
Ron Anderson
be71fd9775 Issue #2909 Remove useLegacyMergeSort java parameter
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly dd8bfdf941 [formerly d1b36c4a72 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]]]
Former-commit-id: dd8bfdf941
Former-commit-id: 291504f08d [formerly f24f542137] [formerly 4689925288bb72398ed1efadbc5c3d15c54a177e [formerly b82cf065b5]]
Former-commit-id: 7aa1d3987df5be30748307db9529f5d2a21672a4 [formerly 2bf7b94fe4]
Former-commit-id: 1ed943032d
2014-03-13 11:54:15 -05:00
Nate Jensen
87eaf289e1 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: a45175cbc9 [formerly a9381c505e] [formerly 540d0f2e1d] [formerly a45175cbc9 [formerly a9381c505e] [formerly 540d0f2e1d] [formerly 27625eb93a [formerly 540d0f2e1d [formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]]]
Former-commit-id: 27625eb93a
Former-commit-id: c2fde2241e [formerly 5f554ade56] [formerly 685d628805abded0ae9728b016ad3cb6833fc05a [formerly d8edb8e91b]]
Former-commit-id: a39642ba88c4d15d783728b3396c1262932e9519 [formerly 432926c40b]
Former-commit-id: b8b63869ed
2014-03-13 11:16:00 -05:00
Ron Anderson
9accd00e1f 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: d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: cbd408ce4e [formerly 06b0b5b684] [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628]]
Former-commit-id: cfe7b7159bee965bab52438c7b1f622e5351016b [formerly 4ffc16ce53]
Former-commit-id: 98e22f6e59
2014-03-13 11:11:53 -05:00
Nate Jensen
651deae992 Merge "Issue #2898 Fix recycling of best res resource." into development
Former-commit-id: baead24016 [formerly 95fe9da5e2] [formerly c662bfb938] [formerly baead24016 [formerly 95fe9da5e2] [formerly c662bfb938] [formerly 8ac509f37f [formerly c662bfb938 [formerly 274b83f84f4bdda381c450b0853711564cae65a6]]]]
Former-commit-id: 8ac509f37f
Former-commit-id: f72551b031 [formerly 614a106884] [formerly c749fc6329e1ec120ee600d3c4fa1fd2bd451d55 [formerly 42e2f15293]]
Former-commit-id: f7c02fb8d7fe1347277ce487cd9e33fc65b6aac6 [formerly 12b7028a8b]
Former-commit-id: b41cda0bda
2014-03-13 10:14:58 -05:00
Ben Steffensmeier
5aa1ec1a30 Issue #2898 Fix recycling of best res resource.
Former-commit-id: 3efcf94ac6 [formerly 477b2b604a] [formerly 90e464ad0b] [formerly 3efcf94ac6 [formerly 477b2b604a] [formerly 90e464ad0b] [formerly d115db1a66 [formerly 90e464ad0b [formerly 1693e5e369a199dd2a824815e0c3e638fc7b0be3]]]]
Former-commit-id: d115db1a66
Former-commit-id: 9d151047ea [formerly 1a06a5c3f5] [formerly 7bc5f5f9095293676382cfec5ead778acc57fa5e [formerly e4d861fc69]]
Former-commit-id: 5edce12b01e8a1fa66e45019bdcb0e1120526f1a [formerly 858774d699]
Former-commit-id: 147a2a1b03
2014-03-12 18:05:10 -05:00
Nate Jensen
16c7c19469 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: 84d698b111 [formerly 0e39a89ea3] [formerly 82778ad21b] [formerly 84d698b111 [formerly 0e39a89ea3] [formerly 82778ad21b] [formerly f8180587d4 [formerly 82778ad21b [formerly b723095f6d5d59b67370c7292f88f339d349993a]]]]
Former-commit-id: f8180587d4
Former-commit-id: dd1818bcd9 [formerly 32ccf77885] [formerly e60e13c06f98e845a0be9a81f12628aa3cec8c08 [formerly 34c5d1de25]]
Former-commit-id: b179639787b8133c9613c1bd824d46ea7d5df645 [formerly 2c0d7d2d3e]
Former-commit-id: 718d69723b
2014-03-12 16:05:19 -05:00
Nate Jensen
e06086e65f Merge "Issue #2871 Clean up ECMWF bundles." into development
Former-commit-id: 2c75a66182 [formerly 185684ce9b] [formerly 253d19af73] [formerly 2c75a66182 [formerly 185684ce9b] [formerly 253d19af73] [formerly 3dd9c9bffb [formerly 253d19af73 [formerly 86e55d14186870cc44f7d0a81e56f2175c66f1df]]]]
Former-commit-id: 3dd9c9bffb
Former-commit-id: 772adcd86f [formerly dd8e1a554b] [formerly b54849466f4e05882acd3240c78df24c400295dd [formerly f5ca0cacc9]]
Former-commit-id: 17ef18820246b7e77de205eabc114e15b109061a [formerly d980ba1089]
Former-commit-id: 297bea998c
2014-03-12 15:35:21 -05:00
Ben Steffensmeier
b6b13cea10 Issue #2528 Fix satellite units/style.
Former-commit-id: eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly eb922ea2e2 [formerly e6cd8b3167] [formerly 77041e5b17] [formerly 75120a09cd [formerly 77041e5b17 [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]]
Former-commit-id: 75120a09cd
Former-commit-id: 82a8490dfc [formerly e2995114dc] [formerly b6272ae932f2784e4677fe602769adb1fef911b2 [formerly d29daf8ede]]
Former-commit-id: 3fdb707afe0c7c8354db1df1089d473246d1649a [formerly fc62e2679d]
Former-commit-id: 1bde438f3a
2014-03-12 14:19:49 -05:00
Richard Peter
1cb0e304b3 Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development
Former-commit-id: 1e90648b68 [formerly e69e07ce82] [formerly b9ad595f15] [formerly 1e90648b68 [formerly e69e07ce82] [formerly b9ad595f15] [formerly 6cf5eb346a [formerly b9ad595f15 [formerly 50e64a8948daed61e4c9422ef33732a018468e2a]]]]
Former-commit-id: 6cf5eb346a
Former-commit-id: 772c59531e [formerly f762b25e22] [formerly 74dff0c362e75705edbdbc9ed37b4c9420d10df6 [formerly 4b0379de16]]
Former-commit-id: bf8fd6582470249229446cab192ed4ea31e3cf80 [formerly 9a100064d2]
Former-commit-id: 2b4100424b
2014-03-12 11:21:06 -05:00
Mike Duff
720ef476e3 Issue #2858 - Implement NDM menus for ncep/hydro SPC
Peer review comments

Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5

Former-commit-id: 972c77589f [formerly 865ef97108] [formerly 9aa0b40ed5] [formerly 972c77589f [formerly 865ef97108] [formerly 9aa0b40ed5] [formerly b434ab5bb3 [formerly 9aa0b40ed5 [formerly a74573fef8cc09ed15341d9873ae1dd2ba561478]]]]
Former-commit-id: b434ab5bb3
Former-commit-id: 530bd2469a [formerly 8c277c76f2] [formerly 8aaab8a34c7dabac5b97f89504144ae51e5ea6d8 [formerly 693793eb92]]
Former-commit-id: fd99bc8ed94fc89d2ea3be073e2d2fd6a962f498 [formerly 7dccf753c4]
Former-commit-id: c1164aae5a
2014-03-12 11:19:18 -05:00
Ben Steffensmeier
335e46d9aa Issue #2871 Clean up ECMWF bundles.
Former-commit-id: 3408bd4398 [formerly 4953b487cd] [formerly 17a940b6ce] [formerly 3408bd4398 [formerly 4953b487cd] [formerly 17a940b6ce] [formerly fe55c49373 [formerly 17a940b6ce [formerly 5eb5f909c575205e3a261c3cce7ef7b05a57dd22]]]]
Former-commit-id: fe55c49373
Former-commit-id: b5b4c7cd34 [formerly ce0023f1ea] [formerly 94facb10c7f130ff2e66b4f4dccfec20be5b7f9b [formerly be4ec3d266]]
Former-commit-id: e2cfffc2a80ea25a7084b0d4074069fbaf162b35 [formerly 3b4d3af43e]
Former-commit-id: 2b6dba2ae6
2014-03-12 11:16:42 -05:00
Nate Jensen
59e846ece3 Merge "Issue #2827 fixed collab dataserver returning empty body with 200" into development
Former-commit-id: 9f1d557bc6 [formerly 1a3d8a69d4] [formerly 9a36f5470b] [formerly 9f1d557bc6 [formerly 1a3d8a69d4] [formerly 9a36f5470b] [formerly 10a2e5c602 [formerly 9a36f5470b [formerly 190b1ef82b04ee7b0787f05fc4bb4a356b2a9903]]]]
Former-commit-id: 10a2e5c602
Former-commit-id: 71c9e949dc [formerly ca32e644aa] [formerly 0e04d097ec8f8485535716347088bcbd9b30f554 [formerly a05addf1c6]]
Former-commit-id: 01685607d3b70251211e9c3be8b47bd82fbca1e3 [formerly 43363d4005]
Former-commit-id: cd451d4f41
2014-03-12 10:59:42 -05:00
Mike Duff
11e96f8bd5 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: bb2b251cd0 [formerly 6444131768] [formerly 8068c9aa83] [formerly bb2b251cd0 [formerly 6444131768] [formerly 8068c9aa83] [formerly e01c5c3534 [formerly 8068c9aa83 [formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]]
Former-commit-id: e01c5c3534
Former-commit-id: cbc15d479a [formerly 4fddc0c631] [formerly ea4a4997b336401081920b43fb91017011502ca3 [formerly 832dd498fc]]
Former-commit-id: ad32cd2a661ff65b5b8dddf880094042db699f30 [formerly fc1cc39479]
Former-commit-id: 6e1ef1196a
2014-03-12 10:52:18 -05:00
Nate Jensen
bad2fe6964 Merge "Issue #2702 Updated openfire version in component spec." into development
Former-commit-id: 7a8cddff16 [formerly d8100732d6] [formerly 35f778f5b9] [formerly 7a8cddff16 [formerly d8100732d6] [formerly 35f778f5b9] [formerly c5647be7e0 [formerly 35f778f5b9 [formerly 2b8374ea8be4b36e3c6276ced6938a3e97c42201]]]]
Former-commit-id: c5647be7e0
Former-commit-id: f35f49a0bb [formerly 0d62cf1def] [formerly 0e547b67bf148216e690ddc386998031ff1a110e [formerly f430ddc5d9]]
Former-commit-id: 2fbb582bf076a9217087a9761fd7f5debd687882 [formerly d6308657fc]
Former-commit-id: e2bcde3105
2014-03-12 10:02:42 -05:00
Richard Peter
493e805cbe Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 7ebbc0cf78 [formerly 7af0cfaf38 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: abf39442ba [formerly f5e1fb569a] [formerly 67499353bc5b2802a0bbc17ca5f119b6ddd6836d [formerly e8ea7b80e6]]
Former-commit-id: cbe3cfa55d05a9b0aaca0d648dd1b36fd4c563be [formerly e2ae7de485]
Former-commit-id: 8b425fed86
2014-03-12 09:47:29 -05:00
Brad Gonzales
faa52421fa Issue #2702 Updated openfire version in component spec.
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498

Former-commit-id: 57b81b8031 [formerly c7d06ff946] [formerly ccb312d46f] [formerly 57b81b8031 [formerly c7d06ff946] [formerly ccb312d46f] [formerly bf0d052043 [formerly ccb312d46f [formerly 276c38754b7f917c229750ce06d387a8b63245d4]]]]
Former-commit-id: bf0d052043
Former-commit-id: 9dc545e82c [formerly ec34591f08] [formerly 703b3cf04e5992070f4a2edcfcaf0eac8a3d91d3 [formerly dae0963531]]
Former-commit-id: fa205ba6df82ecb0182903405eefcac8d24974fd [formerly 1049855e4d]
Former-commit-id: 0a973030c4
2014-03-12 08:48:36 -05:00
Brian Clements
05ddcce572 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: 2aa9dcb248 [formerly ce1038723d] [formerly bfde9c37ce] [formerly 2aa9dcb248 [formerly ce1038723d] [formerly bfde9c37ce] [formerly d44c55e976 [formerly bfde9c37ce [formerly 31c42d161146b0367435c66535d4da700a572f24]]]]
Former-commit-id: d44c55e976
Former-commit-id: fb6be670b1 [formerly ab86cda554] [formerly 1b8f3ce536ab968c6e5e63d5bfe2ffc91722e548 [formerly d693c07bb4]]
Former-commit-id: 199f3f09805b232480df05d4c222e11bab11f4ce [formerly 22d6302151]
Former-commit-id: 560f51d226
2014-03-12 08:27:22 -05:00
Greg Armendariz
f720c49262 Merge "Issue #2851 - initial 64-bit build of the bignsharp DLL" into development
Former-commit-id: 015bf62723 [formerly 195383130c] [formerly da34c3d2da] [formerly 015bf62723 [formerly 195383130c] [formerly da34c3d2da] [formerly 6acf5fefcc [formerly da34c3d2da [formerly 5346beaf24ad66cfffab9e115c8d22b4c2fe2f95]]]]
Former-commit-id: 6acf5fefcc
Former-commit-id: bd21fe4063 [formerly 9f51095c62] [formerly 32fc0e0fb0aa1a2719afcfd069aa06ee04f133d8 [formerly 2aa74592d7]]
Former-commit-id: 9dba91ab2bc68773418ccd9c35e570e114c1b5c8 [formerly 32ba7d7c93]
Former-commit-id: 87087b3ffc
2014-03-11 19:56:55 -05:00
Lee Venable
3a2d97c2e9 Merge "Issue #2865 - added more null and dispose checks" into development
Former-commit-id: 6380c83d55 [formerly 6d02134d89] [formerly ae63879ddf] [formerly 6380c83d55 [formerly 6d02134d89] [formerly ae63879ddf] [formerly 36f72f23dc [formerly ae63879ddf [formerly 5c21cbb43cda9274a77b2358749ba53b397ef0e1]]]]
Former-commit-id: 36f72f23dc
Former-commit-id: c68de2cde1 [formerly 2e127e20eb] [formerly 3b6c997b64c9324be5f2db8be91ce169da136a9f [formerly d7fc7f791d]]
Former-commit-id: 2d48a8c746b38e90cb3aa4006caf4afff503d429 [formerly 8d909c1b14]
Former-commit-id: d5a9ae9d79
2014-03-11 17:43:48 -05:00
Nate Jensen
12ddc52588 Merge "Issue #2791 Fix fill value filter." into development
Former-commit-id: 8fc426c59d [formerly 2c6ca9840c] [formerly 80a2807ce4] [formerly 8fc426c59d [formerly 2c6ca9840c] [formerly 80a2807ce4] [formerly 249d0f3ded [formerly 80a2807ce4 [formerly 871280fb9fac9b09908243b1753abb087b204f23]]]]
Former-commit-id: 249d0f3ded
Former-commit-id: 97c46f5680 [formerly 0fc7fde66d] [formerly 919918e52e15487483a5bfa833598fc47e0aa314 [formerly 266e87f935]]
Former-commit-id: f9226002f9fd3ae800b9422d870ccb8fa7b24bee [formerly 651bb4ec5f]
Former-commit-id: df12abb511
2014-03-11 17:33:54 -05:00
Ben Steffensmeier
0fd75e5a66 Issue #2791 Fix fill value filter.
Former-commit-id: bafe8b1bb2 [formerly 538fb61ae0] [formerly 4eb2d74e1c] [formerly bafe8b1bb2 [formerly 538fb61ae0] [formerly 4eb2d74e1c] [formerly 1a45efe2a5 [formerly 4eb2d74e1c [formerly e845b829ba4518ac41f0ac26c22c3d83a5504375]]]]
Former-commit-id: 1a45efe2a5
Former-commit-id: c730a6673e [formerly 6df4977dc2] [formerly e58e298814694eac7d464d26f1709c1c11029359 [formerly c754db3ae3]]
Former-commit-id: d93a6989753654306e7e6fe686fa19aed638f753 [formerly 345ec7fa6a]
Former-commit-id: d63c31cd0a
2014-03-11 17:27:26 -05:00
Bryan Kowal
49142d88a1 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: 40578d5fe0 [formerly b0de1fba76] [formerly cac6709da8] [formerly 40578d5fe0 [formerly b0de1fba76] [formerly cac6709da8] [formerly 438e594868 [formerly cac6709da8 [formerly 3189f870d55219372438213441fd1359a6bb5cc4]]]]
Former-commit-id: 438e594868
Former-commit-id: cfe069e216 [formerly fe9b652d52] [formerly deff90d8a30f3ac8617a91216fe1f97ec2c6f28a [formerly 9ec8e864a7]]
Former-commit-id: 114c71d431ade597e2d6c55cf0917beb0ccb9af7 [formerly 2c101a12dd]
Former-commit-id: 3440a5b64c
2014-03-11 16:47:11 -05:00
Richard Peter
64feddc462 Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly f59d1433db [formerly 18234c5d73 [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]]
Former-commit-id: f59d1433db
Former-commit-id: 90f3b627af [formerly cc35481b48] [formerly 5f03de8c59b4bb9535d972f40d6cc693c365c3da [formerly 76f15c73dd]]
Former-commit-id: ff2e21df08c5b0602d23df7b135c00450a1c40da [formerly 937c89866d]
Former-commit-id: 318c61b1bf
2014-03-11 16:43:37 -05:00
Lee Venable
b7b1d88680 Issue #2865 - added more null and dispose checks
Former-commit-id: 7f6792f1c5 [formerly fe6e7328c0] [formerly df65d7c7ce] [formerly 7f6792f1c5 [formerly fe6e7328c0] [formerly df65d7c7ce] [formerly 1f9d1af221 [formerly df65d7c7ce [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]]
Former-commit-id: 1f9d1af221
Former-commit-id: 9b11bcedb1 [formerly 8ef7fe57c4] [formerly ebbc4eff228045a38bf9d41b60b39929f6e27fbe [formerly 46fa017e1b]]
Former-commit-id: 3cd64bcf0cda402268f02162ee27b86ac2bc3d26 [formerly 0931ce72c9]
Former-commit-id: 66a87595af
2014-03-11 16:30:33 -05:00
Dave Hladky
177e76f996 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly 76e216d319 [formerly 3500ad262a [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]]
Former-commit-id: 76e216d319
Former-commit-id: 39cc47bc52 [formerly f3876233e4] [formerly 28b9b16fdbb85a6e9a3afb5298b0813e917a59b1 [formerly 03fd32144a]]
Former-commit-id: 451a7125613fe9ce3c298e07c814874021718d47 [formerly c0d2eb8f6b]
Former-commit-id: 78441a1250
2014-03-11 15:53:59 -05:00
Nate Jensen
846d4546bf 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: 2c4b520080 [formerly 221b57892c] [formerly 1b11e23257] [formerly 2c4b520080 [formerly 221b57892c] [formerly 1b11e23257] [formerly a1bf3e9874 [formerly 1b11e23257 [formerly 8d4e32df3a8374e571a3a9d3994e45ea825c418f]]]]
Former-commit-id: a1bf3e9874
Former-commit-id: 054d624717 [formerly 5b57abd527] [formerly 6303b5d6160c59ed7eaa1c85b6bcd209d15b757d [formerly 2e21069300]]
Former-commit-id: d38a7620ef7708df8a3cf962629b44dd90ec2fa9 [formerly 8e0947136f]
Former-commit-id: 9a38340021
2014-03-11 12:35:53 -05:00
Nate Jensen
95a07d847e Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
Former-commit-id: a9811bdb2c [formerly cef0438c35] [formerly 85f5821a6f] [formerly a9811bdb2c [formerly cef0438c35] [formerly 85f5821a6f] [formerly afbdf6962c [formerly 85f5821a6f [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]]
Former-commit-id: afbdf6962c
Former-commit-id: fd0a81a181 [formerly 3411167042] [formerly 2ac85b86fee6285f476e7194d549ae07555767d9 [formerly 09f4bd9883]]
Former-commit-id: 0f271f5e259517b85add913a4d42f6b3fbb92885 [formerly be9744c6f9]
Former-commit-id: 39d73f1569
2014-03-11 12:35:44 -05:00
David Gillingham
7c4f0bcee6 Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 187196b519 [formerly b0783b64ce [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]]
Former-commit-id: 187196b519
Former-commit-id: 6fcb5b7e73 [formerly 4179172d0e] [formerly e949b41e8ce1e7c37f0f510cdbbac24e2438f30d [formerly 68edb8d9a1]]
Former-commit-id: db669e661b0dcdd0789172fe8a31d92ad669695d [formerly f30292b471]
Former-commit-id: 0e0fdae804
2014-03-11 11:54:25 -05:00
Nate Jensen
ec558cac6b Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development
Former-commit-id: 1516cd6177 [formerly 8e0fff8bb4] [formerly a1533481b3] [formerly 1516cd6177 [formerly 8e0fff8bb4] [formerly a1533481b3] [formerly 4ee98a10cd [formerly a1533481b3 [formerly 22518ce352166afc70950d631b5df8cbcc063a3d]]]]
Former-commit-id: 4ee98a10cd
Former-commit-id: 6eb08c2faf [formerly c0ee40b137] [formerly 0a164320bd83789017f0e070bf743231a5b0cdd6 [formerly abe081b019]]
Former-commit-id: 81fd5a4e725c3ecac2261b059aa857f851a71e8e [formerly 687b47272a]
Former-commit-id: 0631214f1a
2014-03-11 11:30:27 -05:00
Brad Gonzales
fe798a797c 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: f70d572802 [formerly cbac19d219] [formerly 09d27e99b5] [formerly f70d572802 [formerly cbac19d219] [formerly 09d27e99b5] [formerly 48b6c75bb3 [formerly 09d27e99b5 [formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]]]]
Former-commit-id: 48b6c75bb3
Former-commit-id: 4e44cdcfd4 [formerly f53845738c] [formerly 7d3abbb7bdae80a54f033641942cda32bb82bb2a [formerly 5d5ab33db3]]
Former-commit-id: 1e23556d6631c497f1ee4d7c61886ca51a27a2b2 [formerly b7df208cd7]
Former-commit-id: 0b558f0c93
2014-03-11 11:27:44 -05:00
Ben Steffensmeier
d3992ef6d7 Issue #2896 Fix sat best res on weird projections
Former-commit-id: a9c4875038 [formerly c7fa392f3f] [formerly 8bb517836a] [formerly a9c4875038 [formerly c7fa392f3f] [formerly 8bb517836a] [formerly 560fc688bc [formerly 8bb517836a [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]]
Former-commit-id: 560fc688bc
Former-commit-id: 20b99bc6c5 [formerly 7a06fdd71a] [formerly 3dd12b4d2d8faad952b606b3c39220f5602545d4 [formerly b474e92189]]
Former-commit-id: 5c6ba99d716537fdfe23db7e188caebb8b401e59 [formerly 30683880ee]
Former-commit-id: 470ac4a1b9
2014-03-11 11:07:43 -05:00
Dave Hladky
8481c0f6ae Issue #2900 Added NWSAuth to import for DD viz feature
Former-commit-id: 117064bbe1 [formerly e3701c0810] [formerly a2a66b028d] [formerly 117064bbe1 [formerly e3701c0810] [formerly a2a66b028d] [formerly 171bb37b0a [formerly a2a66b028d [formerly 9800d488dfb626c12b8b84f34af06dbbd7d574b0]]]]
Former-commit-id: 171bb37b0a
Former-commit-id: e804573ef9 [formerly 7e384d27a1] [formerly 2c10589792c97842540ded77984902908c6b1f40 [formerly b1fc6536c9]]
Former-commit-id: 5e93f861c06943ce3eb4079b81f3fe8e50199b69 [formerly be0cfc0afe]
Former-commit-id: 493246236c
2014-03-11 11:04:34 -05:00
Lee Venable
ab2cc176e3 Issue #2865 - fixed font memory leak
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 7aab4252d5 [formerly 44733489b9] [formerly 2c67c4f6c4] [formerly 7aab4252d5 [formerly 44733489b9] [formerly 2c67c4f6c4] [formerly 58d7f759b2 [formerly 2c67c4f6c4 [formerly 2555d382f26278c5f972c17da778338142cdaaec]]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 8bec7ebcb1 [formerly 86e6547a63] [formerly 8fe2ec93b5265755e9333c787d93b1c92293eceb [formerly a5487de998]]
Former-commit-id: 97cae7373d3e7a83f0b8e4c464d4a9dab888a084 [formerly 97a124ca58]
Former-commit-id: 374a2da1a1
2014-03-11 10:31:50 -05:00
Nate Jensen
611915a88c Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 219f232fcb [formerly 42c545804c] [formerly dc64b4c9b5a35e0a38967549f2d086cd34c1fedf [formerly 22ff235bcf]]
Former-commit-id: c46da055ba6866f0ae818586090fa0544db52dc7 [formerly 15a2fb216e]
Former-commit-id: 391deee18c
2014-03-11 10:28:01 -05:00
Brian.Dyke
b34425dbf0 Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
Former-commit-id: 1cb3691cc4 [formerly fa16721854] [formerly 552490206f] [formerly 1cb3691cc4 [formerly fa16721854] [formerly 552490206f] [formerly fcc9115b0d [formerly 552490206f [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]]]
Former-commit-id: fcc9115b0d
Former-commit-id: a42c10c21d [formerly 3070b42ed3] [formerly 96892f7695c369e44e299b4077a8590a12b79541 [formerly 83822661e8]]
Former-commit-id: 976fbb149cf7a3f819169004bcb228fd4ddf1282 [formerly fdaab3d981]
Former-commit-id: b301ef8190
2014-03-11 10:44:03 -04:00
Juliya Dynina
98b24cf46b Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 7952862443 [formerly 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]]]]
Former-commit-id: 7952862443
Former-commit-id: d1b202fcd0 [formerly bedc9082b0] [formerly 30b12a7237013355ab82100b5cd40d97cfd766da [formerly 7e35f36651]]
Former-commit-id: 187c2bed7707310ed1c946986736df1dabeef617 [formerly 7966aac771]
Former-commit-id: ddf1c4f4f6
2014-03-11 09:24:12 -05:00