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

2857 commits

Author SHA1 Message Date
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
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 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
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
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
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
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
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
Brian Clements
e81c8368dd Issue #2751 ensured that room admins know real userids 
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer


Former-commit-id: 8aff9ee95c [formerly 2afc1a9319] [formerly 44d161729f] [formerly 8aff9ee95c [formerly 2afc1a9319] [formerly 44d161729f] [formerly dc94769c14 [formerly 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]]
Former-commit-id: dc94769c14
Former-commit-id: cfe64d833a [formerly acb20cfbbe] [formerly 7e2fb485cd2c4586601a3aa2ff0a182aaca10fab [formerly ac63129ad1]]
Former-commit-id: f030c8528ac78571000ec83546e396d509e9d0ae [formerly 6590587d9e]
Former-commit-id: 975bfca460
 2014-03-07 15:37:29 -06:00
Steve Harris
3348f6857a Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
20c67c86e1 ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]]
Former-commit-id: dc3aadd149
Former-commit-id: e33de27296 [formerly 68d8f9be14] [formerly f304d2fa3946f5a199255a03597cdc0f3f79d636 [formerly 05bb380e77]]
Former-commit-id: 701e61da1838f2875ec87860a05500044bd28ae9 [formerly 26a112b34b]
Former-commit-id: db1c090463
 2014-03-07 12:57:36 -05:00
Brian.Dyke
603695a2a4 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: eb6abe6faa [formerly fa189c0ef6] [formerly e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2]]
Former-commit-id: c243cc113e92d596862d61e7a6a2878bf1eafda3 [formerly c8b3730fef]
Former-commit-id: ac07a4fc49
 2014-03-07 09:01:09 -05:00
Brian.Dyke
b8ee763baa Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]]
Former-commit-id: 6414bdab57
Former-commit-id: 50621ec3e5 [formerly 2eec413d72] [formerly 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]]
Former-commit-id: d006a47edee1a1939aadf15ef61024f22a80931d [formerly 8f2271403d]
Former-commit-id: da36dde938
 2014-03-07 08:57:07 -05:00
Brian.Dyke
ed94e1bc6b 14.1.1-22 baseline 
Former-commit-id: 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 3c9cde458a [formerly 9406a1d6c0] [formerly f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60]]
Former-commit-id: 385ffc492ff49872acfb40d1c47fffb7dff76ec2 [formerly 067802b104]
Former-commit-id: c1dab50ce0
 2014-03-07 08:49:00 -05:00
Steve Harris
2acd9aac73 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 08dbf1f7ea [formerly dc7d6ceced] [formerly 8b6263bfbd] [formerly 08dbf1f7ea [formerly dc7d6ceced] [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]]
Former-commit-id: 1c64a5c025
Former-commit-id: 3f778f9f9f [formerly 972fa3bee6] [formerly ce9b772480f62374b4f578a3aa3691569ae98b58 [formerly 7fbbc1e118]]
Former-commit-id: 4dd289fbedb14cff7837a7f1aeed66c5959e4ee1 [formerly 7f932399b9]
Former-commit-id: d65c768373
 2014-03-06 18:31:10 -06:00
Steve Harris
f7a15a87e5 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 93aa41a34b [formerly 3358e8d6ef] [formerly 7f1ad89df9] [formerly 93aa41a34b [formerly 3358e8d6ef] [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 3715195901 [formerly 2371a74a29] [formerly 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6 [formerly 8ec20fc5e9]]
Former-commit-id: 550b2170a0e7b2252cdcb3421b25e5704cf2cdac [formerly 104b3d369a]
Former-commit-id: 71c8e15b78
 2014-03-06 18:19:55 -06:00
Nate Jensen
8086172968 Issue #2826 fix collaboration mosaic image disposed issue 
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: 95bc80c8d0 [formerly d9af17287d] [formerly 7fa8bf636f] [formerly 95bc80c8d0 [formerly d9af17287d] [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 7fa8bf636f [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: 488451e9aa [formerly cb81644412] [formerly 41f274281fde4fea1d15e1e1d46e9ffa39d95f5d [formerly 04d7ef0e7a]]
Former-commit-id: 8fdf2bb6022e36b9b68b7b679abfa23d5a4fd59e [formerly 69bdf2bd60]
Former-commit-id: 45ff104294
 2014-03-06 18:07:40 -06:00
Brad Gonzales
81c47e89ba Issue #2885 Updated java version in build.properties.p2. 
Change-Id: Ifb266696902142ab59977025ae75010540836ed5

Former-commit-id: 5cdaee1f29 [formerly dadcd2e10b] [formerly 2e224094ad] [formerly 5cdaee1f29 [formerly dadcd2e10b] [formerly 2e224094ad] [formerly b47dc5df40 [formerly 2e224094ad [formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]]]
Former-commit-id: b47dc5df40
Former-commit-id: 57edccd75d [formerly 574f6f8d92] [formerly ed7d205dcc0e144d1e2e5f8235030437d4f247ca [formerly 66386f340a]]
Former-commit-id: 17ffdf3bef26803fabc92808abfef89b3f6355e2 [formerly 7b3b48d9b3]
Former-commit-id: c50ea20d9e
 2014-03-06 17:35:43 -06:00
Brad Gonzales
e7295b16d2 Issue #2885 Updated all of the PDE builds to Java 1.7. 
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly dea17a19da [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]
Former-commit-id: dea17a19da
Former-commit-id: 09c083ce1f [formerly 4ba60d8a6f] [formerly f2869efb05c763771e03bc02057aa196d29b6d1a [formerly 78d35d4033]]
Former-commit-id: f70dd002a68a434eb5e81131bb0b82d4784e717e [formerly c4064160ec]
Former-commit-id: 4cbc3b1b05
 2014-03-06 16:29:37 -06:00
Ben Steffensmeier
6bdb5c5ea9 Issue #2831 Fix No Data Value in collaboration images. 
Former-commit-id: 0d05c6135b [formerly c9eb976b65] [formerly 82b8790050] [formerly 0d05c6135b [formerly c9eb976b65] [formerly 82b8790050] [formerly 6962f80c5a [formerly 82b8790050 [formerly 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c]]]]
Former-commit-id: 6962f80c5a
Former-commit-id: d2ded3028f [formerly 346cd75e59] [formerly 9ff7588f62c742568fc0192bed734c0aadbb6bad [formerly 062e3ddb48]]
Former-commit-id: 88261a1aea851feb7c5351fb5280d06aaf345964 [formerly 4bc84e916d]
Former-commit-id: abc97d429c
 2014-03-06 13:37:08 -06:00
Brian.Dyke
db44e7f0ec ASM #124 - Display GLD360 lightning data 
Former-commit-id: 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly eefe8c45fe [formerly db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 6ef9f7fd37 [formerly 26140187b1] [formerly 44a38ade0727afc9f135777d46659f273033a036 [formerly b657767cb1]]
Former-commit-id: 5fde31dc71e51a7f747df35d265aff302392ec26 [formerly b9e9126e11]
Former-commit-id: 8de6b2d57b
 2014-03-06 10:54:15 -05:00
Steve Harris
a19beb1e5d Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
 2014-03-06 08:39:43 -06:00
Nate Jensen
9e5f1cd87d Merge "Issue #2791 Move D2D Grids to direct memory." into development 
Former-commit-id: 451a7fe552 [formerly 0d547ab0bf] [formerly be9cc9397f] [formerly 451a7fe552 [formerly 0d547ab0bf] [formerly be9cc9397f] [formerly a91e941d3e [formerly be9cc9397f [formerly acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c]]]]
Former-commit-id: a91e941d3e
Former-commit-id: 8e316de47f [formerly 76ded096a8] [formerly 266a7471ea5ed64f00aec1ecc850d972c7695845 [formerly fb50424456]]
Former-commit-id: 3825e78867b11b21650e3ba6a3d9b336e1daaba6 [formerly 7bb56ce041]
Former-commit-id: f19837e0ed
 2014-03-05 15:02:46 -06:00
Ben Steffensmeier
0b48d33f0b Issue #2791 Move D2D Grids to direct memory. 
Former-commit-id: 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 775c29e77c [formerly 12ed63619a [formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]]
Former-commit-id: 775c29e77c
Former-commit-id: ceb056d304 [formerly 2bc8805fbc] [formerly e70e825d566372eb4b060f189bea9a1c2b022f0d [formerly a06a98750f]]
Former-commit-id: a89a30db3acd3cf5e17ecb35b2b039bc72f90b99 [formerly 3f62075baa]
Former-commit-id: ab265087eb
 2014-03-05 14:57:28 -06:00
Nate Jensen
2bc7230179 Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development 
Former-commit-id: dcbafebc0d [formerly ae9adefbf7] [formerly cf4631f9bf] [formerly dcbafebc0d [formerly ae9adefbf7] [formerly cf4631f9bf] [formerly 48fa8f8d1b [formerly cf4631f9bf [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]]]
Former-commit-id: 48fa8f8d1b
Former-commit-id: ddebec5791 [formerly b097d488ca] [formerly 81dc1f611ab2e4fba7afbbabdd044e8afece9c33 [formerly d3f18729c3]]
Former-commit-id: 7efdb261cff848db48e2d71cacdd8d5280fbeb1f [formerly 8380226f6b]
Former-commit-id: f84030e2b7
 2014-03-05 14:41:12 -06:00
Mike Duff
f061ae43a1 Issue #2798 - Fix user presence messages and settings 
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: ec892bb7a7 [formerly 25425a4268] [formerly e97e745b61] [formerly ec892bb7a7 [formerly 25425a4268] [formerly e97e745b61] [formerly 9c873e6dd9 [formerly e97e745b61 [formerly b087558dce4e19596c93d47e986af50fae806a74]]]]
Former-commit-id: 9c873e6dd9
Former-commit-id: b88162e504 [formerly 0251ad5bca] [formerly acfecc3a2b5c6336080649496608081ffae17a97 [formerly c0bf150e15]]
Former-commit-id: 96b5f8c7c3c165fba26eb85059fdf5317d2287b5 [formerly 15c32a1513]
Former-commit-id: 8a798710c5
 2014-03-05 14:39:55 -06:00
Nate Jensen
222c9cce6d Merge "Issue #2861 added synchronized blocks where necessary" into development 
Former-commit-id: d0fd1154d4 [formerly 54d015cb4f] [formerly 59dcb3a97d] [formerly d0fd1154d4 [formerly 54d015cb4f] [formerly 59dcb3a97d] [formerly 2eea0b9205 [formerly 59dcb3a97d [formerly e108aa41bb586593f50970da53109a82d2bb8452]]]]
Former-commit-id: 2eea0b9205
Former-commit-id: 12e353a3d6 [formerly 2def452e2c] [formerly dbdb17eebbf238d2f134aa977e9bff14bc685964 [formerly 17ee130b2a]]
Former-commit-id: 5c28c8136285e34a68583c52929831d84fd9bf5c [formerly f8e7bfa835]
Former-commit-id: d7b438bccf
 2014-03-05 14:14:25 -06:00
Max Schenkelberg
d26bd1b3d6 Issue #2861 added synchronized blocks where necessary 
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811

Former-commit-id: 1dad35e391 [formerly 83ac37724e] [formerly 10bfa59aef] [formerly 1dad35e391 [formerly 83ac37724e] [formerly 10bfa59aef] [formerly b5ed7ac361 [formerly 10bfa59aef [formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]]]
Former-commit-id: b5ed7ac361
Former-commit-id: 035d96ce04 [formerly a8b436c867] [formerly 71e348fc3ebb000927a4b5fcacb3a3ed1a3931df [formerly 0fbc2df17d]]
Former-commit-id: 8592b8675d7935c017f6b4c0dadcc51fc7542fa0 [formerly 9b26076206]
Former-commit-id: 7f9bea7552
 2014-03-05 13:51:06 -06:00
Mike Duff
fd2f53f5cf Issue #2632 - Fix problem with multiple notifiers per user. 
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: a670398424 [formerly 14107f0914] [formerly 8c693a5f70] [formerly a670398424 [formerly 14107f0914] [formerly 8c693a5f70] [formerly 9963324b60 [formerly 8c693a5f70 [formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]]]]
Former-commit-id: 9963324b60
Former-commit-id: 1c0d844dc2 [formerly 198d9e6780] [formerly fd61ded4da051608ff2b758971fbc5bacbaca791 [formerly 3bdf20dea3]]
Former-commit-id: fad3c8f0caa37c2db8f82dd2e72cb5514148ddc8 [formerly 85ac8c85e0]
Former-commit-id: c6e743bbc1
 2014-03-05 12:02:33 -06:00
Nate Jensen
4d29d2ee80 Merge "Issue #2843 Harden recycle." into development 
Former-commit-id: c65bb2a011 [formerly 09311b8270] [formerly 7a2a489c77] [formerly c65bb2a011 [formerly 09311b8270] [formerly 7a2a489c77] [formerly 308ab7c314 [formerly 7a2a489c77 [formerly c36359b0aaa1540f6d941e9445b41ed929a91e14]]]]
Former-commit-id: 308ab7c314
Former-commit-id: b6d570e336 [formerly d07da4c425] [formerly 60f7401ff670afef592b5d2107984da7668e6b19 [formerly d82a7d3640]]
Former-commit-id: 747d4abf8bb0abb04dd0861ac5346dbfb232b880 [formerly d4305f1578]
Former-commit-id: e97545fd54
 2014-03-05 11:41:05 -06:00
Ben Steffensmeier
424d4da21f Issue #2843 Harden recycle. 
Former-commit-id: 291d5f55df [formerly 22adc336df] [formerly 26c1a8e494] [formerly 291d5f55df [formerly 22adc336df] [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 26c1a8e494 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: be60a9564d [formerly ed0ec90407] [formerly 202049adf2dd36c8c9f4cee72fdf77a6f408f169 [formerly af1bdf1b53]]
Former-commit-id: 8c49c3bbe4c3c8e4454bff4e5d906233823d63d5 [formerly 2c687a4064]
Former-commit-id: 4b966138f6
 2014-03-05 11:16:12 -06:00
Brian Clements
e75dde54ab Issue #2837 collaboration icon changes 
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: 17661200a1 [formerly d76dd2a8f6] [formerly c0e4615967] [formerly 17661200a1 [formerly d76dd2a8f6] [formerly c0e4615967] [formerly c9906cde88 [formerly c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]]
Former-commit-id: c9906cde88
Former-commit-id: f4a6d2a30d [formerly 3d4323b447] [formerly 1d8422aecbe75d313717ff186a0a87becafd9906 [formerly d06182573e]]
Former-commit-id: eca406e298a4b6e7098a2a7b0f34a68bbede8557 [formerly dec443b1af]
Former-commit-id: 6dc478d975
 2014-03-05 09:00:57 -06:00
Lee Venable
fadccce7dc Issue #2833 - fixed a widget disposed error. 
Former-commit-id: 3c85140ba0 [formerly f38afb0976] [formerly e71dad9c80] [formerly 3c85140ba0 [formerly f38afb0976] [formerly e71dad9c80] [formerly 980e21ca5a [formerly e71dad9c80 [formerly eb3cf0ade9203766a437512b85e55f32108db1e3]]]]
Former-commit-id: 980e21ca5a
Former-commit-id: 8cd4bc1705 [formerly 3966bc355c] [formerly 992ef4747311d55c577dcc1e3ae1650fbf7416ad [formerly 98daa663b4]]
Former-commit-id: d18a297a33ea753e8022b130be13924780e330ac [formerly 7e45b908af]
Former-commit-id: 4b81954f16
 2014-03-05 08:37:13 -06:00
Nate Jensen
2a3734d8f1 Merge "Issue #2832 fix watches and warnings in collaboration displays" into development 
Former-commit-id: 6b4d16b750 [formerly 8ebe236ce9] [formerly 67fa21cfd9] [formerly 6b4d16b750 [formerly 8ebe236ce9] [formerly 67fa21cfd9] [formerly faf3dbb670 [formerly 67fa21cfd9 [formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]]]
Former-commit-id: faf3dbb670
Former-commit-id: 12f218292c [formerly 0b827a343b] [formerly b1b15434c34d3a515d2e371f1abe646a64b39293 [formerly ddf96ad45b]]
Former-commit-id: d8ea0cb6bbb64296de147485da1e59278c68db60 [formerly c427ff8471]
Former-commit-id: 6d836f5d82
 2014-03-04 13:59:01 -06:00
Nate Jensen
1152408b08 Issue #2832 fix watches and warnings in collaboration displays 
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: 41d80f6fce [formerly 559b1794af] [formerly e3d211c8d7] [formerly 41d80f6fce [formerly 559b1794af] [formerly e3d211c8d7] [formerly 3c3e483d18 [formerly e3d211c8d7 [formerly bb84ca01bb74bc93710ba92fcbdb13b30dc2454e]]]]
Former-commit-id: 3c3e483d18
Former-commit-id: 0094132846 [formerly e08b21fc40] [formerly f48033e99ccba349f23f107d1871ca7961b89c90 [formerly 4c0df85caf]]
Former-commit-id: 1eb150c96f1ae70e476c5e05424388ca1a5e9caa [formerly 21d3110c28]
Former-commit-id: fb903ade0b
 2014-03-04 13:18:16 -06:00
Richard Peter
9bacf68628 Merge "Issue #2791 Use Data Source for all grid data access." into development 
Former-commit-id: 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 873fa00fac [formerly f87a913017 [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]]
Former-commit-id: 873fa00fac
Former-commit-id: 7e096adc4a [formerly 3a96d0758a] [formerly 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154 [formerly 2a5b0fb3ba]]
Former-commit-id: 20555b967806297585643060463c34a49a7adbb0 [formerly dfa3f06e8e]
Former-commit-id: 13bad4e99e
 2014-03-04 12:43:17 -06:00
Nate Jensen
af047be03c Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development 
Former-commit-id: b0e727938b [formerly 75611f0631] [formerly f50a2789dd] [formerly b0e727938b [formerly 75611f0631] [formerly f50a2789dd] [formerly 7ac7dd5f01 [formerly f50a2789dd [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: b3a4e1d562 [formerly 44e9b34927] [formerly 9ffb218b0f72703775dd6d2766c567fee092b78a [formerly a2b3bc717e]]
Former-commit-id: 87a0bdce28aac08b5040af41b1ac94bb28c275ad [formerly cb9d2a3298]
Former-commit-id: 1d27417675
 2014-03-04 10:55:05 -06:00
Brian.Dyke
c8111a7ebb OB_14.1.1-21 baseline 
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c1ef56e0d7 [formerly c68649b4f9] [formerly 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]]
Former-commit-id: db6e513aaa9a15a7b11a5aee1b3716c9a5587928 [formerly 079cc93f89]
Former-commit-id: ea56516bf5
 2014-03-04 11:47:42 -05:00
Max Schenkelberg
7c66cf792b Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values. 
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26 [formerly 39e1c4fa46] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134]
Former-commit-id: c6cf08db73
 2014-03-04 09:23:36 -06:00
Max Schenkelberg
bee18f29d0 Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done. 
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: c37910a689 [formerly bff80c3ee9] [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]]
Former-commit-id: ac56a95b831199d75f4f7799c88a6cd9f119118f [formerly 96bdc00728]
Former-commit-id: 83103254e7
 2014-03-03 17:59:48 -06:00
Nate Jensen
662883bd88 Issue #2792 enforce getDensity() will not return above max 
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: 0044c21ad5 [formerly 7f31e34dc9] [formerly 384b531d26] [formerly 0044c21ad5 [formerly 7f31e34dc9] [formerly 384b531d26] [formerly 22153d43bb [formerly 384b531d26 [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]]
Former-commit-id: 22153d43bb
Former-commit-id: 47deb8f80c [formerly e40fbf0ba0] [formerly 8163999a8004a10d68d6b96b3ec92494a440eed2 [formerly 58c9dc0c69]]
Former-commit-id: c5c84333b34bdec81881012dcde557968d4e96f1 [formerly 6f488f855f]
Former-commit-id: 224fd09dab
 2014-03-03 14:44:16 -06:00
Brian Clements
dbb33ceac2 Issue #2667 fixed bin lightning menus 
the column name for the source of the lightning data was changed


Former-commit-id: dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]]
Former-commit-id: 7a7d476899
Former-commit-id: 472d08d2ad [formerly bf4c119278] [formerly dbc2261d04afbbeaa80308981a4752188bec6977 [formerly 724bafd44f]]
Former-commit-id: fcbaab390c314bd0db75b372cf855bd45a12a942 [formerly dc8667011b]
Former-commit-id: 44fdea985e
 2014-03-03 13:17:05 -06:00
Ben Steffensmeier
c8bb28c753 Issue #2791 Use Data Source for all grid data access. 
Former-commit-id: 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 05770129c1 [formerly 6fa441396f [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]]
Former-commit-id: 05770129c1
Former-commit-id: 374ad2c1e8 [formerly 72b117cf42] [formerly bc40fd62dff2b342470d96a6441fc6239af6c193 [formerly 4094ef6170]]
Former-commit-id: bdf87913f359fbfcf11e0a003cf174b9addc76f9 [formerly c6f1b922b2]
Former-commit-id: a19e960342
 2014-02-28 17:06:33 -06:00
Brian Clements
e9604a9700 Issue #2756 implemented HTTP public key auth scheme 
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: 43c19f09ba [formerly f56cbac9fb] [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]]
Former-commit-id: 667a1021c89300b5befe11701d18fc1d06fbb6bb [formerly 6d4abdc37c]
Former-commit-id: f00f8eb1d9
 2014-02-28 16:15:17 -06:00
Lee Venable
ba565d1d35 Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development 
Former-commit-id: 4631a29ca3 [formerly 40f3df6aff] [formerly f171e3adb0] [formerly 4631a29ca3 [formerly 40f3df6aff] [formerly f171e3adb0] [formerly c77634951c [formerly f171e3adb0 [formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]]
Former-commit-id: c77634951c
Former-commit-id: 639f66e8b2 [formerly 67f7d52f74] [formerly 2fb1bf66c74a373156ea360fd8e8e80b7e7e7b74 [formerly 734f69403a]]
Former-commit-id: 7099b3f18e114b9e5e6354c85499d065bd3bc5df [formerly 7bbedd6edd]
Former-commit-id: 1ffa59cf4f
 2014-02-28 13:50:15 -06:00