Lee Venable
57d2e9737a
Merge "Issue #2807 . Added MalformedDataException for VAA decoding." into development
...
Former-commit-id: 9bf99b9359f9d019f0dc
2014-03-10 11:52:25 -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
Slav Korolev
4a3a56abe6
Issue #2807 . Added MalformedDataException for VAA decoding.
...
Former-commit-id: 8f8a6cb90e8391b1098e
2014-03-10 12:31:57 -04: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
Stephen Gilbert
200c7e60da
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: f203a4c03565dd8b4c3c
2014-03-07 19:10:08 -05:00
Stephen Gilbert
5fcb45a629
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: e3aedaa1d69a457213bb
2014-03-07 19:07:28 -05:00
Stephen Gilbert
a7fd09a409
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 49a6d6ec7e1632166902
2014-03-07 18:49:21 -05:00
Stephen Gilbert
cce06bfbe3
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: 6dd6ae8d36625fcb0064
2014-03-07 18:36:42 -05: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
Mike Duff
6ace7b364d
Issue #2876 - Fix manifest file.
...
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9
Former-commit-id: 4cefac4658618dbec585
2014-03-07 15:41:24 -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
Shawn.Hooper
e894b1279a
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: 56a949fba841a4905f9f
2014-03-07 14:53:54 -05:00
Richard Peter
946c8fcf24
Merge "Issue #2876 - Pluginize NDM review comments" into development
...
Former-commit-id: c9dfa75d1c4568108a3c
2014-03-07 13:04:14 -06:00
Mike Duff
7fd9cc40c7
Issue #2876 - Pluginize NDM
...
review comments
Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d
Former-commit-id: c388cb839b944fca16b8
2014-03-07 12:47:46 -06:00
Shawn.Hooper
6a8a1c397b
ASM #377 - Baseline National River Location Database fails
...
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 85db05e819670da1895b
2014-03-07 13:12:11 -05:00
Shawn.Hooper
b46b87cb5e
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: dc3aadd1498c9f9b3ae0
2014-03-07 12:57:36 -05:00
Brian.Dyke
48cc3b6c55
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 1fe5504d4c3ac2a61218
2014-03-07 11:50:06 -05:00
David Friedman
103fece7b7
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: a58f3cb7df2c1a3442d6
2014-03-07 14:58:09 +00: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
Nate Jensen
5bc5c7cbc7
Merge "Issue #2756 reworked collaboration dataserver build" into development
...
Former-commit-id: 68f8cd5ebe911253bf25
2014-03-06 16:19:23 -06:00
Juliya Dynina
13de22927f
Merge "ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)" into asm_14.2.2
...
Former-commit-id: a5514689cd1d2b7f8f94
2014-03-06 15:53:31 -05: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 Clements
acbd4910fe
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: cde0d05820fac33a8915
2014-03-06 11:49:57 -06:00
David Friedman
fa849dfefa
ASM #74 - Fix RadarServer configuration import utility JAR dependency
...
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: d08597a0d411d0d191fd
2014-03-06 17:07:23 +00:00
Brad Gonzales
cb89c806c8
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: b535c90a2308ee82c39a
2014-03-06 10:38:30 -06:00
Brian.Dyke
7baa5ee0d5
Merge 13.5.3 DR_16824
...
Former-commit-id: dafe7e6a42b8fd0f16ed
2014-03-06 11:22:08 -05:00
Brian.Dyke
26fe429c4b
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 010b7a1df51778d20745
2014-03-06 11:04:34 -05:00
Brian.Dyke
6313b7af0c
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: cb1b4a7ac52dbac1697d
2014-03-06 10:56:44 -05: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
Qinglu.Lin
8ad36bdda1
ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)
...
Change-Id: I438fe078be9161e58faebc25b03f8416e9f00319
Former-commit-id: e9d6eae852b31998815d
2014-03-05 16:51:03 -05:00
Nate Jensen
01ce4ffeca
Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
...
Former-commit-id: f60fba58b1bc0b6ca067
2014-03-05 15:44:36 -06:00
Brian Clements
bc8ac5e051
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: e1819cd4e2ad3d10074a
2014-03-05 15:29:27 -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
