Steve Harris
708485427e
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 873bd6b889f60aba35d6
2014-03-07 15:43:40 -06:00
Steve Harris
f992a6b046
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 92232fa06340b543f9a8
2014-03-07 15:16:18 -06:00
Brian.Dyke
6ced1bedc2
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 394076196b7b798ab5d2
2014-03-07 09:01:09 -05:00
Brian.Dyke
2f94480121
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 312cd8a3e86414bdab57
2014-03-07 08:57:07 -05:00
Brian.Dyke
a4c136fd60
14.1.1-22 baseline
...
Former-commit-id: 21f17d4f9b08d8f1a0ee
2014-03-07 08:49:00 -05:00
Steve Harris
7fbbc1e118
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
...
Former-commit-id: 8b6263bfbd1c64a5c025
2014-03-06 18:31:10 -06:00
Steve Harris
8ec20fc5e9
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 7f1ad89df9a2e36f4c6c
2014-03-06 18:19:55 -06:00
Brad Gonzales
66386f340a
Issue #2885 Updated java version in build.properties.p2.
...
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: 2e224094adb47dc5df40
2014-03-06 17:35:43 -06:00
Brad Gonzales
78d35d4033
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: 0e3dc17872dea17a19da
2014-03-06 16:29:37 -06:00
Ben Steffensmeier
062e3ddb48
Issue #2831 Fix No Data Value in collaboration images.
...
Former-commit-id: 82b87900506962f80c5a
2014-03-06 13:37:08 -06:00
Brian.Dyke
b657767cb1
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: db274c890feefe8c45fe
2014-03-06 10:54:15 -05:00
Steve Harris
96658d8ce0
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: 069093884fffcc34f8d4
2014-03-06 08:39:43 -06:00
Nate Jensen
fb50424456
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: be9cc9397fa91e941d3e
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
a06a98750f
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: 12ed63619a775c29e77c
2014-03-05 14:57:28 -06:00
Nate Jensen
d3f18729c3
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: cf4631f9bf48fa8f8d1b
2014-03-05 14:41:12 -06:00
Mike Duff
c0bf150e15
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: e97e745b619c873e6dd9
2014-03-05 14:39:55 -06:00
Nate Jensen
17ee130b2a
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 59dcb3a97d2eea0b9205
2014-03-05 14:14:25 -06:00
Max Schenkelberg
0fbc2df17d
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 10bfa59aefb5ed7ac361
2014-03-05 13:51:06 -06:00
Mike Duff
3bdf20dea3
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 8c693a5f709963324b60
2014-03-05 12:02:33 -06:00
Nate Jensen
d82a7d3640
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 7a2a489c77308ab7c314
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
af1bdf1b53
Issue #2843 Harden recycle.
...
Former-commit-id: 26c1a8e4943cd6b29e75
2014-03-05 11:16:12 -06:00
Brian Clements
d06182573e
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: c0e4615967c9906cde88
2014-03-05 09:00:57 -06:00
Lee Venable
98daa663b4
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: e71dad9c80980e21ca5a
2014-03-05 08:37:13 -06:00
Nate Jensen
ddf96ad45b
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: 67fa21cfd9faf3dbb670
2014-03-04 13:59:01 -06:00
Nate Jensen
4c0df85caf
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: e3d211c8d73c3e483d18
2014-03-04 13:18:16 -06:00
Richard Peter
2a5b0fb3ba
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: f87a913017873fa00fac
2014-03-04 12:43:17 -06:00
Nate Jensen
a2b3bc717e
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: f50a2789dd7ac7dd5f01
2014-03-04 10:55:05 -06:00
Brian.Dyke
7cad374af5
OB_14.1.1-21 baseline
...
Former-commit-id: 1d92e5bab629681c7ca4
2014-03-04 11:47:42 -05:00
Max Schenkelberg
654da3c0a2
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: a01a6d68d0cbf8b9249c
2014-03-04 09:23:36 -06:00
Max Schenkelberg
6658c94e6e
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: dbcbd1b5601854bbb477
2014-03-03 17:59:48 -06:00
Nate Jensen
58c9dc0c69
Issue #2792 enforce getDensity() will not return above max
...
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: 384b531d2622153d43bb
2014-03-03 14:44:16 -06:00
Brian Clements
724bafd44f
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: 91936beadf7a7d476899
2014-03-03 13:17:05 -06:00
Ben Steffensmeier
4094ef6170
Issue #2791 Use Data Source for all grid data access.
...
Former-commit-id: 6fa441396f05770129c1
2014-02-28 17:06:33 -06:00
Brian Clements
edd72cbde4
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: ce24bd1018d8e283e1b4
2014-02-28 16:15:17 -06:00
Lee Venable
734f69403a
Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
...
Former-commit-id: f171e3adb0c77634951c
2014-02-28 13:50:15 -06:00
Mike Duff
ee06fc58b5
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 5440ff64d15f433b4f6b
2014-02-28 13:23:34 -06:00
Richard Peter
f5c3e5d549
Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
...
Former-commit-id: 5565bc88afd5e09a82a7
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
a7787a7ff2
Issue #2791 Switch contouring to use DataSource for data access.
...
Former-commit-id: 4b7f3b2a5b23ce77d864
2014-02-28 11:28:02 -06:00
Nate Jensen
92527f1ffa
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
...
Former-commit-id: 63244f840f908d308825
2014-02-28 09:53:27 -06:00
Lee Venable
708de93fc4
Issue #2795 - removed test code.
...
Former-commit-id: 28fe1e99e2f94bcc4d3f
2014-02-27 15:46:30 -06:00
Richard Peter
f13c86bc3e
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: 0e25ae35c11c150e6e8b
2014-02-27 15:18:26 -06:00
Richard Peter
c0d495d9c3
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 86d42ed603862069dfd3
2014-02-27 13:46:47 -06:00
Richard Peter
229437773b
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: 729d608a15d54fee5dae
2014-02-27 13:20:49 -06:00
Nate Jensen
9a39867de4
Merge "Issue #2312 Fix file dialog input on export image dialog." into development
...
Former-commit-id: 71d494eb34d1ec11d932
2014-02-27 09:10:07 -06:00
Brian.Dyke
16117255f3
OB_14.1.1-20 baseline
...
Former-commit-id: 324696c4362bad40cfee
2014-02-26 17:39:15 -05:00
Lee Venable
facc67e6b5
Issue #2795 - added code to check for null images.
...
Former-commit-id: 0c7395d42349530206f4
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
f45646ae91
Issue #2711 Use level factory more.
...
Former-commit-id: d7a3ae4fdb3da086b71f
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
2d11421854
Issue #2312 Fix file dialog input on export image dialog.
...
Former-commit-id: e1dc75f97a6d0a78e233
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
804cbb48e6
Issue #2703 Fix GFE time matching in iscMode.
...
Former-commit-id: d8bfdd1a7e07bc9f075f
2014-02-26 14:45:19 -06:00
Lee Venable
e0fbc02307
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: 94cede8153e0ee93bab3
2014-02-26 13:21:58 -06:00
