Brian.Dyke
48cc3b6c55
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 1fe5504d4c3ac2a61218
2014-03-07 11:50:06 -05:00
David Friedman
103fece7b7
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: a58f3cb7df2c1a3442d6
2014-03-07 14:58:09 +00:00
Brian.Dyke
a0e3f08fce
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 7b798ab5d2394076196b
2014-03-07 09:01:09 -05:00
Brian.Dyke
0bbf137b05
Merge branch 'fun_merge' into master_14.2.1
...
Former-commit-id: 6414bdab57312cd8a3e8
2014-03-07 08:57:07 -05:00
Brian.Dyke
fe30e1d545
14.1.1-22 baseline
...
Former-commit-id: 08d8f1a0ee21f17d4f9b
2014-03-07 08:49:00 -05:00
Steve Harris
3358e8d6ef
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a2e36f4c6c7f1ad89df9
2014-03-06 18:19:55 -06:00
David Friedman
fa849dfefa
ASM #74 - Fix RadarServer configuration import utility JAR dependency
...
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: d08597a0d411d0d191fd
2014-03-06 17:07:23 +00:00
Brian.Dyke
7baa5ee0d5
Merge 13.5.3 DR_16824
...
Former-commit-id: dafe7e6a42b8fd0f16ed
2014-03-06 11:22:08 -05:00
Brian.Dyke
26fe429c4b
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
...
Former-commit-id: 010b7a1df51778d20745
2014-03-06 11:04:34 -05:00
Brian.Dyke
6313b7af0c
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
...
Former-commit-id: cb1b4a7ac52dbac1697d
2014-03-06 10:56:44 -05:00
Brian.Dyke
bd81ebd8c2
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: eefe8c45fedb274c890f
2014-03-06 10:54:15 -05:00
Steve Harris
3ba28aabea
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: ffcc34f8d4069093884f
2014-03-06 08:39:43 -06:00
Steve Harris
1a666f9f71
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 4b01c57c0a167ce61d6c
2014-03-05 13:00:23 -06:00
Lee Venable
f38afb0976
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 980e21ca5ae71dad9c80
2014-03-05 08:37:13 -06:00
Benjamin Phillippe
7bf51d507e
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 9fd35140f059323be87e
2014-03-04 13:31:41 -06:00
Richard Peter
5280398130
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: f9bd27c061aa8e1a3625
2014-03-04 12:54:23 -06:00
Nate Jensen
af76b58b27
Issue #2813 fix subscription package names
...
Former-commit-id: d7d0803ee90ec866f1d2
2014-03-04 10:53:58 -06:00
Brian.Dyke
271ec85c0c
OB_14.1.1-21 baseline
...
Former-commit-id: 29681c7ca41d92e5bab6
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
d339e232f4
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: 5483d6d7aeed050996a2
2014-03-03 10:57:16 -06:00
Lee Venable
e34e636dc7
Issue #2795 - removed test code.
...
Former-commit-id: f94bcc4d3f28fe1e99e2
2014-02-27 15:46:30 -06:00
Richard Peter
c267c5a08f
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 862069dfd386d42ed603
2014-02-27 13:46:47 -06:00
Richard Peter
a23c8f2c27
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: d54fee5dae729d608a15
2014-02-27 13:20:49 -06:00
Steve Harris
182c16067c
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 99f53876d75218a4d1e6
2014-02-27 10:02:43 -06:00
Brian.Dyke
b2401d2f0d
OB_14.1.1-20 baseline
...
Former-commit-id: 2bad40cfee324696c436
2014-02-26 17:39:15 -05:00
Lee Venable
5546b537cf
Issue #2795 - added code to check for null images.
...
Former-commit-id: 49530206f40c7395d423
2014-02-26 15:50:46 -06:00
Lee Venable
bb4b034375
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: e0ee93bab394cede8153
2014-02-26 13:21:58 -06:00
Richard Peter
90b48e0393
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
...
Former-commit-id: b4e48698ed3735cd3ffe
2014-02-25 12:34:38 -06:00
Brad Gonzales
b6e2ce4b74
Issue #2386 fixed spatial overlap rule application.
...
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: 8b2b50baaf783afb1585
2014-02-25 09:22:08 -06:00
Nate Jensen
8ef957d2f0
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
...
Former-commit-id: 060eafc272279f05a1d5
2014-02-24 16:17:20 -06:00
Nate Jensen
230b8bf117
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: f353c44cc08a00a419a1
2014-02-24 15:35:13 -06:00
Brian.Dyke
363403fb34
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 1a8a0b703e2faab606e5
2014-02-24 14:51:00 -05:00
Ron Anderson
45ccac0859
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 2db5f268404364e7497c
2014-02-24 13:46:48 -06:00
Nate Jensen
98a6101cd3
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
...
Former-commit-id: b1586f86032111109ce2
2014-02-24 13:25:35 -06:00
Dave Hladky
f9c6a396f0
Issue #2469 Fixed default rules implementation
...
Former-commit-id: 45413d0db41d256bfcee
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
f7c48b24bb
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
...
Former-commit-id: f8cc0e3d959e5f7d90a0
2014-02-24 10:27:30 -06:00
Dave Hladky
542ba7e504
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 49f6c31256c4bed432da
2014-02-21 16:01:20 -06:00
Brian.Dyke
779553142c
OB_14.1.1-19 baseline
...
Former-commit-id: 10b723647bcfa4997978
2014-02-21 06:50:59 -05:00
Brian.Dyke
5f3ca0a3f4
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
...
Former-commit-id: 916f657e042f79cc486e
2014-02-20 15:50:50 -05:00
Nate Jensen
6ef26a636c
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 0f81b8046732bd9fd635
2014-02-20 10:53:21 -06:00
David Gillingham
607ce13c19
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: de12904c7a32719432ff
2014-02-18 13:24:37 -06:00
Richard Peter
c666adb530
Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
...
Former-commit-id: d19e464a1a3ed6ad64ce
2014-02-18 12:44:57 -06:00
Lee Venable
e9226e7140
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: 4e7c3c0cbe0cf2dba731
2014-02-18 12:19:41 -06:00
Brad Gonzales
49ddffc99b
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
...
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: 794bbc3c9b36a24c1cb5
2014-02-18 12:11:02 -06:00
Mike Duff
33f81d8822
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 911789b91089bd047283
2014-02-18 12:05:26 -06:00
Brad Gonzales
379c0fb46c
Issue #2771 For Data Delivery CAVE now request current id from
...
the registry EDEX. Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.
Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
Created ClusterIdUtil. DataDeliveryIdUtil uses that utility. It also verifies the id against the awips sites.
Changed centralRegistry.sh to set CLUSTER_ID to NCF.
Handle cases where site id is HAK or HUS.
Check for empty id setting in Cluster ID Util.
Return full id for Data Delivery ID.
Simplify Data Delivery ID and return Cluster ID.
Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911
Former-commit-id: ba4e30832819460ed0d7
2014-02-18 11:10:44 -06:00
Ron Anderson
e7f2b6883d
Merge branch 'master_14.1.1' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 14a082a4e932bcf9d0d0
2014-02-18 10:45:20 -06:00
Dave Hladky
24a4fab603
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: 7ee101d7c75c11dd09bb
2014-02-18 09:14:38 -06:00
Nate Jensen
0160ab0464
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 4d689945250c4de50218
2014-02-17 17:10:07 -06:00
Nate Jensen
c8e70cd6b1
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 2486e3919215ff4ab5d7
2014-02-17 11:58:04 -06:00
Nate Jensen
4583814741
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: 83e9226419be75cc3731
2014-02-17 11:37:48 -06:00
