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 |
|
Dustin Johnson
|
cc22cc26f5
|
Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 8a9e1f643a [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]]
Former-commit-id: ef1e80b61f
Former-commit-id: 7f1f50d8b9 [formerly 31fbf71aa2] [formerly c86021e68028c259d0aabec26dbd9c639da89626 [formerly b8d6f54206]]
Former-commit-id: dba720af9d4803f1f30ad86c52b06ec7de70c160 [formerly 6db9b3f8d9]
Former-commit-id: a7a948bf3a
|
2013-05-15 16:54:40 -05:00 |
|
Nate Jensen
|
6b9fa8445b
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 575b6335c3 [formerly dac803ca07] [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]]
Former-commit-id: ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d [formerly 925339b84c]
Former-commit-id: 0080d492e2
|
2013-05-14 16:16:13 -05:00 |
|
Benjamin Phillippe
|
977a96e419
|
Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 1e30861a21 [formerly 30be5ce6f9] [formerly 115dc12790] [formerly 1e30861a21 [formerly 30be5ce6f9] [formerly 115dc12790] [formerly 2a14245dce [formerly 115dc12790 [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]]]
Former-commit-id: 2a14245dce
Former-commit-id: 0d769d03c0 [formerly 3cc6978718] [formerly 2e9d43de3c79391b705e7ea079b7e2665d9ca96f [formerly b0010de8ff]]
Former-commit-id: 1500101ef9ca19c8fd54bb60fa6990523169ff1b [formerly 5f8b73fadd]
Former-commit-id: 781b70a8cc
|
2013-03-27 17:12:52 -05:00 |
|
Benjamin Phillippe
|
e7ea63963d
|
Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly af05feb5a7 [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]]]
Former-commit-id: af05feb5a7
Former-commit-id: a8350c0129 [formerly 541646148b] [formerly 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab]]
Former-commit-id: edbdb2638e5a5abcb6d8adcfa785deaefe6a2f03 [formerly c250bda12b]
Former-commit-id: 5e50d32bdb
|
2013-03-25 15:15:38 -05:00 |
|
Steve Harris
|
34d0f59592
|
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: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
fac2d20002
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
|
2013-02-20 16:19:40 -06:00 |
|
Mike Duff
|
adbf5f89cf
|
Issue #1580 - Implementation of Stats/Event framework.
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd
Former-commit-id: 0891a392bf [formerly 804f526206] [formerly def0464898] [formerly 0891a392bf [formerly 804f526206] [formerly def0464898] [formerly b9f317bbd0 [formerly def0464898 [formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]]]]
Former-commit-id: b9f317bbd0
Former-commit-id: c4da6db87f [formerly 317b174c24] [formerly 0d33cab94acda4d619ea1d315a08781e168e2db2 [formerly 15f96b75a5]]
Former-commit-id: 27541039883f9387712316a2269097fbd8468932 [formerly cd42422079]
Former-commit-id: d11283fd41
|
2013-02-08 10:23:45 -06:00 |
|
Mike Duff
|
8bfbb7432a
|
Issue #1580 - Fix spring config
Former-commit-id: 02b0b90b16 [formerly 3f3554a559] [formerly 6b51c66923] [formerly 02b0b90b16 [formerly 3f3554a559] [formerly 6b51c66923] [formerly 65deb06061 [formerly 6b51c66923 [formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]]]
Former-commit-id: 65deb06061
Former-commit-id: 3bb1855876 [formerly 1fc97f07fe] [formerly d9af82bfe1ee1a3822927c7d4a87dd9e75455f8e [formerly 62e25af348]]
Former-commit-id: 3efb6619984d63264da55cfc3a398c36d5d18307 [formerly cc384772b7]
Former-commit-id: 320c4c7683
|
2013-02-05 15:49:22 -06:00 |
|
Mike Duff
|
2314c6c187
|
Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a
Former-commit-id: 6f1a03d230 [formerly 06ddb6cce7] [formerly 1b1d00f8a9] [formerly 6f1a03d230 [formerly 06ddb6cce7] [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1b1d00f8a9 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]]
Former-commit-id: 36909dd6c0
Former-commit-id: 77ad5ea58e [formerly cd52a94032] [formerly ea3b9db059eaba9fc3581435e18f0a784925da2b [formerly 4400265394]]
Former-commit-id: 98cae448c2f17401fc8c1450a1b5fda8d453c7bb [formerly 0cb979038b]
Former-commit-id: 28e854de25
|
2013-02-05 15:13:51 -06: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 |
|
Dustin Johnson
|
2a8db29e4d
|
Issue #1407 EventBus changes to support sending notifications for subscription verification
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820
Former-commit-id: 6fd82e22bc [formerly 79fa61bb8a] [formerly 8b942c31dd] [formerly 6fd82e22bc [formerly 79fa61bb8a] [formerly 8b942c31dd] [formerly 3d900240b7 [formerly 8b942c31dd [formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]]]]
Former-commit-id: 3d900240b7
Former-commit-id: c4ca04a7a4 [formerly 4de56a0141] [formerly 6dd3cea132861002e64a2cbc9a5e982ea702839e [formerly e72d5dc09d]]
Former-commit-id: e7ccef2b13ca704f3d35023c53f081748c6b4056 [formerly 88625668bb]
Former-commit-id: d346b7fb3e
|
2012-12-11 09:37:20 -06:00 |
|
Richard Peter
|
79281c81dd
|
Issue #1350: Fix ingestGrib and ingestDat posting of stats
Change-Id: I74154680ff6b4e8f5b5e4b2b3440e2b99a16b6df
Former-commit-id: fe234bb17e [formerly cffbf1da06] [formerly 98297abdd0] [formerly fe234bb17e [formerly cffbf1da06] [formerly 98297abdd0] [formerly 6c81be8499 [formerly 98297abdd0 [formerly e9afcf3d12599fc3bace2b140deb0d85ee303c6c]]]]
Former-commit-id: 6c81be8499
Former-commit-id: 4c72a415d1 [formerly 7e93b3d90d] [formerly 72554dd29be56930ad4d3a2dcebbad8521fcd38e [formerly 251cc3764d]]
Former-commit-id: db9caae32f793edbc719c31495d72d9c4c0bc5f4 [formerly e139125e89]
Former-commit-id: 38829d92c3
|
2012-11-27 10:59:46 -06:00 |
|
Richard Peter
|
92e2681de8
|
Issue #1350: Track ingestGrib and ingestDat statistics
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132
Former-commit-id: 797b0bb4e8 [formerly 0db7ec08a2] [formerly 8d40a8fea9] [formerly 797b0bb4e8 [formerly 0db7ec08a2] [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 8d40a8fea9 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]]]
Former-commit-id: 4d5f2fd360
Former-commit-id: 998a26d5d8 [formerly d1d28437ad] [formerly c48e3deb2d581da3a86dbbdebf380436a997b65b [formerly b891bb63e1]]
Former-commit-id: f75def3790ba91588bed560a0f9d6d7813d262b0 [formerly 17189b1862]
Former-commit-id: 688cc569f5
|
2012-11-26 18:13:13 -06:00 |
|
Brad Gonzales
|
9e5526bb0f
|
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: 7acf0f1874 [formerly cbce70fd0b] [formerly 6ddd1cbdb3] [formerly 7acf0f1874 [formerly cbce70fd0b] [formerly 6ddd1cbdb3] [formerly a4bc175653 [formerly 6ddd1cbdb3 [formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]]]
Former-commit-id: a4bc175653
Former-commit-id: fcfc68b5aa [formerly 5257f9a81a] [formerly d18adde3f073af91cd602064130a1c394a72bc1b [formerly ce47edb905]]
Former-commit-id: 745ce4007b06b68179c46700454bf8b93c78ff89 [formerly d226ca28c4]
Former-commit-id: 803ac115ff
|
2012-11-06 07:31:19 -06:00 |
|
Brad Gonzales
|
e6bb9385b9
|
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: 1ba2a25bce [formerly d26119c383] [formerly b2656df2f8] [formerly 1ba2a25bce [formerly d26119c383] [formerly b2656df2f8] [formerly 24fc32ee14 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]]
Former-commit-id: 24fc32ee14
Former-commit-id: ff6f910a9d [formerly 781265a6a8] [formerly ddba220564f0c36e18583d0653bc164afe5c183b [formerly 5949c8b09c]]
Former-commit-id: a76485ccacebffc316c6acd73b16f63a1cb16d68 [formerly e1a106fdbb]
Former-commit-id: 673749c4b9
|
2012-10-26 14:00:55 -05:00 |
|