Brian Clements
dc55cd5b5c
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: e832f6420b6363a3c951725e0d23f460b2efb42e
2014-03-10 14:06:45 -05:00
Lee Venable
f9d019f0dc
Merge "Issue #2807 . Added MalformedDataException for VAA decoding." into development
...
Former-commit-id: 4094bd9c9eb40db9a93e679bb09fba1bea1d8639
2014-03-10 11:52:25 -05:00
Nate Jensen
4c7bda09c0
Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development
...
Former-commit-id: 99c2f252cab0901cedfefa5e2a6d6799f7e29db8
2014-03-10 11:36:16 -05:00
Slav Korolev
8391b1098e
Issue #2807 . Added MalformedDataException for VAA decoding.
...
Former-commit-id: 085c10211b1fa397ca54b8d4d316055f9225db0c
2014-03-10 12:31:57 -04:00
Nate Jensen
c247535b96
Merge "Issue #2876 - move NDM plugin feature entry." into development
...
Former-commit-id: 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88
2014-03-10 09:49:28 -05:00
Mike Duff
6be6181108
Issue #2876 - move NDM plugin feature entry.
...
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f
Former-commit-id: a3b334c9269a9753af0f2dd9f6507aef23177b9f
2014-03-10 09:45:04 -05:00
Nate Jensen
e787cac9af
Merge "Issue #2751 ensured that room admins know real userids" into development
...
Former-commit-id: e6feac94800c2dd82afcf42ca9f387b24514deff
2014-03-10 09:15:39 -05:00
Nate Jensen
f5a08f1f86
Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development
...
Former-commit-id: 24492229a0bddc3db1b6945fcd2a89a486f1ef2e
2014-03-10 09:04:51 -05:00
Ben Steffensmeier
9122b6da99
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: ba5ff870337c7ac66d633077d84de867e5df967c
2014-03-07 18:15:32 -06:00
Steve Harris
873bd6b889
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c
2014-03-07 15:43:40 -06:00
Mike Duff
618dbec585
Issue #2876 - Fix manifest file.
...
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9
Former-commit-id: 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48
2014-03-07 15:41:24 -06:00
Brian Clements
44d161729f
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: b3bf76b676b7e75559236d67c687cd5011859a8b
2014-03-07 15:37:29 -06:00
Steve Harris
92232fa063
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
2014-03-07 15:16:18 -06:00
Richard Peter
4568108a3c
Merge "Issue #2876 - Pluginize NDM review comments" into development
...
Former-commit-id: 296f8f835cbc87783f0f50278d2148f756cf6296
2014-03-07 13:04:14 -06:00
Mike Duff
944fca16b8
Issue #2876 - Pluginize NDM
...
review comments
Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d
Former-commit-id: 2f1aa28a4389c15e20724ebc8d79501c338f565e
2014-03-07 12:47:46 -06:00
Brian.Dyke
3ac2a61218
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 8b6d5b889e652cbf82c66ae831c9c116626c1494
2014-03-07 11:50:06 -05:00
Brian.Dyke
394076196b
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7
2014-03-07 09:01:09 -05:00
Brian.Dyke
312cd8a3e8
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: bb169bc0992f28fe1527cb0106771c35415cea24
2014-03-07 08:57:07 -05:00
Brian.Dyke
21f17d4f9b
14.1.1-22 baseline
...
Former-commit-id: ae37ad5bac445251d1456f37588819fccfede061
2014-03-07 08:49:00 -05:00
Steve Harris
8b6263bfbd
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 857ae00bea95a7981cb4752c1a7c147d725173e3
2014-03-06 18:31:10 -06:00
Steve Harris
7f1ad89df9
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
2014-03-06 18:19:55 -06:00
Nate Jensen
7fa8bf636f
Issue #2826 fix collaboration mosaic image disposed issue
...
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614
Former-commit-id: 50b3e6bb7fcee54f1199b78354d404f325b32773
2014-03-06 18:07:40 -06:00
Brad Gonzales
2e224094ad
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: d1f3c5e508cf268198531a31fd3a91faba0159df
2014-03-06 17:35:43 -06:00
Brad Gonzales
0e3dc17872
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: 6d2a542774db6c37cfc2a65f490ebf618f2e7954
2014-03-06 16:29:37 -06:00
Nate Jensen
911253bf25
Merge "Issue #2756 reworked collaboration dataserver build" into development
...
Former-commit-id: bf17d41836aa6444a0efec811fbbb9786c0e36a1
2014-03-06 16:19:23 -06:00
Ben Steffensmeier
82b8790050
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c
2014-03-06 13:37:08 -06:00
Brian Clements
fac33a8915
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: 8e1da85b9d3da580c8d5b53783e2b17c6ee8d00e
2014-03-06 11:49:57 -06:00
Brad Gonzales
08ee82c39a
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: 5c5eb6f348627f65afc527205c5bc1f7b7463ddb
2014-03-06 10:38:30 -06:00
Brian.Dyke
b8fd0f16ed
Merge 13.5.3 DR_16824
...
Former-commit-id: 1b9ed749da0d1893f44e68400644f37c763e324a
2014-03-06 11:22:08 -05:00
Brian.Dyke
1778d20745
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 85700a6c632125b5f1d36b37a70767fbd9819142
2014-03-06 11:04:34 -05:00
Brian.Dyke
2dbac1697d
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: c1dc533bf7ee6500da3f6d75699ad7758a39462b
2014-03-06 10:56:44 -05:00
Brian.Dyke
db274c890f
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: 1edba9216beac913f9bd867da9988e213394a396
2014-03-06 10:54:15 -05:00
Steve Harris
069093884f
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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
2014-03-06 08:39:43 -06:00
Nate Jensen
bc0b6ca067
Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
...
Former-commit-id: 0bc02d3ad06b0c0daddefd9550772c79687edfb7
2014-03-05 15:44:36 -06:00
Brian Clements
ad3d10074a
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: d8f30a7af43faa2fd4ac18769d2313ae6008cfd1
2014-03-05 15:29:27 -06:00
Nate Jensen
be9cc9397f
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
12ed63619a
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 8d8a06be12652349032f15ab1e31d5f23adf0b24
2014-03-05 14:57:28 -06:00
Nate Jensen
cf4631f9bf
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: e6dc5f076bfd4811b2b1cdaf3782a5066e032381
2014-03-05 14:41:12 -06:00
Mike Duff
e97e745b61
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: b087558dce4e19596c93d47e986af50fae806a74
2014-03-05 14:39:55 -06:00
Nate Jensen
59dcb3a97d
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: e108aa41bb586593f50970da53109a82d2bb8452
2014-03-05 14:14:25 -06:00
Max Schenkelberg
10bfa59aef
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede
2014-03-05 13:51:06 -06:00
Steve Harris
167ce61d6c
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 505bcf7b47aac1344bb46bac690ce83591b8e554
2014-03-05 13:00:23 -06:00
Mike Duff
8c693a5f70
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 168a656194aa3b455f403aa92b290bbbe17d3b45
2014-03-05 12:02:33 -06:00
Nate Jensen
7a2a489c77
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: c36359b0aaa1540f6d941e9445b41ed929a91e14
2014-03-05 11:41:05 -06:00
Greg Armendariz
a9e861834b
Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
...
Former-commit-id: ae3372772795cda39176223231d354d776feb1a3
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
26c1a8e494
Issue #2843 Harden recycle.
...
Former-commit-id: 364b818dbd055b13fd8d5bb9f40c16f730f30b53
2014-03-05 11:16:12 -06:00
Nate Jensen
c07f2e829d
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: 54578116023ebc7a6474a3297d419c2777d31e17
2014-03-05 09:04:10 -06:00
Brian Clements
c0e4615967
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: 3f7cfbbf1c60cffa0aa31f53b29521b78774042e
2014-03-05 09:00:57 -06:00
Lee Venable
e71dad9c80
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: eb3cf0ade9203766a437512b85e55f32108db1e3
2014-03-05 08:37:13 -06:00
Richard Peter
7c02ab6b66
Merge "Issue #2627 harden static initialization on edex main thread" into development
...
Former-commit-id: 82f20a96a82ef7f047f716662d319e522ee1c394
2014-03-04 17:54:09 -06:00
