Brian.Dyke
4e38785329
Merge 13.5.3 DR_16824
...
Former-commit-id: 7baa5ee0d5b8fd0f16ed7baa5ee0d5b8fd0f16eddafe7e6a42dafe7e6a42981373f82b8c16576a82bcf5bf170d
2014-03-06 11:22:08 -05:00
Brian.Dyke
0c6ba63abc
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 26fe429c4b1778d2074526fe429c4b1778d20745010b7a1df5010b7a1df514844a10b6c6dae5a81f863de85b6b
2014-03-06 11:04:34 -05:00
Brian.Dyke
36e0ad0fdd
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: 6313b7af0c2dbac1697d6313b7af0c2dbac1697dcb1b4a7ac5cb1b4a7ac557a28e817d3fdb85c62d6f5baf3984
2014-03-06 10:56:44 -05:00
Brian.Dyke
8de6b2d57b
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: bd81ebd8c2db274c890fbd81ebd8c2db274c890feefe8c45feeefe8c45fe26140187b1b657767cb1b9e9126e11
2014-03-06 10:54:15 -05:00
Steve Harris
2db5dcf6eb
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: 3ba28aabea069093884f3ba28aabea069093884fffcc34f8d4ffcc34f8d4587f15a95d96658d8ce036a0533f19
2014-03-06 08:39:43 -06:00
Nate Jensen
cc331b4a72
Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
...
Former-commit-id: 01ce4ffecabc0b6ca06701ce4ffecabc0b6ca067f60fba58b1f60fba58b10a088273aa59a152c613821932a07a
2014-03-05 15:44:36 -06:00
Brian Clements
4a9c85e7ac
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: bc8ac5e051ad3d10074abc8ac5e051ad3d10074ae1819cd4e2e1819cd4e2410ebf65f53f0115d329544c713135
2014-03-05 15:29:27 -06:00
Nate Jensen
f19837e0ed
Merge "Issue #2791 Move D2D Grids to direct memory." into development
...
Former-commit-id: 0d547ab0bfbe9cc9397f0d547ab0bfbe9cc9397fa91e941d3ea91e941d3e76ded096a8fb504244567bb56ce041
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
ab265087eb
Issue #2791 Move D2D Grids to direct memory.
...
Former-commit-id: fd34cf399312ed63619afd34cf399312ed63619a775c29e77c775c29e77c2bc8805fbca06a98750f3f62075baa
2014-03-05 14:57:28 -06:00
Nate Jensen
f84030e2b7
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: ae9adefbf7cf4631f9bfae9adefbf7cf4631f9bf48fa8f8d1b48fa8f8d1bb097d488cad3f18729c38380226f6b
2014-03-05 14:41:12 -06:00
Mike Duff
8a798710c5
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: 25425a4268e97e745b6125425a4268e97e745b619c873e6dd99c873e6dd90251ad5bcac0bf150e1515c32a1513
2014-03-05 14:39:55 -06:00
Nate Jensen
d7b438bccf
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 54d015cb4f59dcb3a97d54d015cb4f59dcb3a97d2eea0b92052eea0b92052def452e2c17ee130b2af8e7bfa835
2014-03-05 14:14:25 -06:00
Max Schenkelberg
7f9bea7552
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 83ac37724e10bfa59aef83ac37724e10bfa59aefb5ed7ac361b5ed7ac361a8b436c8670fbc2df17d9b26076206
2014-03-05 13:51:06 -06:00
Steve Harris
86476b5064
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 1a666f9f71167ce61d6c1a666f9f71167ce61d6c4b01c57c0a4b01c57c0a12d8ff2fce6e361c0a57b00cecc2ab
2014-03-05 13:00:23 -06:00
Mike Duff
c6e743bbc1
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 14107f09148c693a5f7014107f09148c693a5f709963324b609963324b60198d9e67803bdf20dea385ac8c85e0
2014-03-05 12:02:33 -06:00
Nate Jensen
e97545fd54
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 09311b82707a2a489c7709311b82707a2a489c77308ab7c314308ab7c314d07da4c425d82a7d3640d4305f1578
2014-03-05 11:41:05 -06:00
Greg Armendariz
9ffcace93e
Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
...
Former-commit-id: 7d9cc2361ea9e861834b7d9cc2361ea9e861834bd2510ab641d2510ab6418239129e29d67748198f1deaa4a9c1
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
4b966138f6
Issue #2843 Harden recycle.
...
Former-commit-id: 22adc336df26c1a8e49422adc336df26c1a8e4943cd6b29e753cd6b29e75ed0ec90407af1bdf1b532c687a4064
2014-03-05 11:16:12 -06:00
Nate Jensen
df3a5c02e5
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: ad7d5a745bc07f2e829dad7d5a745bc07f2e829d0dc5dfae820dc5dfae82d3a10ba1e608ac542f2f838a3e9dd8
2014-03-05 09:04:10 -06:00
Brian Clements
6dc478d975
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: d76dd2a8f6c0e4615967d76dd2a8f6c0e4615967c9906cde88c9906cde883d4323b447d06182573edec443b1af
2014-03-05 09:00:57 -06:00
Lee Venable
4b81954f16
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: f38afb0976e71dad9c80f38afb0976e71dad9c80980e21ca5a980e21ca5a3966bc355c98daa663b47e45b908af
2014-03-05 08:37:13 -06:00
Richard Peter
ec31c46b9a
Merge "Issue #2627 harden static initialization on edex main thread" into development
...
Former-commit-id: fdba3b30997c02ab6b66fdba3b30997c02ab6b666b08aaf55c6b08aaf55cf6e1fc89dec12b4fb4ea0041d4c2d3
2014-03-04 17:54:09 -06:00
Nate Jensen
682291237e
Issue #2627 harden static initialization on edex main thread
...
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff
Former-commit-id: 99254281afb989b7240c99254281afb989b7240c660998ac72660998ac72fadd59b36d81a6675a146df4547b41
2014-03-04 17:19:24 -06:00
Brian Clements
8d9da2b63e
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: cd0e1e271a7b085f62decd0e1e271a7b085f62def44f1212ddf44f1212ddc4465139120790849f038b1a00fb2f
2014-03-04 16:02:25 -06:00
Nate Jensen
6d836f5d82
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: 8ebe236ce967fa21cfd98ebe236ce967fa21cfd9faf3dbb670faf3dbb6700b827a343bddf96ad45bc427ff8471
2014-03-04 13:59:01 -06:00
Benjamin Phillippe
d0999c05e8
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 7bf51d507e59323be87e7bf51d507e59323be87e9fd35140f09fd35140f0daeb8bec5fcd04d7dcbe6b6a5b0e4f
2014-03-04 13:31:41 -06:00
Nate Jensen
fb903ade0b
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: 559b1794afe3d211c8d7559b1794afe3d211c8d73c3e483d183c3e483d18e08b21fc404c0df85caf21d3110c28
2014-03-04 13:18:16 -06:00
Richard Peter
0219b80555
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: 5280398130aa8e1a36255280398130aa8e1a3625f9bd27c061f9bd27c061a81447f4343b800bcc099ce19b16cc
2014-03-04 12:54:23 -06:00
Richard Peter
13bad4e99e
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 090829f75ef87a913017090829f75ef87a913017873fa00fac873fa00fac3a96d0758a2a5b0fb3badfa3f06e8e
2014-03-04 12:43:17 -06:00
Nate Jensen
3baaa6e941
Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
...
Former-commit-id: d0e405aac9ea0248ff96d0e405aac9ea0248ff964547cbcfea4547cbcfea2dba0228c2471492201cf088ff8a4e
2014-03-04 12:39:13 -06:00
Richard Peter
351998e947
Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
...
Former-commit-id: 650f794329bd94f6bf99650f794329bd94f6bf994fbb2f00594fbb2f005958f05e288f363e9e294f2aedbc961d
2014-03-04 12:38:30 -06:00
Richard Peter
588b95db5c
Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
...
Former-commit-id: 15c9066986bc8b838a4115c9066986bc8b838a41178bfc0b79178bfc0b79b3c2df969ae350b5bae1000c577656
2014-03-04 12:38:07 -06:00
Nate Jensen
c183d7bd51
Issue #2870 log product id when generic packet fails to find
...
corresponding packet class
Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1
Former-commit-id: ef05ddc408a1caeae552ef05ddc408a1caeae5526818ea9c236818ea9c23b095d91c92552a2af0b96139ef3461
2014-03-04 11:52:34 -06:00
Nate Jensen
0ee8c9e58a
Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
...
Former-commit-id: 92e83939153afd14e1eb92e83939153afd14e1eb9b94434a789b94434a78c58926d59893da8c2075cd17f7b63f
2014-03-04 11:42:51 -06:00
Nate Jensen
1d27417675
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: 75611f0631f50a2789dd75611f0631f50a2789dd7ac7dd5f017ac7dd5f0144e9b34927a2b3bc717ecb9d2a3298
2014-03-04 10:55:05 -06:00
Nate Jensen
5132a0f8cb
Issue #2813 fix subscription package names
...
Former-commit-id: af76b58b270ec866f1d2af76b58b270ec866f1d2d7d0803ee9d7d0803ee978b2b50370df44f8246ee22b486f25
2014-03-04 10:53:58 -06:00
Brian.Dyke
ea56516bf5
OB_14.1.1-21 baseline
...
Former-commit-id: 271ec85c0c1d92e5bab6271ec85c0c1d92e5bab629681c7ca429681c7ca4c68649b4f97cad374af5079cc93f89
2014-03-04 11:47:42 -05:00
Max Schenkelberg
c6cf08db73
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: 59434c8a60a01a6d68d059434c8a60a01a6d68d0cbf8b9249ccbf8b9249c39e1c4fa46654da3c0a2f509321134
2014-03-04 09:23:36 -06:00
Max Schenkelberg
83103254e7
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: 6edfb8965fdbcbd1b5606edfb8965fdbcbd1b5601854bbb4771854bbb477bff80c3ee96658c94e6e96bdc00728
2014-03-03 17:59:48 -06:00
Bryan Kowal
34c1a79ec8
Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
...
Former-commit-id: 83471b4900e6ae71087183471b4900e6ae71087156e79f217956e79f21793c42fa358eeda1dc4142832aca28ee
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
9d757d79e2
Issue #2673 Add ability to query only ref times to Data Access Layer.
...
Former-commit-id: 2230164e1f641d4acd152230164e1f641d4acd159fcb7308589fcb730858b9b50683291d2d1e20f54f01f96cf4
2014-03-03 17:44:11 -06:00
Nate Jensen
ffc65bdbb0
Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
...
Former-commit-id: 36f5a3e788b9e4d4006636f5a3e788b9e4d40066315b7abf28315b7abf2864c9de836d5cc5a59f2ea69546725c
2014-03-03 17:25:34 -06:00
Nate Jensen
aeb07db59f
Merge "Issue #2792 enforce getDensity() will not return above max" into development
...
Former-commit-id: f38b4e42babb9993e580f38b4e42babb9993e5802009972a2c2009972a2c4df4a2361fcf960bace38045bbfc16
2014-03-03 16:30:49 -06:00
Brian Clements
9a8ad193c2
Issue #2667 delta scripts for lightning source name change in xml files
...
handles stored procedures/bundles in localization
Former-commit-id: cc506373460811b0580fcc506373460811b0580fddcb1011bbddcb1011bbbf67bd0a330292707f9dc700bba545
2014-03-03 16:30:45 -06:00
Nate Jensen
226f506a0e
Merge "Issue #2756 install script for collaboration http server" into development
...
Former-commit-id: e74625dcca2a83780be8e74625dcca2a83780be8352a884b26352a884b2618cd324d92d9cfafa4cd6e18253972
2014-03-03 15:50:35 -06:00
Nate Jensen
224fd09dab
Issue #2792 enforce getDensity() will not return above max
...
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: 7f31e34dc9384b531d267f31e34dc9384b531d2622153d43bb22153d43bbe40fbf0ba058c9dc0c696f488f855f
2014-03-03 14:44:16 -06:00
Brian Clements
861716341a
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: a7384488253b6121b9faa7384488253b6121b9fa934ce73e4b934ce73e4b75c179b06fa44c5f8d48a36f303646
2014-03-03 14:07:01 -06:00
Brian Clements
44fdea985e
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: 5d21675a9191936beadf5d21675a9191936beadf7a7d4768997a7d476899bf4c119278724bafd44fdc8667011b
2014-03-03 13:17:05 -06:00
Benjamin Phillippe
719b90e1e7
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: d339e232f4ed050996a2d339e232f4ed050996a25483d6d7ae5483d6d7ae603e43305415a5e7c4a4090dbe3918
2014-03-03 10:57:16 -06:00
Nate Jensen
6ec6ce6b17
Merge "Issue #2756 implemented HTTP public key auth scheme" into development
...
Former-commit-id: c15f9950a199fd81f105c15f9950a199fd81f105869909cc66869909cc66a035269bb319a252d82076318d62e8
2014-03-03 09:44:26 -06:00
