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
Nate Jensen
c2c596b6bc
Merge "Issue #2673 Fix name of lighning data factory." into development
...
Former-commit-id: 873f06e85e43de990a4c
2014-03-10 13:53: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
Ben Steffensmeier
89eeb243ec
Issue #2673 Fix name of lighning data factory.
...
Former-commit-id: bd7d250cec019cf9c943
2014-03-10 13:35:34 -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
Richard Peter
9585896021
Merge "Issue #2876 - removed import, changed jave version to 1.6" into development
...
Former-commit-id: 7a2409f4886581f2b3f4
2014-03-10 12:53:15 -05:00
Mike Duff
f6db852657
Issue #2876 - removed import, changed jave version to 1.6
...
Change-Id: Ia2806bff0b7042983c6dd7498c76a66c8c277a29
Former-commit-id: 419293a94663b9452c3f
2014-03-10 12:49:27 -05:00
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
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
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
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
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
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
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
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
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
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
Steve Harris
1a666f9f71
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 4b01c57c0a167ce61d6c
2014-03-05 13:00:23 -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
