Commit graph

5100 commits

Author SHA1 Message Date
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
Ron Anderson
bc8476d4cb Merge "Issue #2721 Fix error when activeSites.txt contains blank lines." into development
Former-commit-id: 116826d0f8 [formerly bd57a18a29] [formerly 6b51b05bdf] [formerly 116826d0f8 [formerly bd57a18a29] [formerly 6b51b05bdf] [formerly f3a6acaf48 [formerly 6b51b05bdf [formerly e665fa251dab6afb16d5a3863aac0815e84a00d4]]]]
Former-commit-id: f3a6acaf48
Former-commit-id: c8ecb9a934 [formerly d6d544bc3b] [formerly fb4aba70507fc50b99a5a3d974471405f7dc99ef [formerly 7b272e271c]]
Former-commit-id: bd60ee87653f0192f19731592bfd66a8b44e519b [formerly 9d60bad8f7]
Former-commit-id: 178a11fc31
2014-03-10 18:07:17 -05:00
Ron Anderson
d5d77e6935 Issue #2721 Fix error when activeSites.txt contains blank lines.
Change-Id: I76b9b21134907f5297bae5fb106334ed54f5b6ac

Former-commit-id: 2cb4512201 [formerly 3cf3a9e70c] [formerly 3af33de29b] [formerly 2cb4512201 [formerly 3cf3a9e70c] [formerly 3af33de29b] [formerly aa62ab0fd8 [formerly 3af33de29b [formerly d711aa3552e660aba1ac885c0767bab8c856da54]]]]
Former-commit-id: aa62ab0fd8
Former-commit-id: e4bd652ae8 [formerly 507d8a63f8] [formerly 4dd4c15e50b8d3523dd154efcc30466d01cd4070 [formerly 7621944608]]
Former-commit-id: 5d739c097f233e14506efe85a7deb7afedb1723f [formerly 81d9adbcbb]
Former-commit-id: 9c4976829c
2014-03-10 17:57:43 -05:00
Ron Anderson
fa6cdeede5 Merge "Issue #2824 Fix null at end of validation message." into development
Former-commit-id: 7525a8e0db [formerly bf7a958302] [formerly f7f49ef1cb] [formerly 7525a8e0db [formerly bf7a958302] [formerly f7f49ef1cb] [formerly 199b6eb3fd [formerly f7f49ef1cb [formerly 2b79c54340f7a2bb9492435117db77bb9c6d01a3]]]]
Former-commit-id: 199b6eb3fd
Former-commit-id: 52053c561d [formerly bc0d3ca667] [formerly a18b650f52c9d3a5dfddfb3b77ecd007f4076c30 [formerly fb5036b1d4]]
Former-commit-id: 287375338265b2a029d4f943b8ad508ec6510cf9 [formerly 110a505353]
Former-commit-id: 4c63d6802f
2014-03-10 17:54:51 -05:00
Ron Anderson
c13288510b Issue #2824 Fix null at end of validation message.
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1

Former-commit-id: f4f807d03b [formerly 61148935cf] [formerly ac39b1accb] [formerly f4f807d03b [formerly 61148935cf] [formerly ac39b1accb] [formerly f0294a3ff8 [formerly ac39b1accb [formerly 24ae011033b851364e4c6efe98488c4066cfd042]]]]
Former-commit-id: f0294a3ff8
Former-commit-id: c30e9abcb6 [formerly f2f1f95863] [formerly d1cf1221c983278d85a6b32924946a49f715a34f [formerly b3b6d93b4c]]
Former-commit-id: 197029db23adee198333f2dfb3c1156c7a3c71f3 [formerly 4494ed5b20]
Former-commit-id: 6eb48ac9cc
2014-03-10 17:42:55 -05:00
Nate Jensen
e7741e3512 Merge "Issue #2848 fixed session create, listen, join ordering" into development
Former-commit-id: 3c6667cd58 [formerly 64b7c84018] [formerly 722216e319] [formerly 3c6667cd58 [formerly 64b7c84018] [formerly 722216e319] [formerly fb2677db7d [formerly 722216e319 [formerly 89427f93a4459a2f5feeac4f9df00db3143eb998]]]]
Former-commit-id: fb2677db7d
Former-commit-id: c5ca4739cd [formerly ac028d6583] [formerly 118a405e684ed645c200cc1fd8cb608074029d93 [formerly 9633d5f252]]
Former-commit-id: c3aa591a5029b8a25e6e869f92fe4236b65574e7 [formerly aa096c1e2e]
Former-commit-id: f4dbdb33a3
2014-03-10 17:36:06 -05:00
Steve Harris
52b2a36583 Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
Former-commit-id: d8badc8bea [formerly e62a399e9f] [formerly 4c52fb5bb3] [formerly d8badc8bea [formerly e62a399e9f] [formerly 4c52fb5bb3] [formerly cfc9fea413 [formerly 4c52fb5bb3 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]]
Former-commit-id: cfc9fea413
Former-commit-id: 15035a01cc [formerly 0c0bc58b3e] [formerly 47d576172614afbe5d714782f88cfa8fc696489d [formerly 57f2a3204e]]
Former-commit-id: 773d007dceef6da9d83355be4f40dbf2ad6307ff [formerly 51150e544b]
Former-commit-id: b40eee35c7
2014-03-10 16:01:16 -05:00
Ben Steffensmeier
17b6c309cd Issue #2867 Better validation of image export frame range.
Former-commit-id: 3a92ec7284 [formerly bde80aec1b] [formerly e75b961db5] [formerly 3a92ec7284 [formerly bde80aec1b] [formerly e75b961db5] [formerly cc8b71fbdf [formerly e75b961db5 [formerly 6a3a62b913de1d508fb0d470d06a8be4a61918a3]]]]
Former-commit-id: cc8b71fbdf
Former-commit-id: d2ab10b037 [formerly 77e3f15d0b] [formerly e808a55480a4efe5ce4ecf95f2e66eabb231b4c8 [formerly 9c82499818]]
Former-commit-id: 2b71bdb49824ca771f898e4bea737fdf5d5904ea [formerly 3afc79f90f]
Former-commit-id: e0a784d6bc
2014-03-10 15:24:07 -05:00
Ben Steffensmeier
097617689b Issue #2791 Add numeric to alertViz feature.
Former-commit-id: 6280932901 [formerly 525f6b19bf] [formerly f88e1c329e] [formerly 6280932901 [formerly 525f6b19bf] [formerly f88e1c329e] [formerly 2f75103635 [formerly f88e1c329e [formerly 9918eeec97938cbc7c703738800521773fbb4a87]]]]
Former-commit-id: 2f75103635
Former-commit-id: 60506ffe8a [formerly db9729ef73] [formerly 3705b85b6fa911d7173a7bcd00ef46993c1ad2e6 [formerly eaa570c3f2]]
Former-commit-id: f63f3607d4f5bec8b4c8567d5f97e6ca2e071e01 [formerly 1ef88aa125]
Former-commit-id: 5f4a8fb516
2014-03-10 14:55:54 -05:00
Brian.Dyke
0d72b90e5e Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
Former-commit-id: 90154e7ae1 [formerly bcf9a5dc83] [formerly c6f2010ce6] [formerly 90154e7ae1 [formerly bcf9a5dc83] [formerly c6f2010ce6] [formerly 4269f9d875 [formerly c6f2010ce6 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]]]
Former-commit-id: 4269f9d875
Former-commit-id: 3667299983 [formerly c26c40d6e3] [formerly 738fc5f415c773f7bde24fd1a60b618f33307d23 [formerly a453d3fd68]]
Former-commit-id: 58e4c89bd43a8a7a0f7edf067cf9dff34a054c40 [formerly 57b5d77dee]
Former-commit-id: 305b2563fa
2014-03-10 15:42:38 -04:00
brian.dyke
3b1dd43698 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]]
Former-commit-id: b1b216f196
Former-commit-id: 41a37605d4 [formerly d1b389ae05] [formerly 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]]
Former-commit-id: db4eabc17ce8b18f073611f9c641761f09467a04 [formerly f3df3e3690]
Former-commit-id: fba0188c90
2014-03-10 15:36:56 -04:00
Brian.Dyke
0a1ef77d16 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
Former-commit-id: 8d4a1e1204 [formerly 24785068be] [formerly d710aec521] [formerly 8d4a1e1204 [formerly 24785068be] [formerly d710aec521] [formerly fda6ab1344 [formerly d710aec521 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]]
Former-commit-id: fda6ab1344
Former-commit-id: d197a72c20 [formerly c5502af3fa] [formerly 6ec1b00cf64c71cead90fca582edef188ec24710 [formerly 0aff5875b0]]
Former-commit-id: 28dc637ae8563b78153684cbfa60e954caea69c9 [formerly dcade6e18a]
Former-commit-id: 26e19974d1
2014-03-10 15:14:59 -04:00
Brian Clements
ac70455dc6 Issue #2848 fixed session create, listen, join ordering
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: 9b6c283fc9 [formerly 2456c2308f] [formerly dc55cd5b5c] [formerly 9b6c283fc9 [formerly 2456c2308f] [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 67db5cb4f8 [formerly 3486f1f241] [formerly eb63cfebccc689b3ac62c518759624fc43c5c7b9 [formerly 4f9a2577f2]]
Former-commit-id: 6188fed145573399f401e7319702f154913b200b [formerly 6245b550aa]
Former-commit-id: c4e9aff9fc
2014-03-10 14:06:45 -05:00
Nate Jensen
3caa95afc3 Merge "Issue #2673 Fix name of lighning data factory." into development
Former-commit-id: 8275d3591f [formerly c2c596b6bc] [formerly 43de990a4c] [formerly 8275d3591f [formerly c2c596b6bc] [formerly 43de990a4c] [formerly 873f06e85e [formerly 43de990a4c [formerly 5c828c0ddfdf6e29ddfaf706409edda5fb307ade]]]]
Former-commit-id: 873f06e85e
Former-commit-id: 8193df431d [formerly 5e3ecd33fa] [formerly 7eacbf882dab2b1f96227ef8852150b11dae8ecf [formerly ffbc63b67a]]
Former-commit-id: 81bbd298ec150bb91d42ba794c29a9e4401455c8 [formerly ee5e5e1a47]
Former-commit-id: e9c6953542
2014-03-10 13:53:45 -05:00
Nate Jensen
a9dd154005 Merge "Issue #2832 consolidate watch and warning recycle logic" into development
Former-commit-id: e56dfc35c4 [formerly 89cdc44635] [formerly 9cb27d5e95] [formerly e56dfc35c4 [formerly 89cdc44635] [formerly 9cb27d5e95] [formerly 2570c295d5 [formerly 9cb27d5e95 [formerly 4029d0d863bf6da254859028353a271dec70e335]]]]
Former-commit-id: 2570c295d5
Former-commit-id: ba37e2937d [formerly f48251da57] [formerly dcb2d2450927fda01dd0d5edc5f961b453d88fb4 [formerly cab7dadbe8]]
Former-commit-id: ab831dac12081e7004bda0f15eeb4535b42baec0 [formerly 035cf99c65]
Former-commit-id: 5b9fdc7612
2014-03-10 13:52:53 -05:00
Ben Steffensmeier
dd300166ce Issue #2673 Fix name of lighning data factory.
Former-commit-id: a410e3457f [formerly 89eeb243ec] [formerly 019cf9c943] [formerly a410e3457f [formerly 89eeb243ec] [formerly 019cf9c943] [formerly bd7d250cec [formerly 019cf9c943 [formerly 86e3270b88336978cfa799fae402aa350b6dcac2]]]]
Former-commit-id: bd7d250cec
Former-commit-id: 451db7a75e [formerly 93b5fba876] [formerly 68fb71573c7e3fdcf136433cfbecbd7de8b1ba2f [formerly abad6524ed]]
Former-commit-id: 128265a4c91d165e3643ae3f0eb88df2914d10a9 [formerly 34b005b19f]
Former-commit-id: eb97156ba0
2014-03-10 13:35:34 -05:00
Nate Jensen
ed20601f72 Issue #2832 consolidate watch and warning recycle logic
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889

Former-commit-id: 8fcbba4b82 [formerly 8e734f917e] [formerly 057f7671a0] [formerly 8fcbba4b82 [formerly 8e734f917e] [formerly 057f7671a0] [formerly 8cd98e0b9f [formerly 057f7671a0 [formerly 814d21d0a5b58c95f6339e1816788953692f5e95]]]]
Former-commit-id: 8cd98e0b9f
Former-commit-id: 43fbd5573a [formerly 39f2a03d21] [formerly 2e812a9ce3352be5f400be9322dc2565a3748076 [formerly 1646574f5a]]
Former-commit-id: 6f30e553eadca65527a1815a5df5b7b0e2172268 [formerly 33d7e39376]
Former-commit-id: 7731f09550
2014-03-10 13:02:45 -05:00
Richard Peter
a320d58d79 Merge "Issue #2876 - removed import, changed jave version to 1.6" into development
Former-commit-id: a15f5014c2 [formerly 9585896021] [formerly 6581f2b3f4] [formerly a15f5014c2 [formerly 9585896021] [formerly 6581f2b3f4] [formerly 7a2409f488 [formerly 6581f2b3f4 [formerly 61e13e5e81ee25d4c0be9c80b4e6970f4cf0f3e6]]]]
Former-commit-id: 7a2409f488
Former-commit-id: b4ba4a09a8 [formerly 505b86cf19] [formerly c9eae74dc848935632ab8e6aacd8bcc302bd4544 [formerly 92568811c7]]
Former-commit-id: ba51824aaa5b3983f1463fc4a14c9c3f78e8d158 [formerly cda2b0e040]
Former-commit-id: 31493b809f
2014-03-10 12:53:15 -05:00
Mike Duff
ca156c05ee Issue #2876 - removed import, changed jave version to 1.6
Change-Id: Ia2806bff0b7042983c6dd7498c76a66c8c277a29

Former-commit-id: 794e7664ab [formerly f6db852657] [formerly 63b9452c3f] [formerly 794e7664ab [formerly f6db852657] [formerly 63b9452c3f] [formerly 419293a946 [formerly 63b9452c3f [formerly 8ce84ce824a852ad08e70fd272d2bc62b02ef292]]]]
Former-commit-id: 419293a946
Former-commit-id: 02f0968a60 [formerly e005e6fb55] [formerly 0c212599d733659589b767682b3edd6367ff8a62 [formerly 60dd115d66]]
Former-commit-id: 75c0648576fb718b000e6d97db4c213764178d89 [formerly 33a649c9de]
Former-commit-id: d09c635f80
2014-03-10 12:49:27 -05:00
Lee Venable
40a9c6124f Merge "Issue #2807. Added MalformedDataException for VAA decoding." into development
Former-commit-id: a187f1b3d6 [formerly 57d2e9737a] [formerly f9d019f0dc] [formerly a187f1b3d6 [formerly 57d2e9737a] [formerly f9d019f0dc] [formerly 9bf99b9359 [formerly f9d019f0dc [formerly 4094bd9c9eb40db9a93e679bb09fba1bea1d8639]]]]
Former-commit-id: 9bf99b9359
Former-commit-id: 8575254b94 [formerly 20efe51651] [formerly 5ddb0c9717c0c611a2a746f1905d4f9f59de868d [formerly 9e9bb11b5f]]
Former-commit-id: 612bd927f30a0cdacad9566c86598a823b68f598 [formerly 5cbb297cad]
Former-commit-id: 352f316313
2014-03-10 11:52:25 -05:00
Nate Jensen
cc7d30fe1b Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development
Former-commit-id: 9f70b30551 [formerly 60bff5c4af] [formerly 4c7bda09c0] [formerly 9f70b30551 [formerly 60bff5c4af] [formerly 4c7bda09c0] [formerly 33d1e94c38 [formerly 4c7bda09c0 [formerly 99c2f252cab0901cedfefa5e2a6d6799f7e29db8]]]]
Former-commit-id: 33d1e94c38
Former-commit-id: 5ff614276d [formerly ee1efad5d7] [formerly 0934d226d319cbf0db5b7c24ab420cd99f84cb70 [formerly f045d2fab0]]
Former-commit-id: e84179b88c890d8d3d8ba3c32b61678ba8b8d378 [formerly decd1ed31f]
Former-commit-id: 00b39d0a56
2014-03-10 11:36:16 -05:00
Slav Korolev
efc3474f01 Issue #2807. Added MalformedDataException for VAA decoding.
Former-commit-id: f721d8bd64 [formerly 4a3a56abe6] [formerly 8391b1098e] [formerly f721d8bd64 [formerly 4a3a56abe6] [formerly 8391b1098e] [formerly 8f8a6cb90e [formerly 8391b1098e [formerly 085c10211b1fa397ca54b8d4d316055f9225db0c]]]]
Former-commit-id: 8f8a6cb90e
Former-commit-id: eff2290cf3 [formerly d1fbf15b5d] [formerly 54de7c7518a4017232458897aec277a7df8762f4 [formerly 1f8d00e033]]
Former-commit-id: 503580f525073718f615f1fd6630a9f0f1979c70 [formerly 6d08fd95d4]
Former-commit-id: b3ce03a711
2014-03-10 12:31:57 -04:00
Nate Jensen
c508c4d9bb Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]]
Former-commit-id: d599db4af2
Former-commit-id: d32d855bb2 [formerly 39aa26c2b6] [formerly 097c1a455c355cc0ebe8f7b95797516bfc05c8c6 [formerly 5094008bea]]
Former-commit-id: fdddd15a0dc1ec336fdf3059c126c4240f794f5c [formerly 19a0cfb972]
Former-commit-id: 6bafc51abe
2014-03-10 10:03:02 -05:00
Nate Jensen
4b1fbc1d9e Merge "Issue #2876 - move NDM plugin feature entry." into development
Former-commit-id: 63ca4e4cf8 [formerly 9026f93f20] [formerly c247535b96] [formerly 63ca4e4cf8 [formerly 9026f93f20] [formerly c247535b96] [formerly 14e4807c02 [formerly c247535b96 [formerly 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88]]]]
Former-commit-id: 14e4807c02
Former-commit-id: fdb04e7b8c [formerly 3a66c42d37] [formerly 681ab5fd62e32acfb6ad0f21394c1bf87a87d68d [formerly 9dac73c948]]
Former-commit-id: 0c8225009ec65b740207d149a8cc261c0a9fd68f [formerly ea372042a5]
Former-commit-id: 6f1981102d
2014-03-10 09:49:28 -05:00
Mike Duff
156f18d197 Issue #2876 - move NDM plugin feature entry.
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f

Former-commit-id: 5c2d6189b4 [formerly bcd4b1490d] [formerly 6be6181108] [formerly 5c2d6189b4 [formerly bcd4b1490d] [formerly 6be6181108] [formerly 2fc712e1e8 [formerly 6be6181108 [formerly a3b334c9269a9753af0f2dd9f6507aef23177b9f]]]]
Former-commit-id: 2fc712e1e8
Former-commit-id: d6e478f73e [formerly 1eefba01ab] [formerly 2cb3c387db5cc599a7efd039cccde7a292e38fbd [formerly 861013ad86]]
Former-commit-id: 713a379da26585f1d2034377c5164bd4874a48e2 [formerly 75218fb1aa]
Former-commit-id: f46a80e936
2014-03-10 09:45:04 -05:00
Nate Jensen
49d1251578 Merge "Issue #2751 ensured that room admins know real userids" into development
Former-commit-id: 181060825e [formerly 1306957f2a] [formerly e787cac9af] [formerly 181060825e [formerly 1306957f2a] [formerly e787cac9af] [formerly e963c7c4a1 [formerly e787cac9af [formerly e6feac94800c2dd82afcf42ca9f387b24514deff]]]]
Former-commit-id: e963c7c4a1
Former-commit-id: c22f8f2a07 [formerly ede24100b6] [formerly ba716a9976681eb2fe24b90c93cd383526039e18 [formerly 4dd4805e33]]
Former-commit-id: e3fccb43adb804eee9552e8406b1c63c475b17ee [formerly 3e61d24967]
Former-commit-id: 66180a8e05
2014-03-10 09:15:39 -05:00
Nate Jensen
b3a3ab1467 Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development
Former-commit-id: b98ec97406 [formerly bedb7b7653] [formerly f5a08f1f86] [formerly b98ec97406 [formerly bedb7b7653] [formerly f5a08f1f86] [formerly d04751a986 [formerly f5a08f1f86 [formerly 24492229a0bddc3db1b6945fcd2a89a486f1ef2e]]]]
Former-commit-id: d04751a986
Former-commit-id: c15c40c252 [formerly c5555eaa0c] [formerly dba28ac337f99c6e321ea3a49f0294746750950c [formerly 9c5f87dc03]]
Former-commit-id: 1daa87b6f11cca3c72b64aa3ba1b94b48020d323 [formerly bf58ef25b0]
Former-commit-id: 358658d1af
2014-03-10 09:04:51 -05:00
Ben Steffensmeier
fd2fbe839d Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]]
Former-commit-id: 8650074737
Former-commit-id: bf5b777b0d [formerly 5e4c35e93f] [formerly b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a]]
Former-commit-id: 97f709f323c3b2bc50eb72f596874288c2f388b5 [formerly a1ac082c94]
Former-commit-id: ad4ce67e85
2014-03-07 18:15:32 -06:00
Stephen Gilbert
806b78cf4d VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

Former-commit-id: 8560c21c50 [formerly 200c7e60da] [formerly 65dd8b4c3c] [formerly 8560c21c50 [formerly 200c7e60da] [formerly 65dd8b4c3c] [formerly f203a4c035 [formerly 65dd8b4c3c [formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]]]
Former-commit-id: f203a4c035
Former-commit-id: 803a4584c9 [formerly 00c1f40997] [formerly ad4b7bcc63f7e8c66ec4b0f39eea3f4a987956f1 [formerly 46ebeb9969]]
Former-commit-id: d34facf3627b4a21886984446a4d5d04222a5da1 [formerly abb11feb16]
Former-commit-id: aaa14d1b1d
2014-03-07 19:10:08 -05:00
Stephen Gilbert
e3d279329d VLab Issue #3223 - NSHARP: Improve selection operation
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d

Former-commit-id: ba4869af46 [formerly 5fcb45a629] [formerly 9a457213bb] [formerly ba4869af46 [formerly 5fcb45a629] [formerly 9a457213bb] [formerly e3aedaa1d6 [formerly 9a457213bb [formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]]]
Former-commit-id: e3aedaa1d6
Former-commit-id: fb4c74e0cd [formerly c4b73eb02e] [formerly c9da8cd134141da14e27b89961b37aff9bce21eb [formerly b1e1d9178a]]
Former-commit-id: d2c9ed404a1b1977c532dfd66aa6f8681ccc6fad [formerly 05328b9103]
Former-commit-id: 08b8f4c679
2014-03-07 19:07:28 -05:00
Stephen Gilbert
5652cbdde4 VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57

Former-commit-id: 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 49a6d6ec7e [formerly 1632166902 [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: fee37acf0c [formerly 6d40a42c39] [formerly cf3ae4ba60186788d49675c04096c67eee23603a [formerly de6e50d8e6]]
Former-commit-id: 6488fc0d38e5381f3847719213a5fbb4e7249d10 [formerly 40a62c63cd]
Former-commit-id: 5eea989db5
2014-03-07 18:49:21 -05:00
Stephen Gilbert
3787125175 VLab Issue #3221 - Fix XML serialization problems
A few problems reading/writing XML files were noticed after upgrading to
14.2.1.  This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.

Change-Id: I8aad4197029c70f72612299a25329687892884af

Former-commit-id: 6f8caa3515 [formerly cce06bfbe3] [formerly 625fcb0064] [formerly 6f8caa3515 [formerly cce06bfbe3] [formerly 625fcb0064] [formerly 6dd6ae8d36 [formerly 625fcb0064 [formerly 4f58998c899e28521658bf17dee852592c534713]]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: b69374b56d [formerly ce73240c40] [formerly 53869af84fd3c1760276c2fccf36acd25767d8aa [formerly 204d047289]]
Former-commit-id: 24c6ee760a153abacd30869121c5aeaaddae79fa [formerly ebafac1725]
Former-commit-id: e0f2f91b21
2014-03-07 18:36:42 -05:00
Steve Harris
9c0f484340 Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
2014-03-07 15:43:40 -06:00