Richard Peter
042468f761
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
...
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 7ebbc0cf787af0cfaf38
2014-03-12 09:47:29 -05:00
Lee Venable
fe6e7328c0
Issue #2865 - added more null and dispose checks
...
Former-commit-id: 1f9d1af221df65d7c7ce
2014-03-11 16:30:33 -05:00
Nate Jensen
cef0438c35
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
...
Former-commit-id: afbdf6962c85f5821a6f
2014-03-11 12:35:44 -05:00
Nate Jensen
8e0fff8bb4
Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development
...
Former-commit-id: 4ee98a10cda1533481b3
2014-03-11 11:30:27 -05:00
Ben Steffensmeier
c7fa392f3f
Issue #2896 Fix sat best res on weird projections
...
Former-commit-id: 560fc688bc8bb517836a
2014-03-11 11:07:43 -05:00
Dave Hladky
e3701c0810
Issue #2900 Added NWSAuth to import for DD viz feature
...
Former-commit-id: 171bb37b0aa2a66b028d
2014-03-11 11:04:34 -05:00
Lee Venable
44733489b9
Issue #2865 - fixed font memory leak
...
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d
Former-commit-id: 58d7f759b22c67c4f6c4
2014-03-11 10:31:50 -05:00
Nate Jensen
17aa39ce0a
Issue #2779 update memory settings for renamed NC perspective
...
Former-commit-id: 5eb892f4cfccb06db199
2014-03-11 10:28:01 -05:00
Nate Jensen
64b7c84018
Merge "Issue #2848 fixed session create, listen, join ordering" into development
...
Former-commit-id: fb2677db7d722216e319
2014-03-10 17:36:06 -05:00
Steve Harris
e62a399e9f
Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
...
Former-commit-id: cfc9fea4134c52fb5bb3
2014-03-10 16:01:16 -05:00
Ben Steffensmeier
bde80aec1b
Issue #2867 Better validation of image export frame range.
...
Former-commit-id: cc8b71fbdfe75b961db5
2014-03-10 15:24:07 -05:00
Ben Steffensmeier
525f6b19bf
Issue #2791 Add numeric to alertViz feature.
...
Former-commit-id: 2f75103635f88e1c329e
2014-03-10 14:55:54 -05:00
Brian Clements
2456c2308f
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: aee98ecfb0dc55cd5b5c
2014-03-10 14:06:45 -05:00
Nate Jensen
89cdc44635
Merge "Issue #2832 consolidate watch and warning recycle logic" into development
...
Former-commit-id: 2570c295d59cb27d5e95
2014-03-10 13:52:53 -05:00
Nate Jensen
8e734f917e
Issue #2832 consolidate watch and warning recycle logic
...
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889
Former-commit-id: 8cd98e0b9f057f7671a0
2014-03-10 13:02:45 -05:00
Nate Jensen
60bff5c4af
Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development
...
Former-commit-id: 33d1e94c384c7bda09c0
2014-03-10 11:36:16 -05:00
Nate Jensen
5a88f31a2b
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: d599db4af26a75fe686a
2014-03-10 10:03:02 -05:00
Nate Jensen
9026f93f20
Merge "Issue #2876 - move NDM plugin feature entry." into development
...
Former-commit-id: 14e4807c02c247535b96
2014-03-10 09:49:28 -05:00
Mike Duff
bcd4b1490d
Issue #2876 - move NDM plugin feature entry.
...
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f
Former-commit-id: 2fc712e1e86be6181108
2014-03-10 09:45:04 -05:00
Nate Jensen
1306957f2a
Merge "Issue #2751 ensured that room admins know real userids" into development
...
Former-commit-id: e963c7c4a1e787cac9af
2014-03-10 09:15:39 -05:00
Nate Jensen
bedb7b7653
Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development
...
Former-commit-id: d04751a986f5a08f1f86
2014-03-10 09:04:51 -05:00
Ben Steffensmeier
c0b478eb97
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: 86500747379122b6da99
2014-03-07 18:15:32 -06:00
Steve Harris
51b755a476
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: f60aba35d6873bd6b889
2014-03-07 15:43:40 -06:00
Brian Clements
2afc1a9319
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: dc94769c1444d161729f
2014-03-07 15:37:29 -06:00
Steve Harris
068297b90a
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 40b543f9a892232fa063
2014-03-07 15:16:18 -06:00
Brian.Dyke
a0e3f08fce
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 7b798ab5d2394076196b
2014-03-07 09:01:09 -05:00
Brian.Dyke
0bbf137b05
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 6414bdab57312cd8a3e8
2014-03-07 08:57:07 -05:00
Brian.Dyke
fe30e1d545
14.1.1-22 baseline
...
Former-commit-id: 08d8f1a0ee21f17d4f9b
2014-03-07 08:49:00 -05:00
Steve Harris
dc7d6ceced
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 1c64a5c0258b6263bfbd
2014-03-06 18:31:10 -06:00
Steve Harris
3358e8d6ef
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a2e36f4c6c7f1ad89df9
2014-03-06 18:19:55 -06:00
Nate Jensen
d9af17287d
Issue #2826 fix collaboration mosaic image disposed issue
...
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614
Former-commit-id: 7bfad8ce177fa8bf636f
2014-03-06 18:07:40 -06:00
Brad Gonzales
dadcd2e10b
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: b47dc5df402e224094ad
2014-03-06 17:35:43 -06:00
Brad Gonzales
a24cbcfa77
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: dea17a19da0e3dc17872
2014-03-06 16:29:37 -06:00
Ben Steffensmeier
c9eb976b65
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 6962f80c5a82b8790050
2014-03-06 13:37:08 -06:00
Brian.Dyke
bd81ebd8c2
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: eefe8c45fedb274c890f
2014-03-06 10:54:15 -05:00
Steve Harris
3ba28aabea
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: ffcc34f8d4069093884f
2014-03-06 08:39:43 -06:00
Nate Jensen
0d547ab0bf
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: a91e941d3ebe9cc9397f
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
fd34cf3993
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 775c29e77c12ed63619a
2014-03-05 14:57:28 -06:00
Nate Jensen
ae9adefbf7
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: 48fa8f8d1bcf4631f9bf
2014-03-05 14:41:12 -06:00
Mike Duff
25425a4268
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: 9c873e6dd9e97e745b61
2014-03-05 14:39:55 -06:00
Nate Jensen
54d015cb4f
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 2eea0b920559dcb3a97d
2014-03-05 14:14:25 -06:00
Max Schenkelberg
83ac37724e
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: b5ed7ac36110bfa59aef
2014-03-05 13:51:06 -06:00
Mike Duff
14107f0914
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 9963324b608c693a5f70
2014-03-05 12:02:33 -06:00
Nate Jensen
09311b8270
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 308ab7c3147a2a489c77
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
22adc336df
Issue #2843 Harden recycle.
...
Former-commit-id: 3cd6b29e7526c1a8e494
2014-03-05 11:16:12 -06:00
Brian Clements
d76dd2a8f6
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: c9906cde88c0e4615967
2014-03-05 09:00:57 -06:00
Lee Venable
f38afb0976
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 980e21ca5ae71dad9c80
2014-03-05 08:37:13 -06:00
Nate Jensen
8ebe236ce9
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: faf3dbb67067fa21cfd9
2014-03-04 13:59:01 -06:00
Nate Jensen
559b1794af
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: 3c3e483d18e3d211c8d7
2014-03-04 13:18:16 -06:00
Richard Peter
090829f75e
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 873fa00facf87a913017
2014-03-04 12:43:17 -06:00
