Commit graph

5078 commits

Author SHA1 Message Date
Brian.Dyke
010b7a1df5 ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: 85700a6c632125b5f1d36b37a70767fbd9819142
2014-03-06 11:04:34 -05:00
Brian.Dyke
cb1b4a7ac5 ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: c1dc533bf7ee6500da3f6d75699ad7758a39462b
2014-03-06 10:56:44 -05:00
Brian.Dyke
eefe8c45fe ASM #124 - Display GLD360 lightning data
Former-commit-id: 1edba9216beac913f9bd867da9988e213394a396
2014-03-06 10:54:15 -05:00
Steve Harris
ffcc34f8d4 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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
2014-03-06 08:39:43 -06:00
Nate Jensen
f60fba58b1 Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
Former-commit-id: 0bc02d3ad06b0c0daddefd9550772c79687edfb7
2014-03-05 15:44:36 -06:00
Brian Clements
e1819cd4e2 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: d8f30a7af43faa2fd4ac18769d2313ae6008cfd1
2014-03-05 15:29:27 -06:00
Nate Jensen
a91e941d3e Merge "Issue #2791 Move D2D Grids to direct memory." into development
Former-commit-id: acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
775c29e77c Issue #2791 Move D2D Grids to direct memory.
Former-commit-id: 8d8a06be12652349032f15ab1e31d5f23adf0b24
2014-03-05 14:57:28 -06:00
Nate Jensen
48fa8f8d1b Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: e6dc5f076bfd4811b2b1cdaf3782a5066e032381
2014-03-05 14:41:12 -06:00
Mike Duff
9c873e6dd9 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: b087558dce4e19596c93d47e986af50fae806a74
2014-03-05 14:39:55 -06:00
Nate Jensen
2eea0b9205 Merge "Issue #2861 added synchronized blocks where necessary" into development
Former-commit-id: e108aa41bb586593f50970da53109a82d2bb8452
2014-03-05 14:14:25 -06:00
Max Schenkelberg
b5ed7ac361 Issue #2861 added synchronized blocks where necessary
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811

Former-commit-id: 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede
2014-03-05 13:51:06 -06:00
Steve Harris
4b01c57c0a Merge branch 'master_14.2.1' into ncep_14.2.1
Former-commit-id: 505bcf7b47aac1344bb46bac690ce83591b8e554
2014-03-05 13:00:23 -06:00
Mike Duff
9963324b60 Issue #2632 - Fix problem with multiple notifiers per user.
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: 168a656194aa3b455f403aa92b290bbbe17d3b45
2014-03-05 12:02:33 -06:00
Nate Jensen
308ab7c314 Merge "Issue #2843 Harden recycle." into development
Former-commit-id: c36359b0aaa1540f6d941e9445b41ed929a91e14
2014-03-05 11:41:05 -06:00
Greg Armendariz
d2510ab641 Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
Former-commit-id: ae3372772795cda39176223231d354d776feb1a3
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
3cd6b29e75 Issue #2843 Harden recycle.
Former-commit-id: 364b818dbd055b13fd8d5bb9f40c16f730f30b53
2014-03-05 11:16:12 -06:00
Nate Jensen
0dc5dfae82 Issue #2627 shorten wrapper arg for retaining failed data
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7

Former-commit-id: 54578116023ebc7a6474a3297d419c2777d31e17
2014-03-05 09:04:10 -06:00
Brian Clements
c9906cde88 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: 3f7cfbbf1c60cffa0aa31f53b29521b78774042e
2014-03-05 09:00:57 -06:00
Lee Venable
980e21ca5a Issue #2833 - fixed a widget disposed error.
Former-commit-id: eb3cf0ade9203766a437512b85e55f32108db1e3
2014-03-05 08:37:13 -06:00
Richard Peter
6b08aaf55c Merge "Issue #2627 harden static initialization on edex main thread" into development
Former-commit-id: 82f20a96a82ef7f047f716662d319e522ee1c394
2014-03-04 17:54:09 -06:00
Nate Jensen
660998ac72 Issue #2627 harden static initialization on edex main thread
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff

Former-commit-id: bb838950a2979703ae6ab8f486fc4460789c3f1b
2014-03-04 17:19:24 -06:00
Brian Clements
f44f1212dd 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: 1e52606fe709f2cf27f835363ca5ab2bf6ada912
2014-03-04 16:02:25 -06:00
Nate Jensen
faf3dbb670 Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
Former-commit-id: 27ce4812affb11b506a21b5cf54c4b74b8c49031
2014-03-04 13:59:01 -06:00
Benjamin Phillippe
9fd35140f0 Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: a265027cacde7690171d30455227c5a843e0d397
2014-03-04 13:31:41 -06:00
Nate Jensen
3c3e483d18 Issue #2832 fix watches and warnings in collaboration displays
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: bb84ca01bb74bc93710ba92fcbdb13b30dc2454e
2014-03-04 13:18:16 -06:00
Richard Peter
f9bd27c061 Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 26cbe68f0a86660968016da88a4b51d1735e8227
2014-03-04 12:54:23 -06:00
Richard Peter
873fa00fac Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 0b9954f00ca5f5a61a1cd79d094408e43b115abe
2014-03-04 12:43:17 -06:00
Nate Jensen
4547cbcfea Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
Former-commit-id: 51797cd167b76be2b3ab55b6c7632e0039d7145c
2014-03-04 12:39:13 -06:00
Richard Peter
4fbb2f0059 Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
Former-commit-id: 12458982fe4c43a9b61e9194246c80527d02da6d
2014-03-04 12:38:30 -06:00
Richard Peter
178bfc0b79 Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
Former-commit-id: 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e
2014-03-04 12:38:07 -06:00
Nate Jensen
6818ea9c23 Issue #2870 log product id when generic packet fails to find
corresponding packet class

Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1

Former-commit-id: 0d01b387e454f276d0ebdecfb14ad294b67a55b7
2014-03-04 11:52:34 -06:00
Nate Jensen
9b94434a78 Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
Former-commit-id: eb07c44098abe7f72b578e24a4a7ea7e92dc655c
2014-03-04 11:42:51 -06:00
Nate Jensen
7ac7dd5f01 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: 788133c5ea1a3005ed309a466e8cafad6db84ce3
2014-03-04 10:55:05 -06:00
Nate Jensen
d7d0803ee9 Issue #2813 fix subscription package names
Former-commit-id: 081b621b5932d77c03117840e887ed7017f1d48b
2014-03-04 10:53:58 -06:00
Brian.Dyke
29681c7ca4 OB_14.1.1-21 baseline
Former-commit-id: d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b
2014-03-04 11:47:42 -05:00
Max Schenkelberg
cbf8b9249c 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: cc34e3dbebe13ec4f63b7529f5053391135837ef
2014-03-04 09:23:36 -06:00
Max Schenkelberg
1854bbb477 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: 51664693bd87df52acdb74d5286b61eeb06b792d
2014-03-03 17:59:48 -06:00
Bryan Kowal
56e79f2179 Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
Former-commit-id: a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
9fcb730858 Issue #2673 Add ability to query only ref times to Data Access Layer.
Former-commit-id: 37c406a9945bfb6ccb99d2472b44d649f2ce18d0
2014-03-03 17:44:11 -06:00
Nate Jensen
315b7abf28 Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
Former-commit-id: 2376124f601e97cf46ee8cb3281c326e178aab4d
2014-03-03 17:25:34 -06:00
Nate Jensen
2009972a2c Merge "Issue #2792 enforce getDensity() will not return above max" into development
Former-commit-id: 7c04864c902d3928165ea0bc107902b094209ed6
2014-03-03 16:30:49 -06:00
Brian Clements
ddcb1011bb Issue #2667 delta scripts for lightning source name change in xml files
handles stored procedures/bundles in localization


Former-commit-id: 8e3e3be372d5db6dfc5897407074bc250fbef294
2014-03-03 16:30:45 -06:00
Nate Jensen
352a884b26 Merge "Issue #2756 install script for collaboration http server" into development
Former-commit-id: d3d0173f7b5353256c1592b2b16cccd04ee98eff
2014-03-03 15:50:35 -06:00
Nate Jensen
22153d43bb Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: a502a64219e869401b1bff82fbb73e67565a6dae
2014-03-03 14:44:16 -06:00
Brian Clements
934ce73e4b Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a
2014-03-03 14:07:01 -06:00
Brian Clements
7a7d476899 Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: 62e8a279840672f1ee2bb9f3ecf982c80a04d83c
2014-03-03 13:17:05 -06:00
Benjamin Phillippe
5483d6d7ae Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e
2014-03-03 10:57:16 -06:00
Nate Jensen
869909cc66 Merge "Issue #2756 implemented HTTP public key auth scheme" into development
Former-commit-id: 21d22f790f71941797a23926be5ed77c6d72353b
2014-03-03 09:44:26 -06:00
Dave Hladky
d40107e530 Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: f6e63a5d65a5450eb58e59833091b41ef4bf0a3f
2014-03-03 08:46:37 -06:00