Steve Harris
|
ed7921643c
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 51b755a476 [formerly 873bd6b889] [formerly 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: c24108e75b [formerly 708485427e]
Former-commit-id: 61af779433
|
2014-03-07 15:43:40 -06: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: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
f9587d39d1
|
OB_14.1.1-20 baseline
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
|
2014-02-26 17:39:15 -05:00 |
|
Max Schenkelberg
|
783391423f
|
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: b3aed99142 [formerly 16046a4dde] [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: 0ceaa43902 [formerly f58795f460]
Former-commit-id: 789a279475
|
2014-01-06 17:03:45 -06:00 |
|
Richard Peter
|
5665e7eb9e
|
Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: bf99d8fd4d [formerly 359ee5d1af] [formerly bf99d8fd4d [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 43453bcbff [formerly 16e182d70b]
Former-commit-id: 51773c757e
|
2013-07-26 14:36:46 -05:00 |
|
Max Schenkelberg
|
5ba50b4476
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 94fa6f0e30 [formerly 63421a4819] [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: d1881ffa51 [formerly 1610826d2e]
Former-commit-id: a47f187f4f
|
2013-07-15 14:26:15 -05:00 |
|
Nate Jensen
|
86b096bc9b
|
Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: a4de603bcf [formerly 316d6c09c6] [formerly a4de603bcf [formerly 316d6c09c6] [formerly db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 5a6b0f99cc [formerly 6da64f329c]
Former-commit-id: efcf0c8519
|
2013-07-01 14:41:05 -05:00 |
|
Steve Harris
|
c05a6c8b50
|
13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
|
2013-06-28 09:46:25 -04:00 |
|
Dustin Johnson
|
a6c7287a74
|
Issue #1802 Fix event processing in regards to transaction commits/rollbacks
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22
Former-commit-id: a606508cd4 [formerly ecae75ecd8] [formerly a606508cd4 [formerly ecae75ecd8] [formerly a331cd2958 [formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]]
Former-commit-id: a331cd2958
Former-commit-id: cf36003f12 [formerly d2faa3b600]
Former-commit-id: 87e4d9269d
|
2013-06-20 13:53:04 -05:00 |
|
Steve Harris
|
859965fc9d
|
13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
|
2013-06-10 15:17:17 -04:00 |
|
Nate Jensen
|
528ab65a66
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 740237c317 [formerly f3258e77f7] [formerly 740237c317 [formerly f3258e77f7] [formerly fc691cbb2f [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: ab10e0072d [formerly 6214f529a7]
Former-commit-id: 3588ed1899
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
e4bbe70d57
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 927da5cffb [formerly 99b4a21414] [formerly 927da5cffb [formerly 99b4a21414] [formerly 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: b025262dc1 [formerly a1f314948f]
Former-commit-id: 4eb941dacb
|
2013-05-29 14:49:43 -05:00 |
|
Dustin Johnson
|
4ac1c2cbdb
|
Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: c76fa3bc2a [formerly 0a9e7ed740] [formerly c76fa3bc2a [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: fff0172786 [formerly 187a1e49ef]
Former-commit-id: 1fab733472
|
2013-05-29 09:02:47 -05:00 |
|
Nate Jensen
|
eaaf8d1b8a
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: b7cecb931e [formerly 1978133177] [formerly b7cecb931e [formerly 1978133177] [formerly 1fd2f8965f [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: a84a6fe6ae [formerly 49b20e5d20]
Former-commit-id: 9689640192
|
2013-05-23 11:20:40 -05:00 |
|
Dustin Johnson
|
a7a948bf3a
|
Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: 695c64a9f4 [formerly 8a9e1f643a] [formerly 695c64a9f4 [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]
Former-commit-id: ef1e80b61f
Former-commit-id: 31fbf71aa2 [formerly b8d6f54206]
Former-commit-id: 6db9b3f8d9
|
2013-05-15 16:54:40 -05:00 |
|
Nate Jensen
|
0080d492e2
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]
Former-commit-id: 6f1684b85c
Former-commit-id: dac803ca07 [formerly 22c23492c4]
Former-commit-id: 925339b84c
|
2013-05-14 16:16:13 -05:00 |
|
Benjamin Phillippe
|
781b70a8cc
|
Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 30be5ce6f9 [formerly 115dc12790] [formerly 30be5ce6f9 [formerly 115dc12790] [formerly 2a14245dce [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]]
Former-commit-id: 2a14245dce
Former-commit-id: 3cc6978718 [formerly b0010de8ff]
Former-commit-id: 5f8b73fadd
|
2013-03-27 17:12:52 -05:00 |
|
Benjamin Phillippe
|
5e50d32bdb
|
Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: 4675bed4c2 [formerly b10b1150be] [formerly 4675bed4c2 [formerly b10b1150be] [formerly af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]]]
Former-commit-id: af05feb5a7
Former-commit-id: 541646148b [formerly 4d1a8805ab]
Former-commit-id: c250bda12b
|
2013-03-25 15:15:38 -05:00 |
|
Steve Harris
|
120fc26670
|
13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: f80f98cee2 [formerly bc439aee4f]
Former-commit-id: f1d156779a
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
b5d9e75b95
|
Merge branch 'development' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
8c828dbd75
|
13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
|
2013-02-20 16:19:40 -06:00 |
|
Mike Duff
|
d11283fd41
|
Issue #1580 - Implementation of Stats/Event framework.
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd
Former-commit-id: 804f526206 [formerly def0464898] [formerly 804f526206 [formerly def0464898] [formerly b9f317bbd0 [formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]]]
Former-commit-id: b9f317bbd0
Former-commit-id: 317b174c24 [formerly 15f96b75a5]
Former-commit-id: cd42422079
|
2013-02-08 10:23:45 -06:00 |
|
Mike Duff
|
320c4c7683
|
Issue #1580 - Fix spring config
Former-commit-id: 3f3554a559 [formerly 6b51c66923] [formerly 3f3554a559 [formerly 6b51c66923] [formerly 65deb06061 [formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]]
Former-commit-id: 65deb06061
Former-commit-id: 1fc97f07fe [formerly 62e25af348]
Former-commit-id: cc384772b7
|
2013-02-05 15:49:22 -06:00 |
|
Mike Duff
|
28e854de25
|
Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a
Former-commit-id: 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]
Former-commit-id: 36909dd6c0
Former-commit-id: cd52a94032 [formerly 4400265394]
Former-commit-id: 0cb979038b
|
2013-02-05 15:13:51 -06:00 |
|
Steve Harris
|
2779f5c6d9
|
13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|
Dustin Johnson
|
d346b7fb3e
|
Issue #1407 EventBus changes to support sending notifications for subscription verification
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820
Former-commit-id: 79fa61bb8a [formerly 8b942c31dd] [formerly 79fa61bb8a [formerly 8b942c31dd] [formerly 3d900240b7 [formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]]]
Former-commit-id: 3d900240b7
Former-commit-id: 4de56a0141 [formerly e72d5dc09d]
Former-commit-id: 88625668bb
|
2012-12-11 09:37:20 -06:00 |
|
Richard Peter
|
38829d92c3
|
Issue #1350: Fix ingestGrib and ingestDat posting of stats
Change-Id: I74154680ff6b4e8f5b5e4b2b3440e2b99a16b6df
Former-commit-id: cffbf1da06 [formerly 98297abdd0] [formerly cffbf1da06 [formerly 98297abdd0] [formerly 6c81be8499 [formerly e9afcf3d12599fc3bace2b140deb0d85ee303c6c]]]
Former-commit-id: 6c81be8499
Former-commit-id: 7e93b3d90d [formerly 251cc3764d]
Former-commit-id: e139125e89
|
2012-11-27 10:59:46 -06:00 |
|
Richard Peter
|
688cc569f5
|
Issue #1350: Track ingestGrib and ingestDat statistics
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132
Former-commit-id: 0db7ec08a2 [formerly 8d40a8fea9] [formerly 0db7ec08a2 [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]]
Former-commit-id: 4d5f2fd360
Former-commit-id: d1d28437ad [formerly b891bb63e1]
Former-commit-id: 17189b1862
|
2012-11-26 18:13:13 -06:00 |
|
Brad Gonzales
|
803ac115ff
|
Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties.
Amend:
removed groupBy attribute "fileName"
added LogLevel enum and attribute to Event.java. Default level is DEBUG.
Change-Id: I13c155b1fae19cf5a3c82fbb633bf6c7fb217c07
Former-commit-id: cbce70fd0b [formerly 6ddd1cbdb3] [formerly cbce70fd0b [formerly 6ddd1cbdb3] [formerly a4bc175653 [formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]]
Former-commit-id: a4bc175653
Former-commit-id: 5257f9a81a [formerly ce47edb905]
Former-commit-id: d226ca28c4
|
2012-11-06 07:31:19 -06:00 |
|
Brad Gonzales
|
673749c4b9
|
Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats
update the edex feature and edex build.xml to include the edex stat projects.
Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4
Former-commit-id: d26119c383 [formerly b2656df2f8] [formerly d26119c383 [formerly b2656df2f8] [formerly 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: 781265a6a8 [formerly 5949c8b09c]
Former-commit-id: e1a106fdbb
|
2012-10-26 14:00:55 -05:00 |
|