Stephen Gilbert
78e4214f3d
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: 49a6d6ec7e16321669021632166902a7fd09a409
2014-03-07 18:49:21 -05:00
Stephen Gilbert
6f8caa3515
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: 6dd6ae8d36625fcb0064625fcb0064cce06bfbe3
2014-03-07 18:36:42 -05:00
Steve Harris
865fef97b1
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: f60aba35d6873bd6b889873bd6b88951b755a476
2014-03-07 15:43:40 -06:00
Mike Duff
1f70eb6704
Issue #2876 - Fix manifest file.
...
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9
Former-commit-id: 4cefac4658618dbec585618dbec5856ace7b364d
2014-03-07 15:41:24 -06:00
Brian Clements
8aff9ee95c
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: dc94769c1444d161729f44d161729f2afc1a9319
2014-03-07 15:37:29 -06:00
Steve Harris
da2d7fc334
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 40b543f9a892232fa06392232fa063068297b90a
2014-03-07 15:16:18 -06:00
Shawn.Hooper
bd02f6a1a6
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: 56a949fba841a4905f9f41a4905f9fe894b1279a
2014-03-07 14:53:54 -05:00
Richard Peter
476e85b564
Merge "Issue #2876 - Pluginize NDM review comments" into development
...
Former-commit-id: c9dfa75d1c4568108a3c4568108a3c946c8fcf24
2014-03-07 13:04:14 -06:00
Mike Duff
63937fa7cd
Issue #2876 - Pluginize NDM
...
review comments
Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d
Former-commit-id: c388cb839b944fca16b8944fca16b87fd9cc40c7
2014-03-07 12:47:46 -06:00
Shawn.Hooper
94e4e3e649
ASM #377 - Baseline National River Location Database fails
...
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 85db05e819670da1895b670da1895b6a8a1c397b
2014-03-07 13:12:11 -05:00
Shawn.Hooper
fb051c5a5f
ASM #378 - MPE gages are not listed/available in gage table
...
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: dc3aadd1498c9f9b3ae08c9f9b3ae0b46b87cb5e
2014-03-07 12:57:36 -05:00
Brian.Dyke
92bff38059
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 1fe5504d4c3ac2a612183ac2a6121848cc3b6c55
2014-03-07 11:50:06 -05:00
David Friedman
b8aadf1781
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: a58f3cb7df2c1a3442d62c1a3442d6103fece7b7
2014-03-07 14:58:09 +00:00
Brian.Dyke
c2449e7821
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 7b798ab5d2394076196b394076196ba0e3f08fce
2014-03-07 09:01:09 -05:00
Brian.Dyke
e1cc8eb59a
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 6414bdab57312cd8a3e8312cd8a3e80bbf137b05
2014-03-07 08:57:07 -05:00
Brian.Dyke
1dcc56775d
14.1.1-22 baseline
...
Former-commit-id: 08d8f1a0ee21f17d4f9b21f17d4f9bfe30e1d545
2014-03-07 08:49:00 -05:00
Steve Harris
08dbf1f7ea
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 1c64a5c0258b6263bfbd8b6263bfbddc7d6ceced
2014-03-06 18:31:10 -06:00
Steve Harris
93aa41a34b
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a2e36f4c6c7f1ad89df97f1ad89df93358e8d6ef
2014-03-06 18:19:55 -06:00
Nate Jensen
95bc80c8d0
Issue #2826 fix collaboration mosaic image disposed issue
...
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614
Former-commit-id: 7bfad8ce177fa8bf636f7fa8bf636fd9af17287d
2014-03-06 18:07:40 -06:00
Brad Gonzales
5cdaee1f29
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: b47dc5df402e224094ad2e224094addadcd2e10b
2014-03-06 17:35:43 -06:00
Brad Gonzales
885a9567bc
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: dea17a19da0e3dc178720e3dc17872a24cbcfa77
2014-03-06 16:29:37 -06:00
Nate Jensen
ff4e5b8c01
Merge "Issue #2756 reworked collaboration dataserver build" into development
...
Former-commit-id: 68f8cd5ebe911253bf25911253bf255bc5c7cbc7
2014-03-06 16:19:23 -06:00
Ben Steffensmeier
0d05c6135b
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 6962f80c5a82b879005082b8790050c9eb976b65
2014-03-06 13:37:08 -06:00
Brian Clements
a97d1a1fb5
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: cde0d05820fac33a8915fac33a8915acbd4910fe
2014-03-06 11:49:57 -06:00
David Friedman
e7def94c5f
ASM #74 - Fix RadarServer configuration import utility JAR dependency
...
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: d08597a0d411d0d191fd11d0d191fdfa849dfefa
2014-03-06 17:07:23 +00:00
Brad Gonzales
770f675138
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: b535c90a2308ee82c39a08ee82c39acb89c806c8
2014-03-06 10:38:30 -06:00
Brian.Dyke
b8a4de2bf0
Merge 13.5.3 DR_16824
...
Former-commit-id: dafe7e6a42b8fd0f16edb8fd0f16ed7baa5ee0d5
2014-03-06 11:22:08 -05:00
Brian.Dyke
8c54df9e0c
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 010b7a1df51778d207451778d2074526fe429c4b
2014-03-06 11:04:34 -05:00
Brian.Dyke
e5972b7159
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: cb1b4a7ac52dbac1697d2dbac1697d6313b7af0c
2014-03-06 10:56:44 -05:00
Brian.Dyke
972c2c284b
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: eefe8c45fedb274c890fdb274c890fbd81ebd8c2
2014-03-06 10:54:15 -05:00
Steve Harris
52226061e9
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: ffcc34f8d4069093884f069093884f3ba28aabea
2014-03-06 08:39:43 -06:00
Nate Jensen
1674fb814c
Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
...
Former-commit-id: f60fba58b1bc0b6ca067bc0b6ca06701ce4ffeca
2014-03-05 15:44:36 -06:00
Brian Clements
e4d22971bd
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: e1819cd4e2ad3d10074aad3d10074abc8ac5e051
2014-03-05 15:29:27 -06:00
Nate Jensen
451a7fe552
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: a91e941d3ebe9cc9397fbe9cc9397f0d547ab0bf
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
6dc44e895f
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 775c29e77c12ed63619a12ed63619afd34cf3993
2014-03-05 14:57:28 -06:00
Nate Jensen
dcbafebc0d
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: 48fa8f8d1bcf4631f9bfcf4631f9bfae9adefbf7
2014-03-05 14:41:12 -06:00
Mike Duff
ec892bb7a7
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: 9c873e6dd9e97e745b61e97e745b6125425a4268
2014-03-05 14:39:55 -06:00
Nate Jensen
d0fd1154d4
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 2eea0b920559dcb3a97d59dcb3a97d54d015cb4f
2014-03-05 14:14:25 -06:00
Max Schenkelberg
1dad35e391
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: b5ed7ac36110bfa59aef10bfa59aef83ac37724e
2014-03-05 13:51:06 -06:00
Steve Harris
18ae41769e
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 4b01c57c0a167ce61d6c167ce61d6c1a666f9f71
2014-03-05 13:00:23 -06:00
Mike Duff
a670398424
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 9963324b608c693a5f708c693a5f7014107f0914
2014-03-05 12:02:33 -06:00
Nate Jensen
c65bb2a011
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 308ab7c3147a2a489c777a2a489c7709311b8270
2014-03-05 11:41:05 -06:00
Greg Armendariz
d3fcc8caeb
Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
...
Former-commit-id: d2510ab641a9e861834ba9e861834b7d9cc2361e
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
291d5f55df
Issue #2843 Harden recycle.
...
Former-commit-id: 3cd6b29e7526c1a8e49426c1a8e49422adc336df
2014-03-05 11:16:12 -06:00
Nate Jensen
ee84466b3c
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: 0dc5dfae82c07f2e829dc07f2e829dad7d5a745b
2014-03-05 09:04:10 -06:00
Brian Clements
17661200a1
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: c9906cde88c0e4615967c0e4615967d76dd2a8f6
2014-03-05 09:00:57 -06:00
Lee Venable
3c85140ba0
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 980e21ca5ae71dad9c80e71dad9c80f38afb0976
2014-03-05 08:37:13 -06:00
Richard Peter
2be140c0c4
Merge "Issue #2627 harden static initialization on edex main thread" into development
...
Former-commit-id: 6b08aaf55c7c02ab6b667c02ab6b66fdba3b3099
2014-03-04 17:54:09 -06:00
Nate Jensen
e458ca5c52
Issue #2627 harden static initialization on edex main thread
...
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff
Former-commit-id: 660998ac72b989b7240cb989b7240c99254281af
2014-03-04 17:19:24 -06:00
Brian Clements
2482a58273
Issue #2756 added security toggle to collaboration
...
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order
Former-commit-id: f44f1212dd7b085f62de7b085f62decd0e1e271a
2014-03-04 16:02:25 -06:00
