Brian Clements
c4e9aff9fc
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: 2456c2308fdc55cd5b5c2456c2308fdc55cd5b5caee98ecfb0aee98ecfb03486f1f2414f9a2577f26245b550aa
2014-03-10 14:06:45 -05:00
Nate Jensen
5b9fdc7612
Merge "Issue #2832 consolidate watch and warning recycle logic" into development
...
Former-commit-id: 89cdc446359cb27d5e9589cdc446359cb27d5e952570c295d52570c295d5f48251da57cab7dadbe8035cf99c65
2014-03-10 13:52:53 -05:00
Nate Jensen
7731f09550
Issue #2832 consolidate watch and warning recycle logic
...
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889
Former-commit-id: 8e734f917e057f7671a08e734f917e057f7671a08cd98e0b9f8cd98e0b9f39f2a03d211646574f5a33d7e39376
2014-03-10 13:02:45 -05:00
steve.naples
9fc779bbfb
ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch.
...
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97
Former-commit-id: 0d44e46f88212677f94b0d44e46f88212677f94b20582ab17320582ab17338fca1641f488d87dbe4dc08fb750b
2014-03-10 17:47:25 +00:00
steve.naples
74ea78b1a5
ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion.
...
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e
Former-commit-id: c877c8b61b915e3c2c66c877c8b61b915e3c2c667432b146ed7432b146ed36e3819aad796ba75949f390c8ce3c
2014-03-10 17:40:35 +00:00
Nate Jensen
00b39d0a56
Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development
...
Former-commit-id: 60bff5c4af4c7bda09c060bff5c4af4c7bda09c033d1e94c3833d1e94c38ee1efad5d7f045d2fab0decd1ed31f
2014-03-10 11:36:16 -05:00
Nate Jensen
6bafc51abe
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: 5a88f31a2b6a75fe686a5a88f31a2b6a75fe686ad599db4af2d599db4af239aa26c2b65094008bea19a0cfb972
2014-03-10 10:03:02 -05:00
Nate Jensen
6f1981102d
Merge "Issue #2876 - move NDM plugin feature entry." into development
...
Former-commit-id: 9026f93f20c247535b969026f93f20c247535b9614e4807c0214e4807c023a66c42d379dac73c948ea372042a5
2014-03-10 09:49:28 -05:00
Mike Duff
f46a80e936
Issue #2876 - move NDM plugin feature entry.
...
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f
Former-commit-id: bcd4b1490d6be6181108bcd4b1490d6be61811082fc712e1e82fc712e1e81eefba01ab861013ad8675218fb1aa
2014-03-10 09:45:04 -05:00
Nate Jensen
66180a8e05
Merge "Issue #2751 ensured that room admins know real userids" into development
...
Former-commit-id: 1306957f2ae787cac9af1306957f2ae787cac9afe963c7c4a1e963c7c4a1ede24100b64dd4805e333e61d24967
2014-03-10 09:15:39 -05:00
Nate Jensen
358658d1af
Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development
...
Former-commit-id: bedb7b7653f5a08f1f86bedb7b7653f5a08f1f86d04751a986d04751a986c5555eaa0c9c5f87dc03bf58ef25b0
2014-03-10 09:04:51 -05:00
Ben Steffensmeier
ad4ce67e85
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: c0b478eb979122b6da99c0b478eb979122b6da99865007473786500747375e4c35e93fd3043fda5aa1ac082c94
2014-03-07 18:15:32 -06:00
Steve Harris
ed7921643c
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 51b755a476873bd6b88951b755a476873bd6b889f60aba35d6f60aba35d6c24108e75b708485427e61af779433
2014-03-07 15:43:40 -06:00
Brian Clements
975bfca460
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: 2afc1a931944d161729f2afc1a931944d161729fdc94769c14dc94769c14acb20cfbbeac63129ad16590587d9e
2014-03-07 15:37:29 -06:00
Steve Harris
e29b96b6bd
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 068297b90a92232fa063068297b90a92232fa06340b543f9a840b543f9a84d1fbf8743f992a6b046ea01373320
2014-03-07 15:16:18 -06:00
Shawn.Hooper
db1c090463
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: b46b87cb5e8c9f9b3ae0b46b87cb5e8c9f9b3ae0dc3aadd149dc3aadd14968d8f9be1405bb380e7726a112b34b
2014-03-07 12:57:36 -05:00
Brian.Dyke
ac07a4fc49
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: a0e3f08fce394076196ba0e3f08fce394076196b7b798ab5d27b798ab5d2fa189c0ef66ced1bedc2c8b3730fef
2014-03-07 09:01:09 -05:00
Brian.Dyke
da36dde938
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 0bbf137b05312cd8a3e80bbf137b05312cd8a3e86414bdab576414bdab572eec413d722f944801218f2271403d
2014-03-07 08:57:07 -05:00
Brian.Dyke
c1dab50ce0
14.1.1-22 baseline
...
Former-commit-id: fe30e1d54521f17d4f9bfe30e1d54521f17d4f9b08d8f1a0ee08d8f1a0ee9406a1d6c0a4c136fd60067802b104
2014-03-07 08:49:00 -05:00
Steve Harris
d65c768373
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: dc7d6ceced8b6263bfbddc7d6ceced8b6263bfbd1c64a5c0251c64a5c025972fa3bee67fbbc1e1187f932399b9
2014-03-06 18:31:10 -06:00
Steve Harris
71c8e15b78
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 3358e8d6ef7f1ad89df93358e8d6ef7f1ad89df9a2e36f4c6ca2e36f4c6c2371a74a298ec20fc5e9104b3d369a
2014-03-06 18:19:55 -06:00
Nate Jensen
45ff104294
Issue #2826 fix collaboration mosaic image disposed issue
...
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614
Former-commit-id: d9af17287d7fa8bf636fd9af17287d7fa8bf636f7bfad8ce177bfad8ce17cb8164441204d7ef0e7a69bdf2bd60
2014-03-06 18:07:40 -06:00
Brad Gonzales
c50ea20d9e
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: dadcd2e10b2e224094addadcd2e10b2e224094adb47dc5df40b47dc5df40574f6f8d9266386f340a7b3b48d9b3
2014-03-06 17:35:43 -06:00
Brad Gonzales
4cbc3b1b05
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: a24cbcfa770e3dc17872a24cbcfa770e3dc17872dea17a19dadea17a19da4ba60d8a6f78d35d4033c4064160ec
2014-03-06 16:29:37 -06:00
Juliya Dynina
46753de399
Merge "ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)" into asm_14.2.2
...
Former-commit-id: 13de22927f1d2b7f8f9413de22927f1d2b7f8f94a5514689cda5514689cd208844154c122fb73f6e858b51c311
2014-03-06 15:53:31 -05:00
Ben Steffensmeier
abc97d429c
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: c9eb976b6582b8790050c9eb976b6582b87900506962f80c5a6962f80c5a346cd75e59062e3ddb484bc84e916d
2014-03-06 13:37:08 -06:00
Brian.Dyke
8de6b2d57b
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: bd81ebd8c2db274c890fbd81ebd8c2db274c890feefe8c45feeefe8c45fe26140187b1b657767cb1b9e9126e11
2014-03-06 10:54:15 -05:00
Steve Harris
2db5dcf6eb
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: 3ba28aabea069093884f3ba28aabea069093884fffcc34f8d4ffcc34f8d4587f15a95d96658d8ce036a0533f19
2014-03-06 08:39:43 -06:00
Qinglu.Lin
b4a87b4a34
ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)
...
Change-Id: I438fe078be9161e58faebc25b03f8416e9f00319
Former-commit-id: 8ad36bdda1b31998815d8ad36bdda1b31998815de9d6eae852e9d6eae852838575812674b0e337df6fa4ed6e74
2014-03-05 16:51:03 -05:00
Nate Jensen
f19837e0ed
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: 0d547ab0bfbe9cc9397f0d547ab0bfbe9cc9397fa91e941d3ea91e941d3e76ded096a8fb504244567bb56ce041
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
ab265087eb
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: fd34cf399312ed63619afd34cf399312ed63619a775c29e77c775c29e77c2bc8805fbca06a98750f3f62075baa
2014-03-05 14:57:28 -06:00
Nate Jensen
f84030e2b7
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: ae9adefbf7cf4631f9bfae9adefbf7cf4631f9bf48fa8f8d1b48fa8f8d1bb097d488cad3f18729c38380226f6b
2014-03-05 14:41:12 -06:00
Mike Duff
8a798710c5
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: 25425a4268e97e745b6125425a4268e97e745b619c873e6dd99c873e6dd90251ad5bcac0bf150e1515c32a1513
2014-03-05 14:39:55 -06:00
Nate Jensen
d7b438bccf
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 54d015cb4f59dcb3a97d54d015cb4f59dcb3a97d2eea0b92052eea0b92052def452e2c17ee130b2af8e7bfa835
2014-03-05 14:14:25 -06:00
Max Schenkelberg
7f9bea7552
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 83ac37724e10bfa59aef83ac37724e10bfa59aefb5ed7ac361b5ed7ac361a8b436c8670fbc2df17d9b26076206
2014-03-05 13:51:06 -06:00
Mike Duff
c6e743bbc1
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 14107f09148c693a5f7014107f09148c693a5f709963324b609963324b60198d9e67803bdf20dea385ac8c85e0
2014-03-05 12:02:33 -06:00
Nate Jensen
e97545fd54
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 09311b82707a2a489c7709311b82707a2a489c77308ab7c314308ab7c314d07da4c425d82a7d3640d4305f1578
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
4b966138f6
Issue #2843 Harden recycle.
...
Former-commit-id: 22adc336df26c1a8e49422adc336df26c1a8e4943cd6b29e753cd6b29e75ed0ec90407af1bdf1b532c687a4064
2014-03-05 11:16:12 -06:00
Brian Clements
6dc478d975
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: d76dd2a8f6c0e4615967d76dd2a8f6c0e4615967c9906cde88c9906cde883d4323b447d06182573edec443b1af
2014-03-05 09:00:57 -06:00
Lee Venable
4b81954f16
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: f38afb0976e71dad9c80f38afb0976e71dad9c80980e21ca5a980e21ca5a3966bc355c98daa663b47e45b908af
2014-03-05 08:37:13 -06:00
Nate Jensen
6d836f5d82
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: 8ebe236ce967fa21cfd98ebe236ce967fa21cfd9faf3dbb670faf3dbb6700b827a343bddf96ad45bc427ff8471
2014-03-04 13:59:01 -06:00
Nate Jensen
fb903ade0b
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: 559b1794afe3d211c8d7559b1794afe3d211c8d73c3e483d183c3e483d18e08b21fc404c0df85caf21d3110c28
2014-03-04 13:18:16 -06:00
Richard Peter
13bad4e99e
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 090829f75ef87a913017090829f75ef87a913017873fa00fac873fa00fac3a96d0758a2a5b0fb3badfa3f06e8e
2014-03-04 12:43:17 -06:00
Nate Jensen
1d27417675
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: 75611f0631f50a2789dd75611f0631f50a2789dd7ac7dd5f017ac7dd5f0144e9b34927a2b3bc717ecb9d2a3298
2014-03-04 10:55:05 -06:00
Brian.Dyke
ea56516bf5
OB_14.1.1-21 baseline
...
Former-commit-id: 271ec85c0c1d92e5bab6271ec85c0c1d92e5bab629681c7ca429681c7ca4c68649b4f97cad374af5079cc93f89
2014-03-04 11:47:42 -05:00
Max Schenkelberg
c6cf08db73
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: 59434c8a60a01a6d68d059434c8a60a01a6d68d0cbf8b9249ccbf8b9249c39e1c4fa46654da3c0a2f509321134
2014-03-04 09:23:36 -06:00
Max Schenkelberg
83103254e7
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: 6edfb8965fdbcbd1b5606edfb8965fdbcbd1b5601854bbb4771854bbb477bff80c3ee96658c94e6e96bdc00728
2014-03-03 17:59:48 -06:00
Nate Jensen
224fd09dab
Issue #2792 enforce getDensity() will not return above max
...
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: 7f31e34dc9384b531d267f31e34dc9384b531d2622153d43bb22153d43bbe40fbf0ba058c9dc0c696f488f855f
2014-03-03 14:44:16 -06:00
Brian Clements
44fdea985e
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: 5d21675a9191936beadf5d21675a9191936beadf7a7d4768997a7d476899bf4c119278724bafd44fdc8667011b
2014-03-03 13:17:05 -06:00
Ben Steffensmeier
a19e960342
Issue #2791 Use Data Source for all grid data access.
...
Former-commit-id: 02cef4ddaa6fa441396f02cef4ddaa6fa441396f05770129c105770129c172b117cf424094ef6170c6f1b922b2
2014-02-28 17:06:33 -06:00
