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

4967 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
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
Mike Duff
cf0e8f39b7 Issue #2876 - Fix manifest file. 
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9

Former-commit-id: 1f70eb6704 [formerly 6ace7b364d] [formerly 618dbec585] [formerly 1f70eb6704 [formerly 6ace7b364d] [formerly 618dbec585] [formerly 4cefac4658 [formerly 618dbec585 [formerly 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48]]]]
Former-commit-id: 4cefac4658
Former-commit-id: 99856b46c8 [formerly 1d2fd0a6d2] [formerly 8710e01797310f59f4253ee7a08be657a5ac9551 [formerly 9051daf05f]]
Former-commit-id: b8bb36f5bfa9e5ce4a9b46889eabd8faa0488888 [formerly b818ea8d29]
Former-commit-id: 958290f64a
 2014-03-07 15:41:24 -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
Richard Peter
b3175adc4b Merge "Issue #2876 - Pluginize NDM review comments" into development 
Former-commit-id: 476e85b564 [formerly 946c8fcf24] [formerly 4568108a3c] [formerly 476e85b564 [formerly 946c8fcf24] [formerly 4568108a3c] [formerly c9dfa75d1c [formerly 4568108a3c [formerly 296f8f835cbc87783f0f50278d2148f756cf6296]]]]
Former-commit-id: c9dfa75d1c
Former-commit-id: d5fc2e46fb [formerly 6845ca74b3] [formerly 682620b034ca0c7daf92bbb376a4be5ccc829728 [formerly 29250be003]]
Former-commit-id: 1d8a2846aed73efe87fa5ea64d8e5b8b7ae3c808 [formerly 338f27beac]
Former-commit-id: a44a6fbe4c
 2014-03-07 13:04:14 -06:00
Mike Duff
5f1a4d958d Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 63937fa7cd [formerly 7fd9cc40c7] [formerly 944fca16b8] [formerly 63937fa7cd [formerly 7fd9cc40c7] [formerly 944fca16b8] [formerly c388cb839b [formerly 944fca16b8 [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]]]
Former-commit-id: c388cb839b
Former-commit-id: a8714addc5 [formerly 12ea05cffc] [formerly 9aea84fb4bf8ca5374b8bd4488c02898ee308de8 [formerly 7bb9ada00d]]
Former-commit-id: 406ecdd8cc99fc4788985b56f135a076f473b981 [formerly efbc53e61f]
Former-commit-id: 8c8a5f739f
 2014-03-07 12:47:46 -06:00
Brian.Dyke
15a5404df3 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 92bff38059 [formerly 48cc3b6c55] [formerly 3ac2a61218] [formerly 92bff38059 [formerly 48cc3b6c55] [formerly 3ac2a61218] [formerly 1fe5504d4c [formerly 3ac2a61218 [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 1f7e61b3df [formerly 48f1f544d6] [formerly a7d6f4f47c9df94b8ae88988530dc06d80b92b0a [formerly 0c4b9469b0]]
Former-commit-id: abc0a250d76460ad95e9e08c0cae29d6d481bfd2 [formerly 795c5424cb]
Former-commit-id: d9f1b98ce7
 2014-03-07 11:50:06 -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
Nate Jensen
e74f6da226 Merge "Issue #2756 reworked collaboration dataserver build" into development 
Former-commit-id: ff4e5b8c01 [formerly 5bc5c7cbc7] [formerly 911253bf25] [formerly ff4e5b8c01 [formerly 5bc5c7cbc7] [formerly 911253bf25] [formerly 68f8cd5ebe [formerly 911253bf25 [formerly bf17d41836aa6444a0efec811fbbb9786c0e36a1]]]]
Former-commit-id: 68f8cd5ebe
Former-commit-id: 4e466d275f [formerly ae4cc7e465] [formerly 993752a55238eb6e3283a79bb14949334b84c0e8 [formerly 46fda0511c]]
Former-commit-id: 07818cde6a76054784b38629dabec668574ace23 [formerly a9a01bb015]
Former-commit-id: a907a90ebd
 2014-03-06 16:19:23 -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 Clements
ab62759518 Issue #2756 reworked collaboration dataserver build 
replaced install ant script with build script that also deploys
new build uses feature explorer, but handles its own compile stage
updated deployment and start script to match new build
added logging level control argument


Former-commit-id: a97d1a1fb5 [formerly acbd4910fe] [formerly fac33a8915] [formerly a97d1a1fb5 [formerly acbd4910fe] [formerly fac33a8915] [formerly cde0d05820 [formerly fac33a8915 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]]]]
Former-commit-id: cde0d05820
Former-commit-id: eab142e86d [formerly 2b3aaeff26] [formerly 697372d2b5104a735c926c344d998b56abd81e2a [formerly eb54c46b3c]]
Former-commit-id: 6b56107fae632a677b51c2edb24a65ae6832f176 [formerly db510daf06]
Former-commit-id: f962ac4159
 2014-03-06 11:49:57 -06:00
Brad Gonzales
5b7c0dc9c2 Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7. 
Amend: changed to use set method.

Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1

Former-commit-id: 770f675138 [formerly cb89c806c8] [formerly 08ee82c39a] [formerly 770f675138 [formerly cb89c806c8] [formerly 08ee82c39a] [formerly b535c90a23 [formerly 08ee82c39a [formerly 5c5eb6f348627f65afc527205c5bc1f7b7463ddb]]]]
Former-commit-id: b535c90a23
Former-commit-id: 5fae9e6577 [formerly 48b19f3833] [formerly 11734a11ae5f09b05df469fcfb5ec781a7813557 [formerly e54ab69bf7]]
Former-commit-id: b4b1bb71b948bde105b429a37f563bddb6cfbb69 [formerly f122bb7ac9]
Former-commit-id: 650897cef1
 2014-03-06 10:38:30 -06:00
Brian.Dyke
24affa400b Merge 13.5.3 DR_16824 
Former-commit-id: b8a4de2bf0 [formerly 7baa5ee0d5] [formerly b8fd0f16ed] [formerly b8a4de2bf0 [formerly 7baa5ee0d5] [formerly b8fd0f16ed] [formerly dafe7e6a42 [formerly b8fd0f16ed [formerly 1b9ed749da0d1893f44e68400644f37c763e324a]]]]
Former-commit-id: dafe7e6a42
Former-commit-id: e72bd45b20 [formerly 981373f82b] [formerly efa362d2eeba660bf5dac619a16ffd73dbad64c8 [formerly 8c16576a82]]
Former-commit-id: 3a95079d38c634aa43d85134508e3d0b5d606551 [formerly bcf5bf170d]
Former-commit-id: 4e38785329
 2014-03-06 11:22:08 -05:00
Brian.Dyke
b1435c612e ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change) 
Former-commit-id: 8c54df9e0c [formerly 26fe429c4b] [formerly 1778d20745] [formerly 8c54df9e0c [formerly 26fe429c4b] [formerly 1778d20745] [formerly 010b7a1df5 [formerly 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]]
Former-commit-id: 010b7a1df5
Former-commit-id: df3291e0b4 [formerly 14844a10b6] [formerly 0ef04c99b170216a3f24341f708895d2df66d675 [formerly c6dae5a81f]]
Former-commit-id: 2a8a80f5ec679fb777138b8501782bf43dc7de32 [formerly 863de85b6b]
Former-commit-id: 0c6ba63abc
 2014-03-06 11:04:34 -05:00
Brian.Dyke
9762ca9d59 ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf) 
Former-commit-id: e5972b7159 [formerly 6313b7af0c] [formerly 2dbac1697d] [formerly e5972b7159 [formerly 6313b7af0c] [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly 2dbac1697d [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: b2cd2711f9 [formerly 57a28e817d] [formerly 92fbb4b7ccf0b4c7c32f6ac2ac82358fc9c89c38 [formerly 3fdb85c62d]]
Former-commit-id: ed9a44ece7652bc19f6481662d2caead4061477f [formerly 6f5baf3984]
Former-commit-id: 36e0ad0fdd
 2014-03-06 10:56:44 -05: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
79318a52fb Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development 
Former-commit-id: 1674fb814c [formerly 01ce4ffeca] [formerly bc0b6ca067] [formerly 1674fb814c [formerly 01ce4ffeca] [formerly bc0b6ca067] [formerly f60fba58b1 [formerly bc0b6ca067 [formerly 0bc02d3ad06b0c0daddefd9550772c79687edfb7]]]]
Former-commit-id: f60fba58b1
Former-commit-id: 8b23913692 [formerly 0a088273aa] [formerly 9d8889db25a9480b0553b929fae31428f2466932 [formerly 59a152c613]]
Former-commit-id: 0d46e9156d75b7bb8155aaf9ac8afc41e1805ee4 [formerly 821932a07a]
Former-commit-id: cc331b4a72
 2014-03-05 15:44:36 -06:00
Brian Clements
6e79ad72ad Issue #2702 replaced openfire source tarball with 3.9.1 
removed 3.7.1 source from git
added 3.9.1 tarballs to /awipscm/awips2-static (coordinated with CM)
tweaked ant build to fetch source tarball when building plugins
replaced openfire cots jar with new version (only used for eclipse)


Former-commit-id: e4d22971bd [formerly bc8ac5e051] [formerly ad3d10074a] [formerly e4d22971bd [formerly bc8ac5e051] [formerly ad3d10074a] [formerly e1819cd4e2 [formerly ad3d10074a [formerly d8f30a7af43faa2fd4ac18769d2313ae6008cfd1]]]]
Former-commit-id: e1819cd4e2
Former-commit-id: 2267c2bb0b [formerly 410ebf65f5] [formerly 3beb79dabe2b4fee26bcf793ea28d3ef4e8cebb4 [formerly 3f0115d329]]
Former-commit-id: df339242e5ac9d41f04d641662b3a15d2535f802 [formerly 544c713135]
Former-commit-id: 4a9c85e7ac
 2014-03-05 15:29:27 -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