Steve Harris
a19beb1e5d
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 52226061e9
[formerly 3ba28aabea
] [formerly 069093884f
] [formerly ffcc34f8d4
[formerly 069093884f
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b
[formerly 587f15a95d
] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0
]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19
]
Former-commit-id: 2db5dcf6eb
2014-03-06 08:39:43 -06:00
Brian.Dyke
de9e6553a9
OB_14.1.1-19 baseline
...
Former-commit-id: 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 3508e488f5
[formerly 779553142c
] [formerly cfa4997978
] [formerly 10b723647b
[formerly cfa4997978
[formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb
[formerly c41dd22ff2
] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5
]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564
]
Former-commit-id: f86f9f8918
2014-02-21 06:50:59 -05:00
Ben Steffensmeier
3af445a37a
Issue #2473 Remove unneeded ncgrib functionality.
...
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38
Former-commit-id: 0c0e339894
[formerly 10f74a1812
] [formerly d25df40634
] [formerly 0c0e339894
[formerly 10f74a1812
] [formerly d25df40634
] [formerly 51cd71c373
[formerly d25df40634
[formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]]
Former-commit-id: 51cd71c373
Former-commit-id: 50f81cf656
[formerly dcae8c6aa2
] [formerly 91c71836947d0b2aea377fc28fa97fda33b6fd59 [formerly 24a6795677
]]
Former-commit-id: ec49165c9e367122a2e3115a12c8a3e00aa1dbca [formerly 92828fbaa0
]
Former-commit-id: 9ed413f0c2
2013-10-15 16:30:38 -05:00
Ben Steffensmeier
acfc7318b4
Issue #2402 Up grib split to 2 threads make it configureable.
...
Former-commit-id: 5facc316a8
[formerly b089df5ca1
] [formerly d644235fe1
] [formerly 5facc316a8
[formerly b089df5ca1
] [formerly d644235fe1
] [formerly 29e77f2e6c
[formerly d644235fe1
[formerly f3308c200407bae39175f2620559c6489aa5c788]]]]
Former-commit-id: 29e77f2e6c
Former-commit-id: 57a93ec3b8
[formerly f82a3ee63f
] [formerly 5f642b260d2dce3d25572a8f35b68043bb3074e4 [formerly 4f7eca694d
]]
Former-commit-id: 643c79d2a342536c3727a7c020ca29d85a9f9f40 [formerly c84a96a4d9
]
Former-commit-id: b6bf3bd4bb
2013-10-15 10:59:50 -05:00
Ben Steffensmeier
7a2089f2dc
Issue #2473 Remove deprecated grib functionality
...
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23
Former-commit-id: d5eaefeeed
[formerly c22ccb6c4c
] [formerly cfc8bb859f
] [formerly d5eaefeeed
[formerly c22ccb6c4c
] [formerly cfc8bb859f
] [formerly 94560e37c8
[formerly cfc8bb859f
[formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]]]
Former-commit-id: 94560e37c8
Former-commit-id: 253ada50d5
[formerly c960405800
] [formerly f70cf023d739b92df09c9ab8e0c52a3bc0acf093 [formerly 2e0698aa06
]]
Former-commit-id: d5e54c8a6cadae9ca6e0e739c958b4f515534447 [formerly 2b831863c5
]
Former-commit-id: 2f9bc8f6de
2013-10-15 10:48:29 -05:00
Ben Steffensmeier
f8fc4887db
Issue #2402 Modify grib decoder to work on file extents.
...
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: d9f383217f
[formerly c896c9bf30
] [formerly 7d2b48de48
] [formerly d9f383217f
[formerly c896c9bf30
] [formerly 7d2b48de48
] [formerly 2b089b0848
[formerly 7d2b48de48
[formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]]]
Former-commit-id: 2b089b0848
Former-commit-id: ac95afdc52
[formerly 7c6a89b623
] [formerly 0d5227b724cd17eaba30e60c17888c90e0ec5d1f [formerly 633a075052
]]
Former-commit-id: c5be325dbe4d5bca7afde6dd2069d2369529c96e [formerly 839c602669
]
Former-commit-id: 870631902b
2013-10-09 12:50:02 -05:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901
[formerly 640b022e84
] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357
]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922
]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410
[formerly 0aab285b8a
] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e
]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940
]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Nate Jensen
cf843cfa42
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 00fbfbe7e5
[formerly 740237c317
] [formerly f3258e77f7
] [formerly 00fbfbe7e5
[formerly 740237c317
] [formerly f3258e77f7
] [formerly fc691cbb2f
[formerly f3258e77f7
[formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]]
Former-commit-id: fc691cbb2f
Former-commit-id: fde771fa01
[formerly ab10e0072d
] [formerly 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7
]]
Former-commit-id: 73458acdcd0744f3e4a6cc7ea7fac5b0d28ee6a0 [formerly 3588ed1899
]
Former-commit-id: 528ab65a66
2013-05-29 16:19:28 -05:00
Nate Jensen
88f9c45cf0
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 04d6f6654d
[formerly 927da5cffb
] [formerly 99b4a21414
] [formerly 04d6f6654d
[formerly 927da5cffb
] [formerly 99b4a21414
] [formerly 3f3e0a788d
[formerly 99b4a21414
[formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4
[formerly b025262dc1
] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f
]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb
]
Former-commit-id: e4bbe70d57
2013-05-29 14:49:43 -05:00
Nate Jensen
de2f575c94
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
...
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: e8ebe1a123
[formerly b7cecb931e
] [formerly 1978133177
] [formerly e8ebe1a123
[formerly b7cecb931e
] [formerly 1978133177
] [formerly 1fd2f8965f
[formerly 1978133177
[formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970
[formerly a84a6fe6ae
] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20
]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192
]
Former-commit-id: eaaf8d1b8a
2013-05-23 11:20:40 -05:00
Steve Harris
a2c35a5f3f
13.4.1-7 baseline
...
Former-commit-id: 81bc07bff4
[formerly 8072752c77
] [formerly 4c6ff79e71
] [formerly 81bc07bff4
[formerly 8072752c77
] [formerly 4c6ff79e71
] [formerly 8347bed50e
[formerly 4c6ff79e71
[formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f
[formerly ff7a21ac37
] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661
]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc
]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
456626abe2
Issue #1961 Add ability to disable grib tables.
...
Former-commit-id: 2807018fec
[formerly c46c523ba0
] [formerly 1b15b0d916
] [formerly 2807018fec
[formerly c46c523ba0
] [formerly 1b15b0d916
] [formerly 63d20bc2e1
[formerly 1b15b0d916
[formerly 1370f32e8a2e2efd4b238b0a9b0e3621ad13043d]]]]
Former-commit-id: 63d20bc2e1
Former-commit-id: 33f3e2d06f
[formerly b88b19568b
] [formerly 345b37c830e9000b9c0923de5d26d66e0a9cdd7d [formerly 159533b986
]]
Former-commit-id: 835bd2fe0e0f0a6b9ca2100357d9bc56485c5833 [formerly 031e8f6c57
]
Former-commit-id: 9f5eaa52f7
2013-04-30 14:29:21 -05:00
Steve Harris
b0fb1f49be
13.4.1-1 baseline
...
Former-commit-id: 79567aac51
[formerly f95e0ad10b
] [formerly 2f517b7713
] [formerly 79567aac51
[formerly f95e0ad10b
] [formerly 2f517b7713
] [formerly 00332e6305
[formerly 2f517b7713
[formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: aecc3cfd89
[formerly 0e950655f1
] [formerly fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db
]]
Former-commit-id: 85465ead73fe31102e486ee012a5fcb51cfcc9b9 [formerly 4001e050e7
]
Former-commit-id: 722e428c74
2013-04-24 17:15:55 -05:00
Bryan Kowal
39990c9ded
Issue #1874 - created external properties files for specifying the number of grib decode threads
...
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers
Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff
Former-commit-id: d1799b4e0f
[formerly 4ef22f8e93
] [formerly eb04d2b85f
] [formerly d1799b4e0f
[formerly 4ef22f8e93
] [formerly eb04d2b85f
] [formerly b5994702dc
[formerly eb04d2b85f
[formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]]]
Former-commit-id: b5994702dc
Former-commit-id: 2393357287
[formerly fa1e0a02b0
] [formerly e08966d5518c4d5452b179ec7af6e2e7ae211afb [formerly a60f14f5d6
]]
Former-commit-id: 3dc62f85f55a788efee36beacca6b2db42c94fc7 [formerly 2ac40dd058
]
Former-commit-id: d64370525b
2013-04-10 16:24:39 -05:00
Steve Harris
fd735b8ff8
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0
[formerly be96282207
] [formerly 0be473728a
] [formerly 6f374b35d0
[formerly be96282207
] [formerly 0be473728a
] [formerly aaac0b51e5
[formerly 0be473728a
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300
[formerly f80f98cee2
] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f
]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a
]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
b92dfd1b62
13.2.1-2 baseline
...
Former-commit-id: a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly 328c6dccad
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7
[formerly d9be4dce21
] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79
]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1
]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
745f2c6409
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491
[formerly cd4185ef5c
] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553
]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858
]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
94cd5a1388
12.12.1-1 baseline
...
Former-commit-id: 8278cac143
[formerly c2839cc86d
] [formerly e4bd20a515
] [formerly 8278cac143
[formerly c2839cc86d
] [formerly e4bd20a515
] [formerly e1498006c7
[formerly e4bd20a515
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06
[formerly 4f243de928
] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63
]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de
]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972
[formerly f2102bfb24
] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964
]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9
]
Former-commit-id: 36e2ad3023
2012-07-19 16:20:40 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3
[formerly 97c4db937e
] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c
]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Ben Steffensmeier
e2c62ab096
Issue #183 change grib data catalog to use bulk requests to retrieve all coverages at once.
...
Change-Id: I99f3dfc7900b57b074062155a4e7a65851f70170
Former-commit-id: e76323dc97
[formerly d90356d266
] [formerly 113722a596
] [formerly e76323dc97
[formerly d90356d266
] [formerly 113722a596
] [formerly dfd869c1c1
[formerly 113722a596
[formerly 3cdfc8f73cce96c00b7ac37a1e34e9d051b628b6]]]]
Former-commit-id: dfd869c1c1
Former-commit-id: 573108f2c5
[formerly f2ff133117
] [formerly 09449968f9cc4d3fac177bbbf9f58f412fe658c0 [formerly f082727112
]]
Former-commit-id: 9649bd78778fa82525127c827ee65f451beab1a7 [formerly 7335f90bfb
]
Former-commit-id: 0d9cbcd09e
2012-01-27 14:48:40 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf
[formerly 8e80217e59
] [formerly 377dcd10b9
[formerly 3360eb6c5f
]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00