Mike Duff
d6e478f73e
Issue #2876 - move NDM plugin feature entry.
...
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f
Former-commit-id: 5c2d6189b4bcd4b1490d6be61811082fc712e1e86be61811082fc712e1e8861013ad861eefba01ab
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: 181060825e1306957f2ae787cac9afe963c7c4a1e787cac9afe963c7c4a14dd4805e33ede24100b6
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: b98ec97406bedb7b7653f5a08f1f86d04751a986f5a08f1f86d04751a9869c5f87dc03c5555eaa0c
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: 094086b5c2c0b478eb979122b6da9986500747379122b6da998650074737d3043fda5a5e4c35e93f
2014-03-07 18:15:32 -06: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: 865fef97b151b755a476873bd6b889f60aba35d6873bd6b889f60aba35d6708485427ec24108e75b
2014-03-07 15:43:40 -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: 8aff9ee95c2afc1a931944d161729fdc94769c1444d161729fdc94769c14ac63129ad1acb20cfbbe
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: da2d7fc334068297b90a92232fa06340b543f9a892232fa06340b543f9a8f992a6b0464d1fbf8743
2014-03-07 15:16:18 -06:00
Shawn.Hooper
e33de27296
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: fb051c5a5fb46b87cb5e8c9f9b3ae0dc3aadd1498c9f9b3ae0dc3aadd14905bb380e7768d8f9be14
2014-03-07 12:57:36 -05:00
Brian.Dyke
eb6abe6faa
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: c2449e7821a0e3f08fce394076196b7b798ab5d2394076196b7b798ab5d26ced1bedc2fa189c0ef6
2014-03-07 09:01:09 -05:00
Brian.Dyke
50621ec3e5
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: e1cc8eb59a0bbf137b05312cd8a3e86414bdab57312cd8a3e86414bdab572f944801212eec413d72
2014-03-07 08:57:07 -05:00
Brian.Dyke
3c9cde458a
14.1.1-22 baseline
...
Former-commit-id: 1dcc56775dfe30e1d54521f17d4f9b08d8f1a0ee21f17d4f9b08d8f1a0eea4c136fd609406a1d6c0
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: 08dbf1f7eadc7d6ceced8b6263bfbd1c64a5c0258b6263bfbd1c64a5c0257fbbc1e118972fa3bee6
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: 93aa41a34b3358e8d6ef7f1ad89df9a2e36f4c6c7f1ad89df9a2e36f4c6c8ec20fc5e92371a74a29
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: 95bc80c8d0d9af17287d7fa8bf636f7bfad8ce177fa8bf636f7bfad8ce1704d7ef0e7acb81644412
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: 5cdaee1f29dadcd2e10b2e224094adb47dc5df402e224094adb47dc5df4066386f340a574f6f8d92
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: 885a9567bca24cbcfa770e3dc17872dea17a19da0e3dc17872dea17a19da78d35d40334ba60d8a6f
2014-03-06 16:29:37 -06:00
Juliya Dynina
ecebefae11
Merge "ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)" into asm_14.2.2
...
Former-commit-id: 7686e3c22f13de22927f1d2b7f8f94a5514689cd1d2b7f8f94a5514689cd122fb73f6e208844154c
2014-03-06 15:53:31 -05:00
Ben Steffensmeier
d2ded3028f
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 0d05c6135bc9eb976b6582b87900506962f80c5a82b87900506962f80c5a062e3ddb48346cd75e59
2014-03-06 13:37:08 -06:00
Brian.Dyke
6ef9f7fd37
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: 972c2c284bbd81ebd8c2db274c890feefe8c45fedb274c890feefe8c45feb657767cb126140187b1
2014-03-06 10:54:15 -05:00
Steve Harris
d2a6b0c18b
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: 52226061e93ba28aabea069093884fffcc34f8d4069093884fffcc34f8d496658d8ce0587f15a95d
2014-03-06 08:39:43 -06:00
Qinglu.Lin
bb7896e05e
ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)
...
Change-Id: I438fe078be9161e58faebc25b03f8416e9f00319
Former-commit-id: 6eff5dd2a78ad36bdda1b31998815de9d6eae852b31998815de9d6eae85274b0e337df8385758126
2014-03-05 16:51:03 -05:00
Nate Jensen
8e316de47f
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: 451a7fe5520d547ab0bfbe9cc9397fa91e941d3ebe9cc9397fa91e941d3efb5042445676ded096a8
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
ceb056d304
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 6dc44e895ffd34cf399312ed63619a775c29e77c12ed63619a775c29e77ca06a98750f2bc8805fbc
2014-03-05 14:57:28 -06:00
Nate Jensen
ddebec5791
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: dcbafebc0dae9adefbf7cf4631f9bf48fa8f8d1bcf4631f9bf48fa8f8d1bd3f18729c3b097d488ca
2014-03-05 14:41:12 -06:00
Mike Duff
b88162e504
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: ec892bb7a725425a4268e97e745b619c873e6dd9e97e745b619c873e6dd9c0bf150e150251ad5bca
2014-03-05 14:39:55 -06:00
Nate Jensen
12e353a3d6
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: d0fd1154d454d015cb4f59dcb3a97d2eea0b920559dcb3a97d2eea0b920517ee130b2a2def452e2c
2014-03-05 14:14:25 -06:00
Max Schenkelberg
035d96ce04
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 1dad35e39183ac37724e10bfa59aefb5ed7ac36110bfa59aefb5ed7ac3610fbc2df17da8b436c867
2014-03-05 13:51:06 -06:00
Mike Duff
1c0d844dc2
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: a67039842414107f09148c693a5f709963324b608c693a5f709963324b603bdf20dea3198d9e6780
2014-03-05 12:02:33 -06:00
Nate Jensen
b6d570e336
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: c65bb2a01109311b82707a2a489c77308ab7c3147a2a489c77308ab7c314d82a7d3640d07da4c425
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
be60a9564d
Issue #2843 Harden recycle.
...
Former-commit-id: 291d5f55df22adc336df26c1a8e4943cd6b29e7526c1a8e4943cd6b29e75af1bdf1b53ed0ec90407
2014-03-05 11:16:12 -06:00
Brian Clements
f4a6d2a30d
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: 17661200a1d76dd2a8f6c0e4615967c9906cde88c0e4615967c9906cde88d06182573e3d4323b447
2014-03-05 09:00:57 -06:00
Lee Venable
8cd4bc1705
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 3c85140ba0f38afb0976e71dad9c80980e21ca5ae71dad9c80980e21ca5a98daa663b43966bc355c
2014-03-05 08:37:13 -06:00
Nate Jensen
12f218292c
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: 6b4d16b7508ebe236ce967fa21cfd9faf3dbb67067fa21cfd9faf3dbb670ddf96ad45b0b827a343b
2014-03-04 13:59:01 -06:00
Nate Jensen
0094132846
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: 41d80f6fce559b1794afe3d211c8d73c3e483d18e3d211c8d73c3e483d184c0df85cafe08b21fc40
2014-03-04 13:18:16 -06:00
Richard Peter
7e096adc4a
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 83b99aad5c090829f75ef87a913017873fa00facf87a913017873fa00fac2a5b0fb3ba3a96d0758a
2014-03-04 12:43:17 -06:00
Nate Jensen
b3a4e1d562
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: b0e727938b75611f0631f50a2789dd7ac7dd5f01f50a2789dd7ac7dd5f01a2b3bc717e44e9b34927
2014-03-04 10:55:05 -06:00
Brian.Dyke
c1ef56e0d7
OB_14.1.1-21 baseline
...
Former-commit-id: 5179a4f970271ec85c0c1d92e5bab629681c7ca41d92e5bab629681c7ca47cad374af5c68649b4f9
2014-03-04 11:47:42 -05:00
Max Schenkelberg
d85fd52c26
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: dbc6cc3fc659434c8a60a01a6d68d0cbf8b9249ca01a6d68d0cbf8b9249c654da3c0a239e1c4fa46
2014-03-04 09:23:36 -06:00
Max Schenkelberg
c37910a689
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: 4bcdc9f85b6edfb8965fdbcbd1b5601854bbb477dbcbd1b5601854bbb4776658c94e6ebff80c3ee9
2014-03-03 17:59:48 -06:00
Nate Jensen
47deb8f80c
Issue #2792 enforce getDensity() will not return above max
...
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: 0044c21ad57f31e34dc9384b531d2622153d43bb384b531d2622153d43bb58c9dc0c69e40fbf0ba0
2014-03-03 14:44:16 -06:00
Brian Clements
472d08d2ad
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: dedd9e80ed5d21675a9191936beadf7a7d47689991936beadf7a7d476899724bafd44fbf4c119278
2014-03-03 13:17:05 -06:00
Ben Steffensmeier
374ad2c1e8
Issue #2791 Use Data Source for all grid data access.
...
Former-commit-id: 16b6723cbb02cef4ddaa6fa441396f05770129c16fa441396f05770129c14094ef617072b117cf42
2014-02-28 17:06:33 -06:00
Brian Clements
43c19f09ba
Issue #2756 implemented HTTP public key auth scheme
...
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client
Former-commit-id: fd189632219d0b02e0a4ce24bd1018d8e283e1b4ce24bd1018d8e283e1b4edd72cbde4f56cbac9fb
2014-02-28 16:15:17 -06:00
Lee Venable
639f66e8b2
Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
...
Former-commit-id: 4631a29ca340f3df6afff171e3adb0c77634951cf171e3adb0c77634951c734f69403a67f7d52f74
2014-02-28 13:50:15 -06:00
Mike Duff
6c5c943a5e
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 512e634a97377c1f99985440ff64d15f433b4f6b5440ff64d15f433b4f6bee06fc58b563fc5f8c66
2014-02-28 13:23:34 -06:00
Richard Peter
feb0543e0e
Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
...
Former-commit-id: 39cf8178ff18ec1e12ae5565bc88afd5e09a82a75565bc88afd5e09a82a7f5c3e5d549e4dc3ea6cf
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
b747a91eaa
Issue #2791 Switch contouring to use DataSource for data access.
...
Former-commit-id: 7c8332a30ffbf6371c8e4b7f3b2a5b23ce77d8644b7f3b2a5b23ce77d864a7787a7ff2278ef9f0d4
2014-02-28 11:28:02 -06:00
Nate Jensen
7ab7887199
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
...
Former-commit-id: 3153786b6fb40f5477b463244f840f908d30882563244f840f908d30882592527f1ffafb68c4c07f
2014-02-28 09:53:27 -06:00
Lee Venable
c03650a0ee
Issue #2795 - removed test code.
...
Former-commit-id: fec690642ee34e636dc728fe1e99e2f94bcc4d3f28fe1e99e2f94bcc4d3f708de93fc4267fa56e32
2014-02-27 15:46:30 -06:00
Richard Peter
1d6e9816e0
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a7bd6a079130e25ae35c11c150e6e8b0e25ae35c11c150e6e8bf13c86bc3e50a1b270c5
2014-02-27 15:18:26 -06:00
