Commit graph

16 commits

Author SHA1 Message Date
Dustin Johnson
31fbf71aa2 Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: 695c64a9f4 [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]
Former-commit-id: ef1e80b61f
Former-commit-id: b8d6f54206
2013-05-15 16:54:40 -05:00
Nate Jensen
dac803ca07 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 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 6f1684b85c
Former-commit-id: 22c23492c4
2013-05-14 16:16:13 -05:00
Benjamin Phillippe
3cc6978718 Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1

Former-commit-id: 30be5ce6f9 [formerly 115dc12790] [formerly 2a14245dce [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]
Former-commit-id: 2a14245dce
Former-commit-id: b0010de8ff
2013-03-27 17:12:52 -05:00
Benjamin Phillippe
541646148b Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 4675bed4c2 [formerly b10b1150be] [formerly af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]]
Former-commit-id: af05feb5a7
Former-commit-id: 4d1a8805ab
2013-03-25 15:15:38 -05:00
Steve Harris
4f155a183a 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 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Steve Harris
e4435815c9 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Mike Duff
317b174c24 Issue #1580 - Implementation of Stats/Event framework.
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd

Former-commit-id: 804f526206 [formerly def0464898] [formerly b9f317bbd0 [formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]]
Former-commit-id: b9f317bbd0
Former-commit-id: 15f96b75a5
2013-02-08 10:23:45 -06:00
Mike Duff
1fc97f07fe Issue #1580 - Fix spring config
Former-commit-id: 3f3554a559 [formerly 6b51c66923] [formerly 65deb06061 [formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]
Former-commit-id: 65deb06061
Former-commit-id: 62e25af348
2013-02-05 15:49:22 -06:00
Mike Duff
cd52a94032 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]
Former-commit-id: 36909dd6c0
Former-commit-id: 4400265394
2013-02-05 15:13:51 -06:00
Steve Harris
d9be4dce21 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Dustin Johnson
4de56a0141 Issue #1407 EventBus changes to support sending notifications for subscription verification
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820

Former-commit-id: 79fa61bb8a [formerly 8b942c31dd] [formerly 3d900240b7 [formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]]
Former-commit-id: 3d900240b7
Former-commit-id: e72d5dc09d
2012-12-11 09:37:20 -06:00
Richard Peter
7e93b3d90d Issue #1350: Fix ingestGrib and ingestDat posting of stats
Change-Id: I74154680ff6b4e8f5b5e4b2b3440e2b99a16b6df

Former-commit-id: cffbf1da06 [formerly 98297abdd0] [formerly 6c81be8499 [formerly e9afcf3d12599fc3bace2b140deb0d85ee303c6c]]
Former-commit-id: 6c81be8499
Former-commit-id: 251cc3764d
2012-11-27 10:59:46 -06:00
Richard Peter
d1d28437ad Issue #1350: Track ingestGrib and ingestDat statistics
Change-Id: Ieba6ca1de1dc6bd78a37ee1a9d9b49d69ca4e132

Former-commit-id: 0db7ec08a2 [formerly 8d40a8fea9] [formerly 4d5f2fd360 [formerly 3bbb6602d8ee99792b4a65e040091d1a1923d0b1]]
Former-commit-id: 4d5f2fd360
Former-commit-id: b891bb63e1
2012-11-26 18:13:13 -06:00
Brad Gonzales
5257f9a81a 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 a4bc175653 [formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]
Former-commit-id: a4bc175653
Former-commit-id: ce47edb905
2012-11-06 07:31:19 -06:00
Brad Gonzales
781265a6a8 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 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: 24fc32ee14
Former-commit-id: 5949c8b09c
2012-10-26 14:00:55 -05:00