Steve Harris
33dd2589f1
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: a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: 2641d578e2
2013-02-21 15:41:39 -06:00
Steve Harris
46d28be4a4
13.3.1-1 baseline
...
Former-commit-id: 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: d2a654625f
2013-02-20 16:19:40 -06:00
Dustin Johnson
3585482cad
Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
...
Amend:
Use ref syntax with uri.
Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062
Former-commit-id: cc598094fa
[formerly 66fe560026848357ae165a675be9818da719675d]
Former-commit-id: 116809346b
2013-02-18 15:47:17 -06:00
Mike Duff
079ec4b6dd
Issue #1584 - FFMP performance stats and performance logger
...
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 0b044dba9c
[formerly 1334488810c13f02e692c234a52d8f0f505a5846]
Former-commit-id: 9c1e0ab639
2013-02-18 08:16:57 -06:00
Dustin Johnson
da9072b0f1
Merge "Issue #1543 Add testing of current OpenDAP type retrievals. - Add test for current behavior of SBN-like retrievals. - Change session management to use a factory implementation. - Add service locator strategy to find jaxbables. - Tests cleanup. - Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality." into development
...
Former-commit-id: 2457359c0f
[formerly 4d055580ddea29eb35983dbe4e9e01a611f23ba1]
Former-commit-id: 6a4a11536e
2013-02-12 07:58:39 -06:00
Dustin Johnson
e504a474f9
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: 8307af022c
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]
Former-commit-id: ef32853dc1
2013-02-11 14:21:57 -06:00
Mike Duff
15f96b75a5
Issue #1580 - Implementation of Stats/Event framework.
...
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd
Former-commit-id: def0464898
[formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]
Former-commit-id: b9f317bbd0
2013-02-08 10:23:45 -06:00
Steve Harris
30d38334cc
13.2.1-6 baseline
...
Former-commit-id: d0752de66c
[formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: a46e33f06e
2013-02-07 16:00:39 -06:00
Mike Duff
4400265394
Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
...
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a
Former-commit-id: 1b1d00f8a9
[formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]
Former-commit-id: 36909dd6c0
2013-02-05 15:13:51 -06:00
Steve Harris
25fecb8b4f
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: f673583915
[formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]
Former-commit-id: 827611474f
2013-01-25 10:54:51 -06:00
Benjamin Phillippe
4042027a25
Issue #1525 Improved Dataset Discovery Browser query performance
...
Change-Id: Ic7c7994e5768238393c1fdbb73ec043cc1eb86f1
Former-commit-id: 49c66d2e47
[formerly b112d2eba2395f693beedd64ca97c140cba161f1]
Former-commit-id: bcd7e5629f
2013-01-24 13:17:28 -06:00
Mike Duff
29939914a2
Issue #1523 - Finalize registry and data delivery stats
...
Former-commit-id: 9c033e6484
[formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]
Former-commit-id: 561e83454f
2013-01-23 14:40:23 -06:00
Steve Harris
47cc08ac79
13.2.1-2 baseline
...
Former-commit-id: 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 328c6dccad
2013-01-23 11:18:44 -05:00
Matt Nash
73ab7a756a
Issue #1491 add Geometry converter and move registry spring instantiation
...
Change-Id: I7794f41c637b5e29662356d81e172d3484e66a56
Former-commit-id: 648c027294
[formerly 94b52c4d617f15bb0bd8d460eb9c5ab6e1a201e6]
Former-commit-id: b4f48078ca
2013-01-15 17:06:28 -06:00
Bryan Kowal
146c43a606
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: c8a43edd9e
[formerly b535a90fb25287945485c10b3c85749c11285171]
Former-commit-id: d6b4cb65f4
2013-01-07 12:16:01 -06:00