David Friedman
8f8f55dd3c
Merge branch 'master_14.2.2' into asm_14.2.2
...
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: 32a7adbe4bfd900e38c232a7adbe4bfd900e38c2f146c7bcd0f146c7bcd01168a3eae5533d15c863dde12b4fc3
2014-03-27 19:17:03 +00:00
Brian.Dyke
aea0544eec
Merge branch 'master_14.1.1' into master_14.2.1
...
Former-commit-id: 50e5f4f78d06ee9a638450e5f4f78d06ee9a638407b2e04d7a07b2e04d7ad97b88f43314567f20a7f540c6fb2d
2014-03-24 07:01:29 -04:00
Brian.Dyke
7aeb9af309
OB_14.1.1-24 baseline
...
Former-commit-id: 37e9d48d4537b636826837e9d48d4537b6368268face1ebeebface1ebeebcfa058a3456b2175da932fda566cfb
2014-03-21 12:43:50 -04:00
steve.naples
f0b105bbdf
ASM #428 Updated SATPRE file header to correct reftime.
...
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: 64b19f2e41d0f4df4ad964b19f2e41d0f4df4ad91aa970164f1aa970164f885ceb834b9c9ddaba6a47e1a3627f
2014-03-19 18:16:41 +00:00
Juliya Dynina
668c24997d
Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
...
Former-commit-id: 34b6972f799aa170ca5f34b6972f799aa170ca5f7a14dfb5a97a14dfb5a9f4c1f51b2ce939d718e5b5c93d06e6
2014-03-18 13:52:48 -05:00
steve.naples
2d22f976f4
ASM #338 Updated HRAPCoordinates to not parse whitespace
...
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6
Former-commit-id: 46675eec43309ff4e7f746675eec43309ff4e7f775e8a907fe75e8a907fe2ff30dac4854cc3397ee72d6b1f1a5
2014-03-18 15:40:13 +00:00
Juliya Dynina
5505320aa3
Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
...
Former-commit-id: 30545f79c585fd3b388830545f79c585fd3b3888ef873880b6ef873880b6bd6ae766c267f8f79e9fcc3e0b3360
2014-03-18 08:47:22 -05:00
Juliya Dynina
de68dcfeb4
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
...
Former-commit-id: d6e2b7f741c735051e00d6e2b7f741c735051e00867f00b438867f00b438ed07060240c54631024ad34b5c1a2c
2014-03-18 08:13:51 -05:00
David Friedman
cf85796def
ASM #330 - Fix reloading of TextDB static files
...
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: fd203b599915ca9f4dccfd203b599915ca9f4dccdecdadce01decdadce01f19895db079beaf9be165fe3990a9e
2014-03-18 13:12:40 +00:00
Qinglu.Lin
119fc9840e
ASM #335 - Watch wording not being inserted for SMW and SMW followup
...
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: 09e90dfe434b3c821ce009e90dfe434b3c821ce0af82143e84af82143e841b352b8600bd7d68bd1672b8b32e25
2014-03-17 18:17:49 -04:00
Brian.Dyke
5fb2fe9266
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 9f332e938cd23acbdd489f332e938cd23acbdd489c412e444e9c412e444e57f7e4b08488efccf30935427557c4
2014-03-14 11:13:30 -04:00
Brian.Dyke
516ba8e81a
Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 4e3096631dd4b6d22ae24e3096631dd4b6d22ae2f999e48df0f999e48df082756e38553ab2df350776271269c5
2014-03-14 08:44:39 -04:00
Brian.Dyke
be8f052cff
OB_14.1.1-23 baseline
...
Former-commit-id: 55918ee421dcc2e4fd6155918ee421dcc2e4fd61bc6a7bf946bc6a7bf946e78e030b7c8f72db144bc7fbd5dfe4
2014-03-14 08:18:16 -04:00
Ben Steffensmeier
1bde438f3a
Issue #2528 Fix satellite units/style.
...
Former-commit-id: e6cd8b316777041e5b17e6cd8b316777041e5b1775120a09cd75120a09cde2995114dcd29daf8edefc62e2679d
2014-03-12 14:19:49 -05:00
Richard Peter
318c61b1bf
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
...
Former-commit-id: e981ce3e3618234c5d73e981ce3e3618234c5d73f59d1433dbf59d1433dbcc35481b4876f15c73dd937c89866d
2014-03-11 16:43:37 -05:00
Dave Hladky
78441a1250
Issue #2678 end retrieval double clutching
...
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 7cd43041403500ad262a7cd43041403500ad262a76e216d31976e216d319f3876233e403fd32144ac0d2eb8f6b
2014-03-11 15:53:59 -05:00
David Gillingham
0e0fdae804
Issue #2509 : Fix static topo generation break caused by baseline merge.
...
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: e3a3cf7badb0783b64cee3a3cf7badb0783b64ce187196b519187196b5194179172d0e68edb8d9a1f30292b471
2014-03-11 11:54:25 -05:00
Juliya Dynina
ddf1c4f4f6
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
...
Former-commit-id: b3ec4c363f6bbd88e62cb3ec4c363f6bbd88e62c79528624437952862443bedc9082b07e35f366517966aac771
2014-03-11 09:24:12 -05:00
brian.dyke
fba0188c90
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
...
Former-commit-id: 1a482f91bc654778bb0d1a482f91bc654778bb0db1b216f196b1b216f196d1b389ae05d57a3dd24cf3df3e3690
2014-03-10 15:36:56 -04:00
Steve Harris
e29b96b6bd
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 068297b90a92232fa063068297b90a92232fa06340b543f9a840b543f9a84d1fbf8743f992a6b046ea01373320
2014-03-07 15:16:18 -06:00
Shawn.Hooper
df59dabcb5
ASM #224 - WarnGen: OB13.5.2 Template Errors
...
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: e894b1279a41a4905f9fe894b1279a41a4905f9f56a949fba856a949fba884b71d7252aa827610b1fb673d390f
2014-03-07 14:53:54 -05:00
David Friedman
2eb0b3dfb0
ASM #349 - Workaround for QPID-5569
...
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: 103fece7b72c1a3442d6103fece7b72c1a3442d6a58f3cb7dfa58f3cb7df91b22ff9bb2a4a92c223ab5f533c72
2014-03-07 14:58:09 +00: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
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
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
John.McPherson
24389e3792
ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup
...
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a
Former-commit-id: 058bb8d60ebdbe5577e9058bb8d60ebdbe5577e92d8ce4e5772d8ce4e577f1eeaf6580218f2de16ad75de22f67
2014-03-04 17:24:00 +00: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
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
Juliya Dynina
42a1294ce4
Merge "ASM #78 - Fix MDCRS display" into asm_14.2.2
...
Former-commit-id: 6fd59caff30130876a7a6fd59caff30130876a7a4bc91be8994bc91be8996e3dbfdff77a30b05e9ab0e3794ce8
2014-03-03 11:27:39 -05:00
Melissa Porricel
adc09f6896
ASM #78 - Fix MDCRS display
...
Change-Id: I28b6788f822100469f0fe292197b6020381e6e38
Former-commit-id: 20624da288769fc1ed2f20624da288769fc1ed2fe5213e9415e5213e94158daf0520bc774e236d63eafea2f5ee
2014-02-27 12:48:09 -05:00
Brian.Dyke
f9587d39d1
OB_14.1.1-20 baseline
...
Former-commit-id: b2401d2f0d324696c436b2401d2f0d324696c4362bad40cfee2bad40cfeec873f20d0416117255f35feadbe4d9
2014-02-26 17:39:15 -05:00
steve.naples
2e088612ec
ASM #236
...
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd
Former-commit-id: 06f619b3ff6be82c41fc06f619b3ff6be82c41fccc9e62c806cc9e62c8061c6f6be15e9b850d81df73e5bc8949
2014-02-26 18:54:36 +00:00
Richard Peter
e28b3bb5b9
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
...
Former-commit-id: 90b48e03933735cd3ffe90b48e03933735cd3ffeb4e48698edb4e48698edf803d557c266b271a550e78e5a15b9
2014-02-25 12:34:38 -06:00
Brad Gonzales
aa2d8b76a1
Issue #2386 fixed spatial overlap rule application.
...
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: b6e2ce4b74783afb1585b6e2ce4b74783afb15858b2b50baaf8b2b50baaff57f472f6a5ce1939d01f4513d0e64
2014-02-25 09:22:08 -06:00
Brian.Dyke
0bcf7c89b8
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 363403fb342faab606e5363403fb342faab606e51a8a0b703e1a8a0b703e73a1c238f4227131e5f138829b9014
2014-02-24 14:51:00 -05:00
Ron Anderson
3c673caec2
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: 45ccac08594364e7497c45ccac08594364e7497c2db5f268402db5f268407d3af157f83b2ea2d6acf2b0cc20e8
2014-02-24 13:46:48 -06:00
Nate Jensen
da2a363550
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
...
Former-commit-id: 98a6101cd32111109ce298a6101cd32111109ce2b1586f8603b1586f8603d6e9cb73f5bf8bb95f516979321635
2014-02-24 13:25:35 -06:00
Dave Hladky
e030ac65b2
Issue #2469 Fixed default rules implementation
...
Former-commit-id: f9c6a396f01d256bfceef9c6a396f01d256bfcee45413d0db445413d0db4dc97eb7890ff5a5961db8a924bcc2c
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
831bb0b021
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
...
Former-commit-id: f7c48b24bb9e5f7d90a0f7c48b24bb9e5f7d90a0f8cc0e3d95f8cc0e3d953c7e578000a510abdb22358e7d3b1d
2014-02-24 10:27:30 -06:00
John.McPherson
995015a0ca
ASM #209 DR 16362
...
Change-Id: Ide103349188f12f3b1350bea75f80b225def13e7
Former-commit-id: ea0dc8b3dc1d987c36d9ea0dc8b3dc1d987c36d9bbd70c06f1bbd70c06f1acf30e83bfae671c3601dbad6b2701
2014-02-24 03:07:21 +00:00
Dave Hladky
c4e70210fd
Issue #2636 Try Catch around the MaintTask
...
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 542ba7e504c4bed432da542ba7e504c4bed432da49f6c3125649f6c312563b9f80d03e445b55f796c545368839
2014-02-21 16:01:20 -06:00
Brian.Dyke
f86f9f8918
OB_14.1.1-19 baseline
...
Former-commit-id: 779553142ccfa4997978779553142ccfa499797810b723647b10b723647bc41dd22ff264044e7ce51b359c2564
2014-02-21 06:50:59 -05:00
Juliya Dynina
04413ee642
Merge "ASM #118 " into asm_14.2.2
...
Former-commit-id: d9fecf06d20f5ce6fbded9fecf06d20f5ce6fbdef1a10568d6f1a10568d68b164ca292a668f336bf70d512cb7d
2014-02-20 11:23:32 -05:00
David Gillingham
5911f4b2d4
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 607ce13c1932719432ff607ce13c1932719432ffde12904c7ade12904c7aa83191356d1520317c24474dda75de
2014-02-18 13:24:37 -06:00
Richard Peter
bbce2567a7
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: c666adb5303ed6ad64cec666adb5303ed6ad64ced19e464a1ad19e464a1af7e43bdabd3c4e188037ccd90f2d86
2014-02-18 12:44:57 -06:00
Lee Venable
0bd01db3cc
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: e9226e71400cf2dba731e9226e71400cf2dba7314e7c3c0cbe4e7c3c0cbe46dbd967a56fc9dcb3b128b0809a1c
2014-02-18 12:19:41 -06:00
Brad Gonzales
d50a8cd7a5
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: 49ddffc99b36a24c1cb549ddffc99b36a24c1cb5794bbc3c9b794bbc3c9b3bb997572890d34f7386b99b5d9373
2014-02-18 12:11:02 -06:00
Mike Duff
2467a11a7e
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 33f81d882289bd04728333f81d882289bd047283911789b910911789b91042e6591bc85f9d913c6dd277c1caf1
2014-02-18 12:05:26 -06:00
Brad Gonzales
b0421675ff
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: 379c0fb46c19460ed0d7379c0fb46c19460ed0d7ba4e308328ba4e3083281b764881113be33809449aa1cb299e
2014-02-18 11:10:44 -06:00
