Commit graph

9 commits

Author SHA1 Message Date
Steve Harris
7e48d3e684 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 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Mike Duff
c4da6db87f Issue #1580 - Implementation of Stats/Event framework.
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd

Former-commit-id: 0891a392bf [formerly 804f526206] [formerly def0464898] [formerly b9f317bbd0 [formerly def0464898 [formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]]]
Former-commit-id: b9f317bbd0
Former-commit-id: 0d33cab94acda4d619ea1d315a08781e168e2db2 [formerly 15f96b75a5]
Former-commit-id: 317b174c24
2013-02-08 10:23:45 -06:00
Mike Duff
77ad5ea58e 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 36909dd6c0 [formerly 1b1d00f8a9 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]
Former-commit-id: 36909dd6c0
Former-commit-id: ea3b9db059eaba9fc3581435e18f0a784925da2b [formerly 4400265394]
Former-commit-id: cd52a94032
2013-02-05 15:13:51 -06:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Dave Hladky
d63c292a1f Issue #1340 Updates to statistics for common baseline, data delivery stats gathering
Change-Id: I0b59f1db8579900c7eb50939d60acfeef2db44b8

Former-commit-id: 95dd9d5c2d [formerly a2a27224c4] [formerly 44a7fffe3e] [formerly a2106c7cbf [formerly 44a7fffe3e [formerly 4571b0066a103973184a8d5732d4a945e95d9638]]]
Former-commit-id: a2106c7cbf
Former-commit-id: 09ea86c5ffd6a51f6a691da3722c93a3476d67af [formerly 9722f92d5e]
Former-commit-id: 1e16e81c9e
2012-11-20 10:22:50 -06:00
Brad Gonzales
39f635354a Issue #1309 added units to Aggregate.java and AggregateRecord.java
Amend:
   Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
   Removed Unit from AggregateRecord.java.

Change-Id: If4f6fccb65c584055d68129874a398d6391155e7

Former-commit-id: 04d7e36077 [formerly 2a0b6ad151] [formerly 577df6943e] [formerly 4c49c9116d [formerly 577df6943e [formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]]
Former-commit-id: 4c49c9116d
Former-commit-id: c5ea7dd8201ef99851ee8be6489272c0127fe903 [formerly b17893d7e0]
Former-commit-id: 69d7fe5cd0
2012-11-07 15:36:44 -06:00
Brad Gonzales
fcfc68b5aa 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 a4bc175653 [formerly 6ddd1cbdb3 [formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]]
Former-commit-id: a4bc175653
Former-commit-id: d18adde3f073af91cd602064130a1c394a72bc1b [formerly ce47edb905]
Former-commit-id: 5257f9a81a
2012-11-06 07:31:19 -06:00
Brad Gonzales
ff6f910a9d 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 24fc32ee14 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: ddba220564f0c36e18583d0653bc164afe5c183b [formerly 5949c8b09c]
Former-commit-id: 781265a6a8
2012-10-26 14:00:55 -05:00