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

5127 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Harris
15035a01cc Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development 
Former-commit-id: d8badc8bea [formerly e62a399e9f] [formerly 4c52fb5bb3] [formerly cfc9fea413 [formerly 4c52fb5bb3 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]
Former-commit-id: cfc9fea413
Former-commit-id: 47d576172614afbe5d714782f88cfa8fc696489d [formerly 57f2a3204e]
Former-commit-id: 0c0bc58b3e
 2014-03-10 16:01:16 -05:00
Ben Steffensmeier
d2ab10b037 Issue #2867 Better validation of image export frame range. 
Former-commit-id: 3a92ec7284 [formerly bde80aec1b] [formerly e75b961db5] [formerly cc8b71fbdf [formerly e75b961db5 [formerly 6a3a62b913de1d508fb0d470d06a8be4a61918a3]]]
Former-commit-id: cc8b71fbdf
Former-commit-id: e808a55480a4efe5ce4ecf95f2e66eabb231b4c8 [formerly 9c82499818]
Former-commit-id: 77e3f15d0b
 2014-03-10 15:24:07 -05:00
Ben Steffensmeier
60506ffe8a Issue #2791 Add numeric to alertViz feature. 
Former-commit-id: 6280932901 [formerly 525f6b19bf] [formerly f88e1c329e] [formerly 2f75103635 [formerly f88e1c329e [formerly 9918eeec97938cbc7c703738800521773fbb4a87]]]
Former-commit-id: 2f75103635
Former-commit-id: 3705b85b6fa911d7173a7bcd00ef46993c1ad2e6 [formerly eaa570c3f2]
Former-commit-id: db9729ef73
 2014-03-10 14:55:54 -05:00
Brian.Dyke
3667299983 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 4269f9d875 [formerly c6f2010ce6 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]]
Former-commit-id: 4269f9d875
Former-commit-id: 738fc5f415c773f7bde24fd1a60b618f33307d23 [formerly a453d3fd68]
Former-commit-id: c26c40d6e3
 2014-03-10 15:42:38 -04:00
brian.dyke
41a37605d4 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 b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]
Former-commit-id: d1b389ae05
 2014-03-10 15:36:56 -04:00
Brian.Dyke
d197a72c20 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 fda6ab1344 [formerly d710aec521 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]
Former-commit-id: fda6ab1344
Former-commit-id: 6ec1b00cf64c71cead90fca582edef188ec24710 [formerly 0aff5875b0]
Former-commit-id: c5502af3fa
 2014-03-10 15:14:59 -04:00
Brian Clements
67db5cb4f8 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 aee98ecfb0 [formerly dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]
Former-commit-id: aee98ecfb0
Former-commit-id: eb63cfebccc689b3ac62c518759624fc43c5c7b9 [formerly 4f9a2577f2]
Former-commit-id: 3486f1f241
 2014-03-10 14:06:45 -05:00
Nate Jensen
8193df431d Merge "Issue #2673 Fix name of lighning data factory." into development 
Former-commit-id: 8275d3591f [formerly c2c596b6bc] [formerly 43de990a4c] [formerly 873f06e85e [formerly 43de990a4c [formerly 5c828c0ddfdf6e29ddfaf706409edda5fb307ade]]]
Former-commit-id: 873f06e85e
Former-commit-id: 7eacbf882dab2b1f96227ef8852150b11dae8ecf [formerly ffbc63b67a]
Former-commit-id: 5e3ecd33fa
 2014-03-10 13:53:45 -05:00
Nate Jensen
ba37e2937d Merge "Issue #2832 consolidate watch and warning recycle logic" into development 
Former-commit-id: e56dfc35c4 [formerly 89cdc44635] [formerly 9cb27d5e95] [formerly 2570c295d5 [formerly 9cb27d5e95 [formerly 4029d0d863bf6da254859028353a271dec70e335]]]
Former-commit-id: 2570c295d5
Former-commit-id: dcb2d2450927fda01dd0d5edc5f961b453d88fb4 [formerly cab7dadbe8]
Former-commit-id: f48251da57
 2014-03-10 13:52:53 -05:00
Ben Steffensmeier
451db7a75e Issue #2673 Fix name of lighning data factory. 
Former-commit-id: a410e3457f [formerly 89eeb243ec] [formerly 019cf9c943] [formerly bd7d250cec [formerly 019cf9c943 [formerly 86e3270b88336978cfa799fae402aa350b6dcac2]]]
Former-commit-id: bd7d250cec
Former-commit-id: 68fb71573c7e3fdcf136433cfbecbd7de8b1ba2f [formerly abad6524ed]
Former-commit-id: 93b5fba876
 2014-03-10 13:35:34 -05:00
Nate Jensen
43fbd5573a Issue #2832 consolidate watch and warning recycle logic 
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889

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

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

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

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

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

Former-commit-id: 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 49a6d6ec7e [formerly 1632166902 [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: cf3ae4ba60186788d49675c04096c67eee23603a [formerly de6e50d8e6]
Former-commit-id: 6d40a42c39
 2014-03-07 18:49:21 -05:00
Stephen Gilbert
b69374b56d 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 6dd6ae8d36 [formerly 625fcb0064 [formerly 4f58998c899e28521658bf17dee852592c534713]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: 53869af84fd3c1760276c2fccf36acd25767d8aa [formerly 204d047289]
Former-commit-id: ce73240c40
 2014-03-07 18:36:42 -05:00
Steve Harris
edeb1833ae 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 f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]
Former-commit-id: c24108e75b
 2014-03-07 15:43:40 -06:00
Mike Duff
99856b46c8 Issue #2876 - Fix manifest file. 
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9

Former-commit-id: 1f70eb6704 [formerly 6ace7b364d] [formerly 618dbec585] [formerly 4cefac4658 [formerly 618dbec585 [formerly 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48]]]
Former-commit-id: 4cefac4658
Former-commit-id: 8710e01797310f59f4253ee7a08be657a5ac9551 [formerly 9051daf05f]
Former-commit-id: 1d2fd0a6d2
 2014-03-07 15:41:24 -06:00
Brian Clements
cfe64d833a 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 dc94769c14 [formerly 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]
Former-commit-id: dc94769c14
Former-commit-id: 7e2fb485cd2c4586601a3aa2ff0a182aaca10fab [formerly ac63129ad1]
Former-commit-id: acb20cfbbe
 2014-03-07 15:37:29 -06:00
Steve Harris
a94f800324 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]
Former-commit-id: 4d1fbf8743
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
1acdbf20f2 ASM #224 - WarnGen: OB13.5.2 Template Errors 
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: bd02f6a1a6 [formerly e894b1279a] [formerly 41a4905f9f] [formerly 56a949fba8 [formerly 41a4905f9f [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]]
Former-commit-id: 56a949fba8
Former-commit-id: 8e558f4668f969675b3426aa8d9a1fd8674746ec [formerly aa827610b1]
Former-commit-id: 84b71d7252
 2014-03-07 14:53:54 -05:00
Richard Peter
d5fc2e46fb Merge "Issue #2876 - Pluginize NDM review comments" into development 
Former-commit-id: 476e85b564 [formerly 946c8fcf24] [formerly 4568108a3c] [formerly c9dfa75d1c [formerly 4568108a3c [formerly 296f8f835cbc87783f0f50278d2148f756cf6296]]]
Former-commit-id: c9dfa75d1c
Former-commit-id: 682620b034ca0c7daf92bbb376a4be5ccc829728 [formerly 29250be003]
Former-commit-id: 6845ca74b3
 2014-03-07 13:04:14 -06:00
Mike Duff
a8714addc5 Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 63937fa7cd [formerly 7fd9cc40c7] [formerly 944fca16b8] [formerly c388cb839b [formerly 944fca16b8 [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]]
Former-commit-id: c388cb839b
Former-commit-id: 9aea84fb4bf8ca5374b8bd4488c02898ee308de8 [formerly 7bb9ada00d]
Former-commit-id: 12ea05cffc
 2014-03-07 12:47:46 -06:00
Shawn.Hooper
d549088e33 ASM #377 - Baseline National River Location Database fails 
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 94e4e3e649 [formerly 6a8a1c397b] [formerly 670da1895b] [formerly 85db05e819 [formerly 670da1895b [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]]
Former-commit-id: 85db05e819
Former-commit-id: 32e11e96551b8e3081b3d4dde88e4590083e6392 [formerly 62a0c1dadf]
Former-commit-id: b7cf50dd31
 2014-03-07 13:12:11 -05:00
Shawn.Hooper
e33de27296 ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]
Former-commit-id: dc3aadd149
Former-commit-id: f304d2fa3946f5a199255a03597cdc0f3f79d636 [formerly 05bb380e77]
Former-commit-id: 68d8f9be14
 2014-03-07 12:57:36 -05:00
Brian.Dyke
1f7e61b3df 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 1fe5504d4c [formerly 3ac2a61218 [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: a7d6f4f47c9df94b8ae88988530dc06d80b92b0a [formerly 0c4b9469b0]
Former-commit-id: 48f1f544d6
 2014-03-07 11:50:06 -05:00
David Friedman
951bd668ae ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: b8aadf1781 [formerly 103fece7b7] [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]
Former-commit-id: a58f3cb7df
Former-commit-id: 38bf85175bedb3976ea85ab928e8bdea8f6e4a64 [formerly 2a4a92c223]
Former-commit-id: 91b22ff9bb
 2014-03-07 14:58:09 +00:00
Brian.Dyke
eb6abe6faa Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2]
Former-commit-id: fa189c0ef6
 2014-03-07 09:01:09 -05:00
Brian.Dyke
50621ec3e5 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]
Former-commit-id: 2eec413d72
 2014-03-07 08:57:07 -05:00
Brian.Dyke
3c9cde458a 14.1.1-22 baseline 
Former-commit-id: 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60]
Former-commit-id: 9406a1d6c0
 2014-03-07 08:49:00 -05:00
Steve Harris
3f778f9f9f Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 08dbf1f7ea [formerly dc7d6ceced] [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: ce9b772480f62374b4f578a3aa3691569ae98b58 [formerly 7fbbc1e118]
Former-commit-id: 972fa3bee6
 2014-03-06 18:31:10 -06:00
Steve Harris
3715195901 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 93aa41a34b [formerly 3358e8d6ef] [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6 [formerly 8ec20fc5e9]
Former-commit-id: 2371a74a29
 2014-03-06 18:19:55 -06:00
Nate Jensen
488451e9aa Issue #2826 fix collaboration mosaic image disposed issue 
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: 95bc80c8d0 [formerly d9af17287d] [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 7fa8bf636f [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: 41f274281fde4fea1d15e1e1d46e9ffa39d95f5d [formerly 04d7ef0e7a]
Former-commit-id: cb81644412
 2014-03-06 18:07:40 -06:00
Brad Gonzales
57edccd75d Issue #2885 Updated java version in build.properties.p2. 
Change-Id: Ifb266696902142ab59977025ae75010540836ed5

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

Former-commit-id: 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly dea17a19da [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]
Former-commit-id: dea17a19da
Former-commit-id: f2869efb05c763771e03bc02057aa196d29b6d1a [formerly 78d35d4033]
Former-commit-id: 4ba60d8a6f
 2014-03-06 16:29:37 -06:00
Nate Jensen
4e466d275f Merge "Issue #2756 reworked collaboration dataserver build" into development 
Former-commit-id: ff4e5b8c01 [formerly 5bc5c7cbc7] [formerly 911253bf25] [formerly 68f8cd5ebe [formerly 911253bf25 [formerly bf17d41836aa6444a0efec811fbbb9786c0e36a1]]]
Former-commit-id: 68f8cd5ebe
Former-commit-id: 993752a55238eb6e3283a79bb14949334b84c0e8 [formerly 46fda0511c]
Former-commit-id: ae4cc7e465
 2014-03-06 16:19:23 -06:00
Ben Steffensmeier
d2ded3028f Issue #2831 Fix No Data Value in collaboration images. 
Former-commit-id: 0d05c6135b [formerly c9eb976b65] [formerly 82b8790050] [formerly 6962f80c5a [formerly 82b8790050 [formerly 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c]]]
Former-commit-id: 6962f80c5a
Former-commit-id: 9ff7588f62c742568fc0192bed734c0aadbb6bad [formerly 062e3ddb48]
Former-commit-id: 346cd75e59
 2014-03-06 13:37:08 -06:00
Brian Clements
eab142e86d 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 cde0d05820 [formerly fac33a8915 [formerly 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e]]]
Former-commit-id: cde0d05820
Former-commit-id: 697372d2b5104a735c926c344d998b56abd81e2a [formerly eb54c46b3c]
Former-commit-id: 2b3aaeff26
 2014-03-06 11:49:57 -06:00
David Friedman
3d09743022 ASM #74 - Fix RadarServer configuration import utility JAR dependency 
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: e7def94c5f [formerly fa849dfefa] [formerly 11d0d191fd] [formerly d08597a0d4 [formerly 11d0d191fd [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]
Former-commit-id: d08597a0d4
Former-commit-id: 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a [formerly 591ce333dc]
Former-commit-id: 7efff2943c
 2014-03-06 17:07:23 +00:00
Brad Gonzales
5fae9e6577 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 b535c90a23 [formerly 08ee82c39a [formerly 5c5eb6f348627f65afc527205c5bc1f7b7463ddb]]]
Former-commit-id: b535c90a23
Former-commit-id: 11734a11ae5f09b05df469fcfb5ec781a7813557 [formerly e54ab69bf7]
Former-commit-id: 48b19f3833
 2014-03-06 10:38:30 -06:00