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
Richard Peter
9f43d8e4b2
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 63da19f472c267c5a08f86d42ed603862069dfd386d42ed603862069dfd3c0d495d9c3237ada7b8b
2014-02-27 13:46:47 -06:00
Richard Peter
3b09c69f65
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: ae39697315a23c8f2c27729d608a15d54fee5dae729d608a15d54fee5dae229437773b67093287a0
2014-02-27 13:20:49 -06:00
Mike Duff
9fccc1836b
Issue #2842 - Fix MPE tearoff menu issues, add next/prev hr toolbar buttons
...
Change-Id: Ic16bc87680918a1a462bcd5373e8f92faf6d905d
Former-commit-id: 4bf028c4d77d14383bed801abc37a242982306ab801abc37a242982306abaa8ca4241305cf39b8a6
2014-02-27 12:01:30 -06:00
Nate Jensen
b13f098262
Merge "Issue #2312 Fix file dialog input on export image dialog." into development
...
Former-commit-id: 6e94f1dbbf414cc002b171d494eb34d1ec11d93271d494eb34d1ec11d9329a39867de480ef0dc055
2014-02-27 09:10:07 -06:00
Juliya Dynina
e6a5f06b88
Merge "ASM #236 " into asm_14.2.2
...
Former-commit-id: 86838cc422a0af710ac37d2a404f6609708ce0ba7d2a404f6609708ce0bac8ab0aa33a33bfcfd251
2014-02-27 09:48:01 -05:00
Brian.Dyke
89b66fcb5b
OB_14.1.1-20 baseline
...
Former-commit-id: 2613e13e08b2401d2f0d324696c4362bad40cfee324696c4362bad40cfee16117255f3c873f20d04
2014-02-26 17:39:15 -05:00
Lee Venable
da795bce98
Issue #2795 - added code to check for null images.
...
Former-commit-id: 191ca5f9ca5546b537cf0c7395d42349530206f40c7395d42349530206f4facc67e6b535f6f35186
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
4d1276def2
Issue #2711 Use level factory more.
...
Former-commit-id: 3d9b4352621069ef8d67d7a3ae4fdb3da086b71fd7a3ae4fdb3da086b71ff45646ae9129f9a87085
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
88fd930b77
Issue #2312 Fix file dialog input on export image dialog.
...
Former-commit-id: ee8f345cb22fd8351874e1dc75f97a6d0a78e233e1dc75f97a6d0a78e2332d11421854058652febe
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
66b052cd5a
Issue #2703 Fix GFE time matching in iscMode.
...
Former-commit-id: fa6dcaac842425b9665cd8bfdd1a7e07bc9f075fd8bfdd1a7e07bc9f075f804cbb48e60fde78c595
2014-02-26 14:45:19 -06:00
Lee Venable
de2bff4d95
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: d74b2c0118bb4b03437594cede8153e0ee93bab394cede8153e0ee93bab3e0fbc0230791d419662c
2014-02-26 13:21:58 -06:00
steve.naples
f4c11adcfc
ASM #236
...
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd
Former-commit-id: 4400821f5306f619b3ff6be82c41fccc9e62c8066be82c41fccc9e62c8069b850d81df1c6f6be15e
2014-02-26 18:54:36 +00:00
