Commit graph

8 commits

Author SHA1 Message Date
Max Schenkelberg
cd88054e2b Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 63421a4819
Former-commit-id: 94fa6f0e30
2013-07-15 14:26:15 -05:00
Steve Harris
abdc733151 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: 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: a0573644c4
Former-commit-id: 64744fdb19
2013-02-21 15:41:39 -06:00
Steve Harris
e0406d3183 13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
2013-02-20 16:19:40 -06:00
Dustin Johnson
c79c031f62 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: ef32853dc1 [formerly 8307af022c [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]
Former-commit-id: 8307af022c
Former-commit-id: 0d548bd66f
2013-02-11 14:21:57 -06:00
Dustin Johnson
23449a73bf Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: febe492056 [formerly cd381cb819 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]
Former-commit-id: cd381cb819
Former-commit-id: efe1bcc4b5
2013-02-05 14:07:30 -06:00
Steve Harris
a4fa438a41 13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 83e9157df7
Former-commit-id: 33bc5fd816
2013-01-23 11:18:44 -05:00
Dustin Johnson
3c2ace6854 Issue #1441 Break net.dods dependency on AWIPS code
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480

Former-commit-id: c00f5f394a [formerly ddcc816bba [formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]]
Former-commit-id: ddcc816bba
Former-commit-id: 3ebe0cf1ca
2013-01-10 12:06:39 -06:00
Bryan Kowal
199e202979 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: c8a43edd9e
Former-commit-id: ab8b346489
2013-01-07 12:16:01 -06:00