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
Dustin Johnson
ae6a451422
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: c79c031f62
[formerly 0d548bd66f
] [formerly 8307af022c
] [formerly ef32853dc1
[formerly 8307af022c
[formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]
Former-commit-id: ef32853dc1
Former-commit-id: 143e062f3345112806fef29bb7754963c3fc28dc [formerly e504a474f9
]
Former-commit-id: 73a5667256
2013-02-11 14:21:57 -06:00
Dustin Johnson
7ad9070600
Issue #1543 Add ability to save/read dods files back to net.dods
...
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf
Former-commit-id: 23449a73bf
[formerly efe1bcc4b5
] [formerly cd381cb819
] [formerly febe492056
[formerly cd381cb819
[formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]
Former-commit-id: febe492056
Former-commit-id: 8ed6a0d05f4ab5e36a81ae666ed0b62384b8afd6 [formerly fffbb32775
]
Former-commit-id: c81cb3d60b
2013-02-05 14:07:30 -06:00
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly 328c6dccad
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79
]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Dustin Johnson
773a3303da
Issue #1441 Break net.dods dependency on AWIPS code
...
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480
Former-commit-id: 3c2ace6854
[formerly 3ebe0cf1ca
] [formerly ddcc816bba
] [formerly c00f5f394a
[formerly ddcc816bba
[formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]]]
Former-commit-id: c00f5f394a
Former-commit-id: 4fdeee1cd88dd8b672dbfac13924276692db343f [formerly c29d2e2e71
]
Former-commit-id: 59a209e77d
2013-01-10 12:06:39 -06:00
Bryan Kowal
0e985cf0f3
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: 199e202979
[formerly ab8b346489
] [formerly c8a43edd9e
] [formerly d6b4cb65f4
[formerly c8a43edd9e
[formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606
]
Former-commit-id: 6d7f57c62a
2013-01-07 12:16:01 -06:00