Commit graph

4701 commits

Author SHA1 Message Date
Kevin P. Johnson
17a4229072 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]
Former-commit-id: 4c833d3389
2014-03-13 20:42:12 +00:00
Juliya Dynina
7e35f36651 Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]
Former-commit-id: 7952862443
2014-03-11 09:24:12 -05:00
brian.dyke
d57a3dd24c Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]
Former-commit-id: b1b216f196
2014-03-10 15:36:56 -04:00
Steve Harris
f992a6b046 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]
Former-commit-id: 40b543f9a8
2014-03-07 15:16:18 -06:00
Shawn.Hooper
aa827610b1 ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: 41a4905f9f [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]
Former-commit-id: 56a949fba8
2014-03-07 14:53:54 -05:00
Shawn.Hooper
62a0c1dadf ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 670da1895b [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]
Former-commit-id: 85db05e819
2014-03-07 13:12:11 -05:00
Shawn.Hooper
05bb380e77 ASM #378 - MPE gages are not listed/available in gage table
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]
Former-commit-id: dc3aadd149
2014-03-07 12:57:36 -05:00
Brian.Dyke
0c4b9469b0 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
Former-commit-id: 3ac2a61218 [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]
Former-commit-id: 1fe5504d4c
2014-03-07 11:50:06 -05:00
David Friedman
2a4a92c223 ASM #349 - Workaround for QPID-5569
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]
Former-commit-id: a58f3cb7df
2014-03-07 14:58:09 +00:00
Brian.Dyke
6ced1bedc2 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]
Former-commit-id: 7b798ab5d2
2014-03-07 09:01:09 -05:00
Brian.Dyke
2f94480121 Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]
Former-commit-id: 6414bdab57
2014-03-07 08:57:07 -05:00
Brian.Dyke
a4c136fd60 14.1.1-22 baseline
Former-commit-id: 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]
Former-commit-id: 08d8f1a0ee
2014-03-07 08:49:00 -05:00
Steve Harris
8ec20fc5e9 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]
Former-commit-id: a2e36f4c6c
2014-03-06 18:19:55 -06:00
David Friedman
591ce333dc ASM #74 - Fix RadarServer configuration import utility JAR dependency
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: 11d0d191fd [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]
Former-commit-id: d08597a0d4
2014-03-06 17:07:23 +00:00
Brian.Dyke
8c16576a82 Merge 13.5.3 DR_16824
Former-commit-id: b8fd0f16ed [formerly 1b9ed749da0d1893f44e68400644f37c763e324a]
Former-commit-id: dafe7e6a42
2014-03-06 11:22:08 -05:00
Brian.Dyke
c6dae5a81f ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]
Former-commit-id: 010b7a1df5
2014-03-06 11:04:34 -05:00
Brian.Dyke
3fdb85c62d ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: 2dbac1697d [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]
Former-commit-id: cb1b4a7ac5
2014-03-06 10:56:44 -05:00
Brian.Dyke
b657767cb1 ASM #124 - Display GLD360 lightning data
Former-commit-id: db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]
Former-commit-id: eefe8c45fe
2014-03-06 10:54:15 -05:00
Steve Harris
96658d8ce0 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: 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: ffcc34f8d4
2014-03-06 08:39:43 -06:00
Steve Harris
6e361c0a57 Merge branch 'master_14.2.1' into ncep_14.2.1
Former-commit-id: 167ce61d6c [formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]
Former-commit-id: 4b01c57c0a
2014-03-05 13:00:23 -06:00
Lee Venable
98daa663b4 Issue #2833 - fixed a widget disposed error.
Former-commit-id: e71dad9c80 [formerly eb3cf0ade9203766a437512b85e55f32108db1e3]
Former-commit-id: 980e21ca5a
2014-03-05 08:37:13 -06:00
Benjamin Phillippe
cd04d7dcbe Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 59323be87e [formerly a265027cacde7690171d30455227c5a843e0d397]
Former-commit-id: 9fd35140f0
2014-03-04 13:31:41 -06:00
Richard Peter
3b800bcc09 Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: aa8e1a3625 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]
Former-commit-id: f9bd27c061
2014-03-04 12:54:23 -06:00
Nate Jensen
df44f8246e Issue #2813 fix subscription package names
Former-commit-id: 0ec866f1d2 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]
Former-commit-id: d7d0803ee9
2014-03-04 10:53:58 -06:00
Brian.Dyke
7cad374af5 OB_14.1.1-21 baseline
Former-commit-id: 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]
Former-commit-id: 29681c7ca4
2014-03-04 11:47:42 -05:00
Benjamin Phillippe
15a5e7c4a4 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]
Former-commit-id: 5483d6d7ae
2014-03-03 10:57:16 -06:00
Lee Venable
708de93fc4 Issue #2795 - removed test code.
Former-commit-id: 28fe1e99e2 [formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]
Former-commit-id: f94bcc4d3f
2014-02-27 15:46:30 -06:00
Richard Peter
c0d495d9c3 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]
Former-commit-id: 862069dfd3
2014-02-27 13:46:47 -06:00
Richard Peter
229437773b Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]
Former-commit-id: d54fee5dae
2014-02-27 13:20:49 -06:00
Steve Harris
0d9abc724c Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 5218a4d1e6 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]
Former-commit-id: 99f53876d7
2014-02-27 10:02:43 -06:00
Brian.Dyke
16117255f3 OB_14.1.1-20 baseline
Former-commit-id: 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]
Former-commit-id: 2bad40cfee
2014-02-26 17:39:15 -05:00
Lee Venable
facc67e6b5 Issue #2795 - added code to check for null images.
Former-commit-id: 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]
Former-commit-id: 49530206f4
2014-02-26 15:50:46 -06:00
Lee Venable
e0fbc02307 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: 94cede8153 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]
Former-commit-id: e0ee93bab3
2014-02-26 13:21:58 -06:00
Richard Peter
66b271a550 Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 3735cd3ffe [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]
Former-commit-id: b4e48698ed
2014-02-25 12:34:38 -06:00
Brad Gonzales
5ce1939d01 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]
Former-commit-id: 8b2b50baaf
2014-02-25 09:22:08 -06:00
Nate Jensen
a5477ea272 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 279f05a1d5 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]
Former-commit-id: 060eafc272
2014-02-24 16:17:20 -06:00
Nate Jensen
74329bcb89 Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: 8a00a419a1 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]
Former-commit-id: f353c44cc0
2014-02-24 15:35:13 -06:00
Brian.Dyke
227131e5f1 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]
Former-commit-id: 1a8a0b703e
2014-02-24 14:51:00 -05:00
Ron Anderson
3b2ea2d6ac 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: 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]
Former-commit-id: 2db5f26840
2014-02-24 13:46:48 -06:00
Nate Jensen
bf8bb95f51 Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]
Former-commit-id: b1586f8603
2014-02-24 13:25:35 -06:00
Dave Hladky
ff5a5961db Issue #2469 Fixed default rules implementation
Former-commit-id: 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]
Former-commit-id: 45413d0db4
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
a510abdb22 Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: 9e5f7d90a0 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]
Former-commit-id: f8cc0e3d95
2014-02-24 10:27:30 -06:00
Dave Hladky
445b55f796 Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]
Former-commit-id: 49f6c31256
2014-02-21 16:01:20 -06:00
Brian.Dyke
64044e7ce5 OB_14.1.1-19 baseline
Former-commit-id: cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: 10b723647b
2014-02-21 06:50:59 -05:00
Brian.Dyke
e36ae1dd7f ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 2f79cc486e [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]
Former-commit-id: 916f657e04
2014-02-20 15:50:50 -05:00
Nate Jensen
9f33e97c1b Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]
Former-commit-id: 0f81b80467
2014-02-20 10:53:21 -06:00
David Gillingham
1520317c24 Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]
Former-commit-id: de12904c7a
2014-02-18 13:24:37 -06:00
Richard Peter
3c4e188037 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: 3ed6ad64ce [formerly 5bf461753675af961c484d022cec4006fabfeba8]
Former-commit-id: d19e464a1a
2014-02-18 12:44:57 -06:00
Lee Venable
6fc9dcb3b1 Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
Former-commit-id: 0cf2dba731 [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]
Former-commit-id: 4e7c3c0cbe
2014-02-18 12:19:41 -06:00
Brad Gonzales
90d34f7386 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: 36a24c1cb5 [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]
Former-commit-id: 794bbc3c9b
2014-02-18 12:11:02 -06:00