Brian.Dyke
e72bd45b20
Merge 13.5.3 DR_16824
...
Former-commit-id: b8a4de2bf07baa5ee0d5b8fd0f16eddafe7e6a42b8fd0f16eddafe7e6a428c16576a82981373f82b
2014-03-06 11:22:08 -05:00
Brian.Dyke
df3291e0b4
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 8c54df9e0c26fe429c4b1778d20745010b7a1df51778d20745010b7a1df5c6dae5a81f14844a10b6
2014-03-06 11:04:34 -05:00
Brian.Dyke
b2cd2711f9
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: e5972b71596313b7af0c2dbac1697dcb1b4a7ac52dbac1697dcb1b4a7ac53fdb85c62d57a28e817d
2014-03-06 10:56:44 -05: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
Nate Jensen
8b23913692
Merge "Issue #2702 replaced openfire source tarball with 3.9.1" into development
...
Former-commit-id: 1674fb814c01ce4ffecabc0b6ca067f60fba58b1bc0b6ca067f60fba58b159a152c6130a088273aa
2014-03-05 15:44:36 -06:00
Brian Clements
2267c2bb0b
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: e4d22971bdbc8ac5e051ad3d10074ae1819cd4e2ad3d10074ae1819cd4e23f0115d329410ebf65f5
2014-03-05 15:29:27 -06: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
Steve Harris
8dcd31be32
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 18ae41769e1a666f9f71167ce61d6c4b01c57c0a167ce61d6c4b01c57c0a6e361c0a5712d8ff2fce
2014-03-05 13:00:23 -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
Greg Armendariz
1066106b30
Merge "Issue #2627 shorten wrapper arg for retaining failed data" into development
...
Former-commit-id: d3fcc8caeb7d9cc2361ea9e861834bd2510ab641a9e861834bd2510ab641d67748198f8239129e29
2014-03-05 11:29:43 -06:00
Ben Steffensmeier
be60a9564d
Issue #2843 Harden recycle.
...
Former-commit-id: 291d5f55df22adc336df26c1a8e4943cd6b29e7526c1a8e4943cd6b29e75af1bdf1b53ed0ec90407
2014-03-05 11:16:12 -06:00
Nate Jensen
1a21140770
Issue #2627 shorten wrapper arg for retaining failed data
...
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7
Former-commit-id: ee84466b3cad7d5a745bc07f2e829d0dc5dfae82c07f2e829d0dc5dfae8208ac542f2fd3a10ba1e6
2014-03-05 09:04:10 -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
Richard Peter
e188d13ce1
Merge "Issue #2627 harden static initialization on edex main thread" into development
...
Former-commit-id: 2be140c0c4fdba3b30997c02ab6b666b08aaf55c7c02ab6b666b08aaf55cc12b4fb4eaf6e1fc89de
2014-03-04 17:54:09 -06:00
Nate Jensen
0122afaf40
Issue #2627 harden static initialization on edex main thread
...
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff
Former-commit-id: e458ca5c5299254281afb989b7240c660998ac72b989b7240c660998ac7281a6675a14fadd59b36d
2014-03-04 17:19:24 -06:00
Brian Clements
19bb5d8de9
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: 2482a58273cd0e1e271a7b085f62def44f1212dd7b085f62def44f1212dd0790849f03c446513912
2014-03-04 16:02:25 -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
Benjamin Phillippe
fe6d70a38f
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 7ad21da0897bf51d507e59323be87e9fd35140f059323be87e9fd35140f0cd04d7dcbedaeb8bec5f
2014-03-04 13:31:41 -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
75f96fe190
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: 2b5339e16f5280398130aa8e1a3625f9bd27c061aa8e1a3625f9bd27c0613b800bcc09a81447f434
2014-03-04 12:54:23 -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
fc953460b7
Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development
...
Former-commit-id: e74b0c2854d0e405aac9ea0248ff964547cbcfeaea0248ff964547cbcfea471492201c2dba0228c2
2014-03-04 12:39:13 -06:00
Richard Peter
eb84b01b25
Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development
...
Former-commit-id: 560d3ea59f650f794329bd94f6bf994fbb2f0059bd94f6bf994fbb2f0059363e9e294f58f05e288f
2014-03-04 12:38:30 -06:00
Richard Peter
58e8cc7dd3
Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development
...
Former-commit-id: f343b8710115c9066986bc8b838a41178bfc0b79bc8b838a41178bfc0b79e350b5bae1b3c2df969a
2014-03-04 12:38:07 -06:00
Nate Jensen
c8f3303317
Issue #2870 log product id when generic packet fails to find
...
corresponding packet class
Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1
Former-commit-id: 02a7daf658ef05ddc408a1caeae5526818ea9c23a1caeae5526818ea9c23552a2af0b9b095d91c92
2014-03-04 11:52:34 -06:00
Nate Jensen
be64298394
Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development
...
Former-commit-id: 6389e2fb0292e83939153afd14e1eb9b94434a783afd14e1eb9b94434a7893da8c2075c58926d598
2014-03-04 11:42:51 -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
Nate Jensen
b920fdd0aa
Issue #2813 fix subscription package names
...
Former-commit-id: 645fec513aaf76b58b270ec866f1d2d7d0803ee90ec866f1d2d7d0803ee9df44f8246e78b2b50370
2014-03-04 10:53:58 -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
Bryan Kowal
b5840bb880
Issue #2829 - fix the spelling of 'coordinate' in GfeUtil
...
Former-commit-id: 5ded2afc7b83471b4900e6ae71087156e79f2179e6ae71087156e79f2179eda1dc41423c42fa358e
2014-03-03 17:45:09 -06:00
Ben Steffensmeier
3613b62fe1
Issue #2673 Add ability to query only ref times to Data Access Layer.
...
Former-commit-id: 2807ec9b072230164e1f641d4acd159fcb730858641d4acd159fcb7308581d2d1e20f5b9b5068329
2014-03-03 17:44:11 -06:00
Nate Jensen
3bf88e9264
Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
...
Former-commit-id: b95e0e98b836f5a3e788b9e4d40066315b7abf28b9e4d40066315b7abf285cc5a59f2e64c9de836d
2014-03-03 17:25:34 -06:00
Nate Jensen
0b58ee20ee
Merge "Issue #2792 enforce getDensity() will not return above max" into development
...
Former-commit-id: 5bd1713038f38b4e42babb9993e5802009972a2cbb9993e5802009972a2ccf960bace34df4a2361f
2014-03-03 16:30:49 -06:00
Brian Clements
6271ff6787
Issue #2667 delta scripts for lightning source name change in xml files
...
handles stored procedures/bundles in localization
Former-commit-id: 93c743267dcc506373460811b0580fddcb1011bb0811b0580fddcb1011bb0292707f9dbf67bd0a33
2014-03-03 16:30:45 -06:00
Nate Jensen
18b2556559
Merge "Issue #2756 install script for collaboration http server" into development
...
Former-commit-id: 6ca8416898e74625dcca2a83780be8352a884b262a83780be8352a884b26d9cfafa4cd18cd324d92
2014-03-03 15:50:35 -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
11b30001d5
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: 769ee18145a7384488253b6121b9fa934ce73e4b3b6121b9fa934ce73e4ba44c5f8d4875c179b06f
2014-03-03 14:07:01 -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
Benjamin Phillippe
71d5fbda33
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: ea31c5b370d339e232f4ed050996a25483d6d7aeed050996a25483d6d7ae15a5e7c4a4603e433054
2014-03-03 10:57:16 -06:00
Nate Jensen
46db8b9eb6
Merge "Issue #2756 implemented HTTP public key auth scheme" into development
...
Former-commit-id: cce23732cdc15f9950a199fd81f105869909cc6699fd81f105869909cc6619a252d820a035269bb3
2014-03-03 09:44:26 -06:00
