Commit graph

3473 commits

Author SHA1 Message Date
Ron Anderson
8b32ac8f54 Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
Former-commit-id: 453e478604f048ae019eeee9bb8e46883b58254e
2014-10-28 15:15:16 -05:00
Brian.Dyke
9907c37a0e Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d12d6cf7e6862a87c00f833ee02e72e5c0ad8252
2014-10-28 15:25:05 -04:00
Brian.Dyke
f8ce701c85 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm

Former-commit-id: 52ba693c7d77f4e29db6bc5202c9764509bce58d
2014-10-28 15:23:11 -04:00
Steve Harris
1b83d045ea Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 353674cd0deec2dd86c38dc75c7593d1477a7e78
2014-10-28 13:32:31 -05:00
Baoyu Yin
c9bc14a668 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0

Former-commit-id: 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8
2014-10-28 14:32:31 -04:00
Mark Peters
d03a4bd3e7 Omaha #3720 Remove dataURI column references from redbook
Change-Id: I81ba779e6e9ded93256c7ccd7b2932ceefbfd51d

Former-commit-id: 48160d952981b597634c941741e2bc370a5fdb5f
2014-10-28 12:21:45 -05:00
Benjamin Phillippe
bbd2081844 Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: fc36b84fa43c354b674f040ae5d2647df5b3122f
2014-10-28 11:30:25 -05:00
Ron Anderson
ebe43e22d3 Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c

Former-commit-id: 2e2f83952a6ef00b17d9f4504133c85e93e0126e
2014-10-27 18:40:15 -05:00
Baoyu Yin
2c0c42dcdd VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9

Former-commit-id: b447742f498bceaf5f522a637d6ae501f80dfa23
2014-10-27 10:15:39 -04:00
Baoyu Yin
c1d51b3588 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796
Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d

Former-commit-id: ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb
2014-10-24 14:28:08 -04:00
Benjamin Phillippe
8095f8e21a Omaha #3454 Configuring Hibernate query plan cache settings
Former-commit-id: 0d18e110bf2266400b538d38c4f42078d78a5b41
2014-10-24 10:44:38 -05:00
Benjamin Phillippe
2f7c98d960 Omaha #3454 Fixing text purge
Former-commit-id: 43299673f2172188bc44866c6ccd5552fda348cb
2014-10-23 12:54:26 -05:00
Ron Anderson
6ab8c36e83 Omaha #3685 Fix spell checker to use mixed case.
Fix bug in importShapefile

Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793

Former-commit-id: 25ded2580ec97f4a966297f0af6dbb5d0e66956a
2014-10-23 09:02:16 -05:00
Steve Harris
b5377ec6f1 Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 1cbff6bc3dd08f5123e8ad052ad89e548ee63578
2014-10-23 08:47:06 -05:00
Ron Anderson
e729cd8814 Omaha #3685 Add support for sending specific products in mixed case
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126

Former-commit-id: 18d4fc13ebbd77b3a476bc70252fae1322d631c6
2014-10-22 14:29:30 -05:00
Steve Harris
dc557b2d0c Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: ea787b645974850607658e5a7dfc4a072d831a3b
2014-10-22 11:45:39 -05:00
Brian.Dyke
9bcc6bb52e Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: c8cd8594507148284ac3ec2283fcc9e152c532a6
2014-10-22 10:39:36 -04:00
David Lovely
636e823956 Omaha #3721 Changed Grid Data reference to a Soft Reference and reduced memory usage from X*Y to X*3.
Change-Id: I627ded464d411e7f975df088261a975657d41d9a

Former-commit-id: 9a6313162a5477863d30ab0a888608ee419067a9
2014-10-21 16:06:18 -05:00
Richard Peter
05784292b7 Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: 6b2879d8180a6b6f60a340977e3254ee5eb95213
2014-10-21 10:51:56 -05:00
Shawn.Hooper
4d81023184 ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: f4e8f7493bbfb025e8040f7663dc582414a87413
2014-10-21 11:11:34 -04:00
Nate Jensen
24aca9cd99 Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
Former-commit-id: 450faac664f274c1c2ce1bbc0100ecaa984309f7
2014-10-21 08:55:37 -05:00
Nathan Bowler
d9f75f5adc Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf

Former-commit-id: 8b001934bef0d672bce4739accf994eba497b32c
2014-10-21 07:16:18 -04:00
Slav Korolev
9c369a9c5c Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: 5fb653e5c7f7ffff1daf53487147597a569d7d11
2014-10-20 15:06:05 -04:00
Benjamin Phillippe
7845e8e40f Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
2014-10-20 12:42:19 -05:00
Slav Korolev
0d4ed62be4 Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: 8929c542c33090555dd9db16113453e1000c6e5b
2014-10-20 13:08:44 -04:00
Nate Jensen
1245df2e0c Merge "Omaha #3720 Remove dataURI from redbook plugin" into omaha_14.4.1
Former-commit-id: 1435184cbc94eb9ee2ac97a5616566c421092805
2014-10-20 11:45:50 -05:00
Dave Hladky
19840e43f3 Issue #3736 Allow shared subscriptions to have adhocs
Change-Id: I2379ac2cd1f02b36587531b448b8c3e6434664f9

Former-commit-id: a5a2b995e5dd4a7af165f62496d8052ed43d23b4
2014-10-20 08:58:08 -05:00
Nate Jensen
dcce72b823 Merge "Issue #3707 Reworked gridded subscription triggereing for retrievals. Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176" into omaha_14.3.1
Former-commit-id: 57848f31cc73d81d16595e4e5b01949bcff12a24
2014-10-20 08:37:41 -05:00
Dave Hladky
a3268ae60d Issue #3707 Reworked gridded subscription triggereing for retrievals.
Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176

Former-commit-id: eb64bd232cd25a71dbac655f4d59f9ec10b841b4
2014-10-17 16:01:47 -05:00
Ron Anderson
82a0b4bb9b Merge "Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files." into omaha_14.4.1
Former-commit-id: 7a5b27db4a3be6dde7ff701b341124d9ed1a9ecd
2014-10-16 18:44:38 -05:00
Ron Anderson
2fbf61748d Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
Former-commit-id: 09e39d4f85c8e853475b9f6059a748291e4d1bd7
2014-10-16 18:32:04 -05:00
Nate Jensen
cd5e4b9a08 Omaha #3299 fix xml attribute name
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8

Former-commit-id: fa064accaafc2a4dedd8574eec6faf1960c8bc70
2014-10-16 17:11:26 -05:00
Steve Harris
4535f432ce Merge branch 'omaha_14.4.1' into omaha_pda
Conflicts:
	cave/com.raytheon.viz.feature.awips.developer/feature.xml

Former-commit-id: f2c656a4fe6d4b82f691e10d8dc49dcbbcff5adc
2014-10-16 13:40:43 -05:00
Brian.Dyke
418894a17b Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f0f79fb324665245ef759947d24514a6c8bc4470
2014-10-16 12:04:27 -04:00
Shawn.Hooper
eafaf01966 ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: 366c7c478c6d83f8d21e3b30cc664a32cabf08bd
2014-10-16 11:30:29 -04:00
Brian.Dyke
c60124fa61 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ea0a81b12c7b1a0154361d97882ef65fc55b20e1
2014-10-16 11:21:39 -04:00
Nate Jensen
5dd168e76a Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311

Former-commit-id: db613b63005c2763ca94851182042867aedd43c9
2014-10-15 14:46:12 -05:00
Sarah Pontius
8be0082cc2 VLab Issue #5012 - HLS/TCV files for OPG Oct-15-2014; fixes #5012
Change-Id: Iacf701775c343077102647136272c92d08776caa

Former-commit-id: c7b2c66316ccca08b56fe9ece8f8a24ec260207b
2014-10-15 10:15:30 -06:00
Steve Harris
aff75d954b Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4be51191bc64978e3c455702bede3456666fbffe
2014-10-15 08:42:02 -05:00
Mark Peters
153cf12248 Omaha #3720 Remove dataURI from redbook plugin
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49

Former-commit-id: 5d3c2eb58fce655b25bf4db2a2045e9007ca58f8
2014-10-14 17:13:23 -05:00
Sarah Pontius
2a96302bfb VLab Issue #5001 - HLS/TCV files for OPG Oct-2014; fixes #5001
Change-Id: I4018168e958a75ff7db3dd6cfd88a4ac17947981

Former-commit-id: b7ccb5162f481e81dc50fcf63b200ab06a959cb8
2014-10-14 12:04:50 -06:00
Mark Peters
e7388847d6 Omaha #3722 Remove dataURI from taf plugin
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4

Former-commit-id: 3a0cc08b25395cb168c8344c00fb17fb016aae36
2014-10-14 11:13:03 -05:00
Brian Clements
3a12ab9bdf Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 84a91d7b11790d4a37abc9b0a5c2d64952321b52
2014-10-13 16:32:41 -05:00
Juliya Dynina
33e30cab01 Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
Former-commit-id: 5a639cc5850b906df927db1069bcf60cd68f15ab
2014-10-10 14:43:13 -05:00
Nathan Bowler
1df2418409 Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba

Former-commit-id: e1470cb4ce03b49ac85936760469a22786195a99
2014-10-10 13:20:04 -04:00
Shawn.Hooper
cea5061c61 ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: 457c467d7437c5550bb8727e813d8aa9d9c338a9
2014-10-10 13:14:25 -04:00
Richard Peter
e7fbc0c012 Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: d3fa6c45ca179e5196af8078ae45ccb4a883804e
2014-10-10 11:13:12 -05:00
Benjamin Phillippe
825aa0d5b2 Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: f7c7fe2f7b845563335559839a832b26c2ad2b2a
2014-10-10 10:59:16 -05:00
David Friedman
40f7e8df44 ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a

Former-commit-id: f187f262a28e0ee9df2b75eff7d1f5382a729ac3
2014-10-10 14:18:54 +00:00
Nate Jensen
afb64bc4bb Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

Former-commit-id: 4a5b66b00fbb53b4fcb4340366347ae4b08e6992
2014-10-10 09:01:29 -05:00