David Friedman
3d09743022
ASM #74 - Fix RadarServer configuration import utility JAR dependency
...
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: e7def94c5f
[formerly fa849dfefa
] [formerly 11d0d191fd
] [formerly d08597a0d4
[formerly 11d0d191fd
[formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]
Former-commit-id: d08597a0d4
Former-commit-id: 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a [formerly 591ce333dc
]
Former-commit-id: 7efff2943c
2014-03-06 17:07:23 +00:00
Brian.Dyke
e72bd45b20
Merge 13.5.3 DR_16824
...
Former-commit-id: b8a4de2bf0
[formerly 7baa5ee0d5
] [formerly b8fd0f16ed
] [formerly dafe7e6a42
[formerly b8fd0f16ed
[formerly 1b9ed749da0d1893f44e68400644f37c763e324a]]]
Former-commit-id: dafe7e6a42
Former-commit-id: efa362d2eeba660bf5dac619a16ffd73dbad64c8 [formerly 8c16576a82
]
Former-commit-id: 981373f82b
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: 8c54df9e0c
[formerly 26fe429c4b
] [formerly 1778d20745
] [formerly 010b7a1df5
[formerly 1778d20745
[formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]
Former-commit-id: 010b7a1df5
Former-commit-id: 0ef04c99b170216a3f24341f708895d2df66d675 [formerly c6dae5a81f
]
Former-commit-id: 14844a10b6
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: e5972b7159
[formerly 6313b7af0c
] [formerly 2dbac1697d
] [formerly cb1b4a7ac5
[formerly 2dbac1697d
[formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: 92fbb4b7ccf0b4c7c32f6ac2ac82358fc9c89c38 [formerly 3fdb85c62d
]
Former-commit-id: 57a28e817d
2014-03-06 10:56:44 -05:00
Brian.Dyke
6ef9f7fd37
ASM #124 - Display GLD360 lightning data
...
Former-commit-id: 972c2c284b
[formerly bd81ebd8c2
] [formerly db274c890f
] [formerly eefe8c45fe
[formerly db274c890f
[formerly 1edba9216beac913f9bd867da9988e213394a396]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 44a38ade0727afc9f135777d46659f273033a036 [formerly b657767cb1
]
Former-commit-id: 26140187b1
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: 52226061e9
[formerly 3ba28aabea
] [formerly 069093884f
] [formerly ffcc34f8d4
[formerly 069093884f
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0
]
Former-commit-id: 587f15a95d
2014-03-06 08:39:43 -06:00
Steve Harris
8dcd31be32
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 18ae41769e
[formerly 1a666f9f71
] [formerly 167ce61d6c
] [formerly 4b01c57c0a
[formerly 167ce61d6c
[formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]]]
Former-commit-id: 4b01c57c0a
Former-commit-id: 6f64a4f733692a35b9219e001f7c17834f34eb7c [formerly 6e361c0a57
]
Former-commit-id: 12d8ff2fce
2014-03-05 13:00:23 -06:00
Lee Venable
8cd4bc1705
Issue #2833 - fixed a widget disposed error.
...
Former-commit-id: 3c85140ba0
[formerly f38afb0976
] [formerly e71dad9c80
] [formerly 980e21ca5a
[formerly e71dad9c80
[formerly eb3cf0ade9203766a437512b85e55f32108db1e3]]]
Former-commit-id: 980e21ca5a
Former-commit-id: 992ef4747311d55c577dcc1e3ae1650fbf7416ad [formerly 98daa663b4
]
Former-commit-id: 3966bc355c
2014-03-05 08:37:13 -06:00
Benjamin Phillippe
fe6d70a38f
Issue #2769 : Added batching to registry sync
...
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 7ad21da089
[formerly 7bf51d507e
] [formerly 59323be87e
] [formerly 9fd35140f0
[formerly 59323be87e
[formerly a265027cacde7690171d30455227c5a843e0d397]]]
Former-commit-id: 9fd35140f0
Former-commit-id: 5c8dacb79a884329e899f0613609bd34935428e9 [formerly cd04d7dcbe
]
Former-commit-id: daeb8bec5f
2014-03-04 13:31:41 -06:00
Richard Peter
75f96fe190
Merge "Issue #2769 : Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
...
Former-commit-id: 2b5339e16f
[formerly 5280398130
] [formerly aa8e1a3625
] [formerly f9bd27c061
[formerly aa8e1a3625
[formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]
Former-commit-id: f9bd27c061
Former-commit-id: d8b132631aeda3ce7743ca02d1af158db917cca9 [formerly 3b800bcc09
]
Former-commit-id: a81447f434
2014-03-04 12:54:23 -06:00
Nate Jensen
b920fdd0aa
Issue #2813 fix subscription package names
...
Former-commit-id: 645fec513a
[formerly af76b58b27
] [formerly 0ec866f1d2
] [formerly d7d0803ee9
[formerly 0ec866f1d2
[formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]
Former-commit-id: d7d0803ee9
Former-commit-id: d585d2501f41607fabbcad8c30a1a4244b7f07c5 [formerly df44f8246e
]
Former-commit-id: 78b2b50370
2014-03-04 10:53:58 -06:00
Brian.Dyke
c1ef56e0d7
OB_14.1.1-21 baseline
...
Former-commit-id: 5179a4f970
[formerly 271ec85c0c
] [formerly 1d92e5bab6
] [formerly 29681c7ca4
[formerly 1d92e5bab6
[formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]
Former-commit-id: 29681c7ca4
Former-commit-id: 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5
]
Former-commit-id: c68649b4f9
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
71d5fbda33
Issue #2769 : Registry database deadlocking fixes/performance improvements
...
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: ea31c5b370
[formerly d339e232f4
] [formerly ed050996a2
] [formerly 5483d6d7ae
[formerly ed050996a2
[formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: d73e719f11d2bc9e27c664078a07b85c55da2615 [formerly 15a5e7c4a4
]
Former-commit-id: 603e433054
2014-03-03 10:57:16 -06:00
Lee Venable
c03650a0ee
Issue #2795 - removed test code.
...
Former-commit-id: fec690642e
[formerly e34e636dc7
] [formerly 28fe1e99e2
] [formerly f94bcc4d3f
[formerly 28fe1e99e2
[formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]]
Former-commit-id: f94bcc4d3f
Former-commit-id: 10016706f9a7d3c987ccd923143821b129a52ef3 [formerly 708de93fc4
]
Former-commit-id: 267fa56e32
2014-02-27 15:46:30 -06:00
Richard Peter
9f43d8e4b2
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 63da19f472
[formerly c267c5a08f
] [formerly 86d42ed603
] [formerly 862069dfd3
[formerly 86d42ed603
[formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3
]
Former-commit-id: 237ada7b8b
2014-02-27 13:46:47 -06:00
Richard Peter
3b09c69f65
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: ae39697315
[formerly a23c8f2c27
] [formerly 729d608a15
] [formerly d54fee5dae
[formerly 729d608a15
[formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 08cbaa7fb54883ec7360be105a26ab8de2e57993 [formerly 229437773b
]
Former-commit-id: 67093287a0
2014-02-27 13:20:49 -06:00
Steve Harris
01c53daa79
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 26959b4fbb
[formerly 182c16067c
] [formerly 5218a4d1e6
] [formerly 99f53876d7
[formerly 5218a4d1e6
[formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]]
Former-commit-id: 99f53876d7
Former-commit-id: c886e6144ad2cced9b56124b623107c6b77c407f [formerly 0d9abc724c
]
Former-commit-id: b8afc0e5f7
2014-02-27 10:02:43 -06:00
Brian.Dyke
89b66fcb5b
OB_14.1.1-20 baseline
...
Former-commit-id: 2613e13e08
[formerly b2401d2f0d
] [formerly 324696c436
] [formerly 2bad40cfee
[formerly 324696c436
[formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: ed8e6914deb29235289414c9240bc93a504f11a5 [formerly 16117255f3
]
Former-commit-id: c873f20d04
2014-02-26 17:39:15 -05:00
Lee Venable
da795bce98
Issue #2795 - added code to check for null images.
...
Former-commit-id: 191ca5f9ca
[formerly 5546b537cf
] [formerly 0c7395d423
] [formerly 49530206f4
[formerly 0c7395d423
[formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 3612dfd65a9bb45c3bd962d6f9fe927cf481321f [formerly facc67e6b5
]
Former-commit-id: 35f6f35186
2014-02-26 15:50:46 -06:00
Lee Venable
de2bff4d95
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: d74b2c0118
[formerly bb4b034375
] [formerly 94cede8153
] [formerly e0ee93bab3
[formerly 94cede8153
[formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 08d8e41d0aefbc0220f2fd973374918a413db9bb [formerly e0fbc02307
]
Former-commit-id: 91d419662c
2014-02-26 13:21:58 -06:00
Richard Peter
85a16601ed
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
...
Former-commit-id: 2c433bb05c
[formerly 90b48e0393
] [formerly 3735cd3ffe
] [formerly b4e48698ed
[formerly 3735cd3ffe
[formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]
Former-commit-id: b4e48698ed
Former-commit-id: d78cc4dd432220d2d29a4c19ab555ecd83067517 [formerly 66b271a550
]
Former-commit-id: f803d557c2
2014-02-25 12:34:38 -06:00
Brad Gonzales
c364269fae
Issue #2386 fixed spatial overlap rule application.
...
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: 39afe190e0
[formerly b6e2ce4b74
] [formerly 783afb1585
] [formerly 8b2b50baaf
[formerly 783afb1585
[formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: 0b393405d83191a17ccf6537e803d672cbc79eae [formerly 5ce1939d01
]
Former-commit-id: f57f472f6a
2014-02-25 09:22:08 -06:00
Nate Jensen
308a560602
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
...
Former-commit-id: 055caba2bf
[formerly 8ef957d2f0
] [formerly 279f05a1d5
] [formerly 060eafc272
[formerly 279f05a1d5
[formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 558be9d98a06c71a0e559cdc2b834c684467687f [formerly a5477ea272
]
Former-commit-id: 2f58408036
2014-02-24 16:17:20 -06:00
Nate Jensen
4d460d3a26
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: a201d43d63
[formerly 230b8bf117
] [formerly 8a00a419a1
] [formerly f353c44cc0
[formerly 8a00a419a1
[formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: 67f46ed66aeefd71f35b8ac193010ae9e960ed0b [formerly 74329bcb89
]
Former-commit-id: a97f5b5ff7
2014-02-24 15:35:13 -06:00
Brian.Dyke
6b1b6d38e3
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 9158806dd2
[formerly 363403fb34
] [formerly 2faab606e5
] [formerly 1a8a0b703e
[formerly 2faab606e5
[formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1
]
Former-commit-id: 73a1c238f4
2014-02-24 14:51:00 -05:00
Ron Anderson
5831f8d79e
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: 049424e5f0
[formerly 45ccac0859
] [formerly 4364e7497c
] [formerly 2db5f26840
[formerly 4364e7497c
[formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac
]
Former-commit-id: 7d3af157f8
2014-02-24 13:46:48 -06:00
Nate Jensen
1837a83743
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
...
Former-commit-id: 4af8a7f326
[formerly 98a6101cd3
] [formerly 2111109ce2
] [formerly b1586f8603
[formerly 2111109ce2
[formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]
Former-commit-id: b1586f8603
Former-commit-id: 9d8fe1a0158253d440a5c43e42535da472859450 [formerly bf8bb95f51
]
Former-commit-id: d6e9cb73f5
2014-02-24 13:25:35 -06:00
Dave Hladky
05c81677d2
Issue #2469 Fixed default rules implementation
...
Former-commit-id: d31708962b
[formerly f9c6a396f0
] [formerly 1d256bfcee
] [formerly 45413d0db4
[formerly 1d256bfcee
[formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76 [formerly ff5a5961db
]
Former-commit-id: dc97eb7890
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
59c34458ff
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
...
Former-commit-id: 669b580920
[formerly f7c48b24bb
] [formerly 9e5f7d90a0
] [formerly f8cc0e3d95
[formerly 9e5f7d90a0
[formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 8c6b48d405e8efd0e175f4ea9f8f0320fd5743ea [formerly a510abdb22
]
Former-commit-id: 3c7e578000
2014-02-24 10:27:30 -06:00
Dave Hladky
e15d2f50f9
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: cd7934e12f
[formerly 542ba7e504
] [formerly c4bed432da
] [formerly 49f6c31256
[formerly c4bed432da
[formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]
Former-commit-id: 49f6c31256
Former-commit-id: de3f95e5f61e7ea15849603d3138b155fe401280 [formerly 445b55f796
]
Former-commit-id: 3b9f80d03e
2014-02-21 16:01:20 -06:00
Brian.Dyke
5a11fbbfdb
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 10b723647b
[formerly cfa4997978
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5
]
Former-commit-id: c41dd22ff2
2014-02-21 06:50:59 -05:00
Brian.Dyke
1fc3b18abb
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
...
Former-commit-id: 45cf129ad7
[formerly 5f3ca0a3f4
] [formerly 2f79cc486e
] [formerly 916f657e04
[formerly 2f79cc486e
[formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]
Former-commit-id: 916f657e04
Former-commit-id: b55df208e18a858dd848c1f37a3594d57d916867 [formerly e36ae1dd7f
]
Former-commit-id: 9ce06f52c4
2014-02-20 15:50:50 -05:00
Nate Jensen
5d5518e29f
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 6973755f4e
[formerly 6ef26a636c
] [formerly 32bd9fd635
] [formerly 0f81b80467
[formerly 32bd9fd635
[formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: bd38074eb147c551318fc588a5101194eae5605b [formerly 9f33e97c1b
]
Former-commit-id: 6e2150ccd7
2014-02-20 10:53:21 -06:00
David Gillingham
b373d71852
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 43733c77eb
[formerly 607ce13c19
] [formerly 32719432ff
] [formerly de12904c7a
[formerly 32719432ff
[formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: d751bcbb04dc8d77626c940f99e5f7ad3f73874d [formerly 1520317c24
]
Former-commit-id: a83191356d
2014-02-18 13:24:37 -06:00
Richard Peter
ba1cb2a9cf
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: 4dcb9b321d
[formerly c666adb530
] [formerly 3ed6ad64ce
] [formerly d19e464a1a
[formerly 3ed6ad64ce
[formerly 5bf461753675af961c484d022cec4006fabfeba8]]]
Former-commit-id: d19e464a1a
Former-commit-id: 342727148b90c7cfc603e2659e805e35a76103ca [formerly 3c4e188037
]
Former-commit-id: f7e43bdabd
2014-02-18 12:44:57 -06:00
Lee Venable
ab57d3efe7
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: f81d0d88b8
[formerly e9226e7140
] [formerly 0cf2dba731
] [formerly 4e7c3c0cbe
[formerly 0cf2dba731
[formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: acd1e7e5cccd9c772e69add2efbbd68d034964ff [formerly 6fc9dcb3b1
]
Former-commit-id: 46dbd967a5
2014-02-18 12:19:41 -06:00
Brad Gonzales
2330bf10b2
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: b0f71efecc
[formerly 49ddffc99b
] [formerly 36a24c1cb5
] [formerly 794bbc3c9b
[formerly 36a24c1cb5
[formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 156a80d9ff219de8a2827577a58910cefd208d71 [formerly 90d34f7386
]
Former-commit-id: 3bb9975728
2014-02-18 12:11:02 -06:00
Mike Duff
cddd263edc
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: c125b9d044
[formerly 33f81d8822
] [formerly 89bd047283
] [formerly 911789b910
[formerly 89bd047283
[formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]
Former-commit-id: 911789b910
Former-commit-id: 63198d978b2d9ab9f18c26071e586f7a38cac365 [formerly 5f9d913c6d
]
Former-commit-id: 42e6591bc8
2014-02-18 12:05:26 -06:00
Brad Gonzales
ae35320dd6
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: 1d57e9f5f7
[formerly 379c0fb46c
] [formerly 19460ed0d7
] [formerly ba4e308328
[formerly 19460ed0d7
[formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944
]
Former-commit-id: 1b76488111
2014-02-18 11:10:44 -06:00
Ron Anderson
8779564e3a
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: 410f956cff
[formerly e7f2b6883d
] [formerly 32bcf9d0d0
] [formerly 14a082a4e9
[formerly 32bcf9d0d0
[formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94
]
Former-commit-id: 0135771eec
2014-02-18 10:45:20 -06:00
Dave Hladky
b0849517aa
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: c8711269fa
[formerly 24a4fab603
] [formerly 5c11dd09bb
] [formerly 7ee101d7c7
[formerly 5c11dd09bb
[formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: 8cc48c2dd72749fa9b1d02eaf6673400410fa283 [formerly 78d41d01bb
]
Former-commit-id: 012619f05f
2014-02-18 09:14:38 -06:00
Nate Jensen
60fd298721
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 742217ded0
[formerly 0160ab0464
] [formerly 0c4de50218
] [formerly 4d68994525
[formerly 0c4de50218
[formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]
Former-commit-id: 4d68994525
Former-commit-id: 4ab3a27b137394410a2b8da012bfe21a237dd4b6 [formerly 228ab8dd60
]
Former-commit-id: 121bcd184a
2014-02-17 17:10:07 -06:00
Nate Jensen
62739b7936
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 34c7c3cba1
[formerly c8e70cd6b1
] [formerly 15ff4ab5d7
] [formerly 2486e39192
[formerly 15ff4ab5d7
[formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]
Former-commit-id: 2486e39192
Former-commit-id: 961e5c0a4aa129e13bdd51a1f6be5cc7caf172c0 [formerly 0314d61773
]
Former-commit-id: b801b36ca7
2014-02-17 11:58:04 -06:00
Nate Jensen
fd8e2126b1
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: e42eb1940d
[formerly 4583814741
] [formerly be75cc3731
] [formerly 83e9226419
[formerly be75cc3731
[formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]
Former-commit-id: 83e9226419
Former-commit-id: 814fc7ae6232206fb29b52f95a6d3c32f51b62c5 [formerly 30bbc788ce
]
Former-commit-id: e9bbdfdf89
2014-02-17 11:37:48 -06:00
Steve Harris
1fbbb6e73f
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 1b7e02636d
[formerly d0352c69d4
] [formerly 267cc881a4
] [formerly 9fcc5ad930
[formerly 267cc881a4
[formerly a494febee5f45d211797843d56077ac0ef358dbf]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7
]
Former-commit-id: 146412a8bd
2014-02-17 08:54:34 -06:00
Ron Anderson
facdf2b779
Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
...
Former-commit-id: 4b2981b74f
[formerly ce8d59e075
] [formerly fae824482b
] [formerly 769c56bf08
[formerly fae824482b
[formerly ddb195c3032b80221e63f21eb113eaab5d50b124]]]
Former-commit-id: 769c56bf08
Former-commit-id: 3283dd7794029e5cfa8c585c129c8e58899e8c04 [formerly 29e24081a6
]
Former-commit-id: 8434f5cc65
2014-02-17 08:56:48 -06:00
Mike Duff
fad65749a8
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: b34c9eedd0
[formerly 43ea3b0918
] [formerly ac62d322ed
] [formerly 346dc4afff
[formerly ac62d322ed
[formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]
Former-commit-id: 346dc4afff
Former-commit-id: 2be8bfeadfd1af814a97057e7cfe23152263de88 [formerly 5b3a55d11f
]
Former-commit-id: 6601dff483
2014-02-14 08:53:40 -06:00
Ben Steffensmeier
bc38342841
Issue #2528 Fix display of data on somewhat identical projections.
...
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26
Former-commit-id: 94f0b52344
[formerly 2b30269ac9
] [formerly 54a17c012d
] [formerly 23694f5e0c
[formerly 54a17c012d
[formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]
Former-commit-id: 23694f5e0c
Former-commit-id: 9216d693916f99cccb2708677c47ef641c0cf7d1 [formerly bedf3cf45d
]
Former-commit-id: be00537d6d
2014-02-13 13:27:32 -06:00
Ron Anderson
c2e56111c1
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: ce72867ab9
[formerly 21e95cc2f0
] [formerly 51c9d27a39
] [formerly 42fd9c8f9a
[formerly 51c9d27a39
[formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: c5382d8fbd02ce98c80e76cb3bcd2d718cfc584a [formerly b84a83eb6f
]
Former-commit-id: ca11555427
2014-02-13 10:46:27 -06:00
Ron Anderson
4d8ebf6712
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad
[formerly 3e78908bb5
] [formerly fcf45916f4
] [formerly 2f067699f2
[formerly fcf45916f4
[formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84
]
Former-commit-id: d9b82b4ebe
2014-02-13 10:10:34 -06:00