From 48758e64efffe0e815212af5f271766bec7b56d4 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Mon, 12 Aug 2013 11:14:54 -0500 Subject: [PATCH] Issue #2142 remove some uf.common dependencies on edex.common Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887 Former-commit-id: c0c65319cd731aea51f730f700b0fda3c6992d38 --- .../META-INF/MANIFEST.MF | 17 ++++++-------- .../META-INF/MANIFEST.MF | 17 ++++++-------- .../META-INF/MANIFEST.MF | 17 ++++++-------- .../META-INF/MANIFEST.MF | 17 ++++++-------- .../META-INF/MANIFEST.MF | 17 ++++++-------- .../META-INF/MANIFEST.MF | 15 ++++++------- .../META-INF/MANIFEST.MF | 12 +++++----- .../META-INF/MANIFEST.MF | 19 +++++++++++----- .../res/spring/cwa-common.xml | 2 +- .../uf/edex/plugin/cwa/CWADecoder.java | 1 - .../uf/edex/plugin/cwa}/CWARecordDao.java | 2 +- .../uf/edex/plugin/cwa/decoder/CWAParser.java | 2 +- .../META-INF/MANIFEST.MF | 19 +++++++++++----- .../res/spring/lsr-common.xml | 2 +- .../uf/edex/plugin/lsr/LSRDecoder.java | 1 - .../edex/plugin/lsr}/LocalStormReportDao.java | 2 +- .../uf/edex/plugin/lsr/decoder/LSRParser.java | 2 +- .../META-INF/MANIFEST.MF | 19 +++++++++++----- .../res/spring/svrwx-common.xml | 2 +- .../uf/edex/plugin/svrwx/SvrWxDecoder.java | 1 - .../uf/edex/plugin/svrwx}/SvrWxRecordDao.java | 2 +- .../plugin/svrwx/decoder/SvrWxParser.java | 2 +- .../META-INF/MANIFEST.MF | 19 +++++++++++----- .../res/spring/tcg-common.xml | 2 +- .../uf/edex/plugin/tcg/TCGDecoder.java | 1 - .../tcg}/TropicalCycloneGuidanceDao.java | 2 +- .../uf/edex/plugin/tcg/decoder/HURData.java | 2 +- .../uf/edex/plugin/tcg/decoder/NullData.java | 2 +- .../uf/edex/plugin/tcg/decoder/QLMData.java | 2 +- .../uf/edex/plugin/tcg/decoder/TCEData.java | 2 +- .../plugin/tcg/decoder/TCGDataAdapter.java | 2 +- .../META-INF/MANIFEST.MF | 19 +++++++++++----- .../res/spring/tcs-common.xml | 2 +- .../uf/edex/plugin/tcs/TCSDecoder.java | 1 - .../tcs}/TropicalCycloneSummaryDao.java | 2 +- .../uf/edex/plugin/tcs/decoder/NullData.java | 2 +- .../uf/edex/plugin/tcs/decoder/TCMData.java | 2 +- .../plugin/tcs/decoder/TCSDataAdapter.java | 2 +- .../META-INF/MANIFEST.MF | 19 ++++++++++------ .../res/spring/vaa-common.xml | 2 +- .../uf/edex/plugin/vaa/VAADecoder.java | 1 - .../uf/edex/plugin/vaa}/VAARecordDao.java | 2 +- .../META-INF/MANIFEST.MF | 22 +++++++++++++------ .../res/spring/vil-common.xml | 2 +- .../raytheon/uf/edex/plugin/vil}/VILDao.java | 2 +- .../uf/edex/plugin/vil/VILGenerator.java | 1 - 46 files changed, 166 insertions(+), 139 deletions(-) rename edexOsgi/{com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/dao => com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa}/CWARecordDao.java (98%) rename edexOsgi/{com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/dao => com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr}/LocalStormReportDao.java (98%) rename edexOsgi/{com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/dao => com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx}/SvrWxRecordDao.java (98%) rename edexOsgi/{com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/dao => com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg}/TropicalCycloneGuidanceDao.java (98%) rename edexOsgi/{com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/dao => com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs}/TropicalCycloneSummaryDao.java (98%) rename edexOsgi/{com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/dao => com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa}/VAARecordDao.java (98%) rename edexOsgi/{com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/dao => com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil}/VILDao.java (98%) diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF index 78351563ac..2468775d20 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/MANIFEST.MF @@ -4,16 +4,13 @@ Bundle-Name: Cwa Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.cwa Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON -Export-Package: com.raytheon.uf.common.dataplugin.cwa, - com.raytheon.uf.common.dataplugin.cwa.dao -Require-Bundle: com.raytheon.edex.common, - com.raytheon.uf.common.pointdata;bundle-version="1.11.16", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", +Export-Package: com.raytheon.uf.common.dataplugin.cwa +Require-Bundle: com.raytheon.uf.common.serialization, + com.raytheon.uf.common.pointdata, org.geotools, - javax.persistence,javax.measure + javax.persistence, + javax.measure, + com.raytheon.uf.common.dataplugin Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Import-Package: com.raytheon.uf.common.status, - com.raytheon.uf.edex.decodertools.core, - com.raytheon.uf.edex.decodertools.time -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF index 42efd5b99e..9b409a2784 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/MANIFEST.MF @@ -3,17 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: Lsr Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.lsr Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.edex.common, - com.raytheon.uf.common.pointdata;bundle-version="1.11.16", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", +Require-Bundle: com.raytheon.uf.common.serialization, + com.raytheon.uf.common.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: com.raytheon.uf.common.status, - com.raytheon.uf.edex.decodertools.core, - com.raytheon.uf.edex.decodertools.time -Export-Package: com.raytheon.uf.common.dataplugin.lsr, - com.raytheon.uf.common.dataplugin.lsr.dao + javax.measure, + com.raytheon.uf.common.dataplugin +Import-Package: com.raytheon.uf.common.geospatial +Export-Package: com.raytheon.uf.common.dataplugin.lsr diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF index 3b3292f5aa..3e63548d3e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/MANIFEST.MF @@ -3,17 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: Svrwx Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.svrwx Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.edex.common, - com.raytheon.uf.common.pointdata;bundle-version="1.11.16", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", +Require-Bundle: com.raytheon.uf.common.serialization, + com.raytheon.uf.common.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: com.raytheon.uf.common.status, - com.raytheon.uf.edex.decodertools.core, - com.raytheon.uf.edex.decodertools.time -Export-Package: com.raytheon.uf.common.dataplugin.svrwx, - com.raytheon.uf.common.dataplugin.svrwx.dao + javax.measure, + com.raytheon.uf.common.dataplugin +Import-Package: com.raytheon.uf.common.geospatial +Export-Package: com.raytheon.uf.common.dataplugin.svrwx diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF index 89d7210955..d6017b55fc 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/MANIFEST.MF @@ -3,17 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tcg Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.tcg Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.edex.common, - com.raytheon.uf.common.pointdata;bundle-version="1.11.16", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", +Require-Bundle: com.raytheon.uf.common.serialization, + com.raytheon.uf.common.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: com.raytheon.uf.common.status, - com.raytheon.uf.edex.decodertools.core, - com.raytheon.uf.edex.decodertools.time -Export-Package: com.raytheon.uf.common.dataplugin.tcg, - com.raytheon.uf.common.dataplugin.tcg.dao + javax.measure, + com.raytheon.uf.common.dataplugin +Import-Package: com.raytheon.uf.common.geospatial +Export-Package: com.raytheon.uf.common.dataplugin.tcg diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF index e804619b08..7544d1ae44 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/META-INF/MANIFEST.MF @@ -3,18 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tcs Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.tcs Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.edex.common, - com.raytheon.uf.common.pointdata;bundle-version="1.11.16", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.16", +Require-Bundle: com.raytheon.uf.common.serialization, + com.raytheon.uf.common.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: com.raytheon.uf.common.status, - com.raytheon.uf.edex.decodertools.core, - com.raytheon.uf.edex.decodertools.time + javax.measure, + com.raytheon.uf.common.dataplugin +Import-Package: com.raytheon.uf.common.geospatial Export-Package: com.raytheon.uf.common.dataplugin.tcs, - com.raytheon.uf.common.dataplugin.tcs.util, - com.raytheon.uf.common.dataplugin.tcs.dao + com.raytheon.uf.common.dataplugin.tcs.util diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF index d9552f6290..919b8a1252 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/META-INF/MANIFEST.MF @@ -3,15 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: Vaa Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.vaa Bundle-Version: 1.12.1174.qualifier -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.edex.common, - com.raytheon.uf.common.pointdata;bundle-version="1.11.16", +Require-Bundle: com.raytheon.uf.common.serialization, + com.raytheon.uf.common.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: com.raytheon.uf.edex.decodertools.core, - com.raytheon.uf.edex.decodertools.time -Export-Package: com.raytheon.uf.common.dataplugin.vaa, - com.raytheon.uf.common.dataplugin.vaa.dao + javax.measure, + com.raytheon.uf.common.dataplugin +Import-Package: com.raytheon.uf.common.geospatial +Export-Package: com.raytheon.uf.common.dataplugin.vaa diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF index b23fc4e030..ca2f4a74a3 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF @@ -4,14 +4,16 @@ Bundle-Name: Vil Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.vil Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON -Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization +Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Require-Bundle: javax.persistence;bundle-version="1.0.0", - com.raytheon.edex.common;bundle-version="1.11.1", + com.raytheon.uf.common.serialization, org.geotools;bundle-version="2.5.2", - com.raytheon.uf.common.monitor;bundle-version="1.11.5" + com.raytheon.uf.common.monitor, + com.raytheon.uf.common.geospatial, + com.raytheon.uf.common.dataplugin, + com.raytheon.uf.common.datastorage Import-Package: com.raytheon.uf.common.dataplugin.radar, org.apache.commons.logging -Export-Package: com.raytheon.uf.common.dataplugin.vil, - com.raytheon.uf.common.dataplugin.vil.dao +Export-Package: com.raytheon.uf.common.dataplugin.vil Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF index 4dbb791fb3..4b4dbc01fa 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/META-INF/MANIFEST.MF @@ -6,12 +6,19 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.dataplugin.cwa;bundle-version="1.0.0", - com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", + com.raytheon.uf.edex.decodertools, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.edex.pointdata, com.raytheon.uf.common.localization, org.geotools, javax.persistence, - javax.measure -Import-Package: org.apache.commons.logging + javax.measure, + com.raytheon.uf.edex.database, + com.raytheon.uf.common.serialization +Import-Package: com.raytheon.edex.esb, + com.raytheon.uf.common.dataplugin, + com.raytheon.uf.common.datastorage.records, + com.raytheon.uf.common.status, + com.raytheon.uf.common.time, + com.raytheon.uf.edex.core, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml index 13a7a48778..b04b92b14a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml @@ -9,7 +9,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java index 4c3f659014..4a38261f53 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.cwa.CWARecord; -import com.raytheon.uf.common.dataplugin.cwa.dao.CWARecordDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.edex.plugin.cwa.decoder.CWAParser; import com.raytheon.uf.edex.plugin.cwa.util.TableLoader; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/dao/CWARecordDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWARecordDao.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/dao/CWARecordDao.java rename to edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWARecordDao.java index 87af332ca1..27e44d64fc 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/dao/CWARecordDao.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWARecordDao.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.dataplugin.cwa.dao; +package com.raytheon.uf.edex.plugin.cwa; import java.util.List; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java index 3d56c3ad2c..f04904b37b 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java @@ -40,12 +40,12 @@ import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.cwa.CWADimension; import com.raytheon.uf.common.dataplugin.cwa.CWARecord; -import com.raytheon.uf.common.dataplugin.cwa.dao.CWARecordDao; import com.raytheon.uf.common.pointdata.PointDataContainer; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.edex.decodertools.time.TimeTools; +import com.raytheon.uf.edex.plugin.cwa.CWARecordDao; import com.raytheon.uf.edex.plugin.cwa.util.TableLoader; import com.raytheon.uf.edex.plugin.cwa.util.Utility; import com.raytheon.uf.edex.wmo.message.WMOHeader; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF index bad5790905..ebc80f867b 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/META-INF/MANIFEST.MF @@ -6,11 +6,18 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.dataplugin.lsr;bundle-version="1.0.0", - com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", + com.raytheon.uf.edex.decodertools, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.edex.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: org.apache.commons.logging + javax.measure, + com.raytheon.uf.edex.database, + com.raytheon.uf.common.serialization, + com.raytheon.uf.common.dataplugin +Import-Package: com.raytheon.edex.esb, + com.raytheon.uf.common.datastorage.records, + com.raytheon.uf.common.status, + com.raytheon.uf.common.time, + com.raytheon.uf.edex.core, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml index 89caeadc8b..1647cf9846 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml @@ -9,7 +9,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java index f58538f3e8..a8a6d0c63e 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.lsr.LocalStormReport; -import com.raytheon.uf.common.dataplugin.lsr.dao.LocalStormReportDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.edex.plugin.lsr.decoder.LSRParser; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/dao/LocalStormReportDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LocalStormReportDao.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/dao/LocalStormReportDao.java rename to edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LocalStormReportDao.java index 384e14ef25..124143ac23 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/dao/LocalStormReportDao.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LocalStormReportDao.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.dataplugin.lsr.dao; +package com.raytheon.uf.edex.plugin.lsr; import java.util.List; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/decoder/LSRParser.java b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/decoder/LSRParser.java index b2129081ed..5dbaff30a9 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/decoder/LSRParser.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/decoder/LSRParser.java @@ -35,13 +35,13 @@ import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.lsr.LSREventType; import com.raytheon.uf.common.dataplugin.lsr.LocalStormReport; -import com.raytheon.uf.common.dataplugin.lsr.dao.LocalStormReportDao; import com.raytheon.uf.common.pointdata.PointDataContainer; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.edex.decodertools.time.TimeTools; +import com.raytheon.uf.edex.plugin.lsr.LocalStormReportDao; import com.raytheon.uf.edex.wmo.message.WMOHeader; /** diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF index 1a23861278..1ec2f314d7 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF @@ -6,11 +6,18 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.dataplugin.svrwx;bundle-version="1.0.0", - com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", + com.raytheon.uf.edex.decodertools, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.edex.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: org.apache.commons.logging + javax.measure, + com.raytheon.uf.edex.database, + com.raytheon.uf.common.serialization +Import-Package: com.raytheon.edex.esb, + com.raytheon.uf.common.dataplugin, + com.raytheon.uf.common.datastorage.records, + com.raytheon.uf.common.status, + com.raytheon.uf.common.time, + com.raytheon.uf.edex.core, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml index af088ba462..60d6b7aa64 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml @@ -9,7 +9,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxDecoder.java index dc58bfab14..dd330a6aed 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxDecoder.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.svrwx.SvrWxRecord; -import com.raytheon.uf.common.dataplugin.svrwx.dao.SvrWxRecordDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.edex.plugin.svrwx.decoder.SvrWxParser; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/dao/SvrWxRecordDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxRecordDao.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/dao/SvrWxRecordDao.java rename to edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxRecordDao.java index d7cad46a2f..2bcab3d194 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/dao/SvrWxRecordDao.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxRecordDao.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.dataplugin.svrwx.dao; +package com.raytheon.uf.edex.plugin.svrwx; import java.util.List; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java index f0091efed4..6615047df4 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java @@ -35,12 +35,12 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.svrwx.SvrWxRecord; -import com.raytheon.uf.common.dataplugin.svrwx.dao.SvrWxRecordDao; import com.raytheon.uf.common.pointdata.PointDataContainer; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.edex.plugin.svrwx.SvrWxRecordDao; import com.raytheon.uf.edex.wmo.message.WMOHeader; /** diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF index 2cb1bfe722..d795641aba 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/META-INF/MANIFEST.MF @@ -6,11 +6,18 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.dataplugin.tcg;bundle-version="1.0.0", - com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", + com.raytheon.uf.edex.decodertools, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.edex.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: org.apache.commons.logging + javax.measure, + com.raytheon.uf.edex.database, + com.raytheon.uf.common.serialization, + com.raytheon.uf.common.dataplugin +Import-Package: com.raytheon.edex.esb, + com.raytheon.uf.common.datastorage.records, + com.raytheon.uf.common.status, + com.raytheon.uf.common.time, + com.raytheon.uf.edex.core, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml index 44dffb063a..5339769976 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml @@ -9,7 +9,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TCGDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TCGDecoder.java index 43e784835a..7ca190a6dd 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TCGDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TCGDecoder.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance; -import com.raytheon.uf.common.dataplugin.tcg.dao.TropicalCycloneGuidanceDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.edex.plugin.tcg.decoder.TCGDataAdapter; import com.raytheon.uf.edex.wmo.message.WMOHeader; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/dao/TropicalCycloneGuidanceDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TropicalCycloneGuidanceDao.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/dao/TropicalCycloneGuidanceDao.java rename to edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TropicalCycloneGuidanceDao.java index 5cc38e4ab4..a20750bb50 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/dao/TropicalCycloneGuidanceDao.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TropicalCycloneGuidanceDao.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.dataplugin.tcg.dao; +package com.raytheon.uf.edex.plugin.tcg; import java.util.List; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/HURData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/HURData.java index 83d4ce4b2d..16a6de95f4 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/HURData.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/HURData.java @@ -29,10 +29,10 @@ import java.util.regex.Pattern; import com.raytheon.uf.common.dataplugin.tcg.TCGStormType; import com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance; -import com.raytheon.uf.common.dataplugin.tcg.dao.TropicalCycloneGuidanceDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao; import com.vividsolutions.jts.geom.Coordinate; /** diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/NullData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/NullData.java index 9e011404c8..932412884e 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/NullData.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/NullData.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; import com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance; -import com.raytheon.uf.common.dataplugin.tcg.dao.TropicalCycloneGuidanceDao; import com.raytheon.uf.common.pointdata.PointDataDescription; +import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao; /** * TODO Add Description * diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java index 0edd86c120..ae8031bd0b 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java @@ -26,10 +26,10 @@ import java.util.TimeZone; import com.raytheon.uf.common.dataplugin.tcg.TCGStormType; import com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance; -import com.raytheon.uf.common.dataplugin.tcg.dao.TropicalCycloneGuidanceDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao; /** * TODO Add Description diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java index 4005da42e3..4fe0296c2d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCEData.java @@ -28,10 +28,10 @@ import java.util.regex.Pattern; import com.raytheon.uf.common.dataplugin.tcg.TCGStormType; import com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance; -import com.raytheon.uf.common.dataplugin.tcg.dao.TropicalCycloneGuidanceDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao; /** * TODO Add Description diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java index c16b695ce3..917f5297b7 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java @@ -33,11 +33,11 @@ import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.tcg.TCGStormType; import com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance; -import com.raytheon.uf.common.dataplugin.tcg.dao.TropicalCycloneGuidanceDao; import com.raytheon.uf.common.pointdata.PointDataContainer; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.common.time.DataTime; +import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao; import com.raytheon.uf.edex.wmo.message.WMOHeader; /** diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF index a07814155d..24a01dc5df 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/META-INF/MANIFEST.MF @@ -6,11 +6,18 @@ Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.dataplugin.tcs;bundle-version="1.0.0", - com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", + com.raytheon.uf.edex.decodertools, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.edex.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: org.apache.commons.logging + javax.measure, + com.raytheon.uf.edex.database, + com.raytheon.uf.common.serialization +Import-Package: com.raytheon.edex.esb, + com.raytheon.uf.common.dataplugin, + com.raytheon.uf.common.datastorage.records, + com.raytheon.uf.common.status, + com.raytheon.uf.common.time, + com.raytheon.uf.edex.core, + org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml index 86e5e41fad..1cb6ead03c 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml @@ -9,7 +9,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TCSDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TCSDecoder.java index 6a2328266f..1161e959c6 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TCSDecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TCSDecoder.java @@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFactory; import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary; -import com.raytheon.uf.common.dataplugin.tcs.dao.TropicalCycloneSummaryDao; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.edex.plugin.tcs.decoder.TCSDataAdapter; import com.raytheon.uf.edex.wmo.message.WMOHeader; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/dao/TropicalCycloneSummaryDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TropicalCycloneSummaryDao.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/dao/TropicalCycloneSummaryDao.java rename to edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TropicalCycloneSummaryDao.java index 4e3096ebe3..41e26e5e8d 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/dao/TropicalCycloneSummaryDao.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TropicalCycloneSummaryDao.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.dataplugin.tcs.dao; +package com.raytheon.uf.edex.plugin.tcs; import java.util.List; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/NullData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/NullData.java index 89db0e6c69..56ed5df2f5 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/NullData.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/NullData.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary; -import com.raytheon.uf.common.dataplugin.tcs.dao.TropicalCycloneSummaryDao; import com.raytheon.uf.common.pointdata.PointDataDescription; +import com.raytheon.uf.edex.plugin.tcs.TropicalCycloneSummaryDao; /** * TODO Add Description diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java index 3d2da99d16..83c6aa883d 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java @@ -32,12 +32,12 @@ import java.util.regex.Pattern; import com.raytheon.uf.common.dataplugin.tcs.Radius; import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary; -import com.raytheon.uf.common.dataplugin.tcs.dao.TropicalCycloneSummaryDao; import com.raytheon.uf.common.dataplugin.tcs.util.Util; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.edex.decodertools.time.TimeTools; +import com.raytheon.uf.edex.plugin.tcs.TropicalCycloneSummaryDao; /** * TODO Add Description diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java index ddc1030ac3..e3510de906 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java @@ -31,11 +31,11 @@ import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.tcs.Radius; import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary; -import com.raytheon.uf.common.dataplugin.tcs.dao.TropicalCycloneSummaryDao; import com.raytheon.uf.common.dataplugin.tcs.util.TCSConstants; import com.raytheon.uf.common.pointdata.PointDataContainer; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; +import com.raytheon.uf.edex.plugin.tcs.TropicalCycloneSummaryDao; import com.raytheon.uf.edex.wmo.message.WMOHeader; /** diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF index 00e9ff6500..e4e204237f 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/META-INF/MANIFEST.MF @@ -5,13 +5,18 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.vaa Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.decodertools;bundle-version="1.0.0", - com.raytheon.uf.common.pointdata;bundle-version="1.11.8", - com.raytheon.uf.edex.pointdata;bundle-version="1.11.8", +Require-Bundle: com.raytheon.uf.edex.decodertools, + com.raytheon.uf.common.pointdata, + com.raytheon.uf.edex.pointdata, org.geotools, javax.persistence, - javax.measure -Import-Package: com.raytheon.uf.common.dataplugin.vaa, - com.raytheon.uf.common.dataplugin.vaa.dao, + javax.measure, + com.raytheon.uf.common.dataplugin, + com.raytheon.uf.edex.database, + com.raytheon.uf.common.dataplugin.vaa +Import-Package: com.raytheon.edex.db.dao, + com.raytheon.edex.esb, + com.raytheon.uf.common.datastorage, + com.raytheon.uf.common.time, + com.raytheon.uf.edex.core, org.apache.commons.logging diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml index 9e4df72dea..90a55f2d7a 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml @@ -9,7 +9,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa/VAADecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa/VAADecoder.java index 89d4e01288..454970c5d6 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa/VAADecoder.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa/VAADecoder.java @@ -29,7 +29,6 @@ import com.raytheon.edex.esb.Headers; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.vaa.VAARecord; -import com.raytheon.uf.common.dataplugin.vaa.dao.VAARecordDao; import com.raytheon.uf.edex.plugin.vaa.decoder.VAAParser; /** diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/dao/VAARecordDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa/VAARecordDao.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/dao/VAARecordDao.java rename to edexOsgi/com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa/VAARecordDao.java index 0388098d9f..b404497892 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/dao/VAARecordDao.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/src/com/raytheon/uf/edex/plugin/vaa/VAARecordDao.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.dataplugin.vaa.dao; +package com.raytheon.uf.edex.plugin.vaa; import java.util.List; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF index 40ecea0570..6465f62d6c 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF @@ -5,14 +5,22 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.vil Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core -Require-Bundle: com.raytheon.uf.common.monitor;bundle-version="1.0.0", - com.raytheon.edex.common;bundle-version="1.11.1", - com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.1";resolution:=optional, +Require-Bundle: com.raytheon.uf.common.monitor, + com.raytheon.uf.edex.cpgsrv;resolution:=optional, com.raytheon.uf.common.dataplugin.vil, - com.raytheon.uf.common.monitor.cpg;bundle-version="1.0.0", - com.raytheon.uf.common.status;bundle-version="1.12.1152", - com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0" -Import-Package: com.raytheon.uf.edex.plugin.scan.common, + com.raytheon.uf.common.monitor.cpg, + com.raytheon.uf.common.dataplugin.radar, + com.raytheon.uf.common.geospatial, + com.raytheon.uf.common.serialization, + com.raytheon.uf.common.datastorage, + com.raytheon.uf.common.dataplugin, + com.raytheon.uf.edex.database, + com.raytheon.uf.edex.core +Import-Package: com.raytheon.edex.urifilter, + com.raytheon.uf.common.status, + com.raytheon.uf.common.time, + com.raytheon.uf.common.util.registry, + com.raytheon.uf.edex.plugin.scan.common, org.apache.commons.logging Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml index 9959aba2c0..3f49566ba1 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml @@ -10,7 +10,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/dao/VILDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILDao.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/dao/VILDao.java rename to edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILDao.java index 4c631aa5d7..040921c5e4 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/dao/VILDao.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILDao.java @@ -18,7 +18,7 @@ * further licensing information. **/ -package com.raytheon.uf.common.dataplugin.vil.dao; +package com.raytheon.uf.edex.plugin.vil; import java.util.ArrayList; import java.util.List; diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILGenerator.java index 43ba2ad369..d8b5e1be7b 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILGenerator.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/src/com/raytheon/uf/edex/plugin/vil/VILGenerator.java @@ -28,7 +28,6 @@ import com.raytheon.edex.urifilter.URIFilter; import com.raytheon.edex.urifilter.URIGenerateMessage; import com.raytheon.uf.common.dataplugin.vil.VILRecord; import com.raytheon.uf.common.dataplugin.vil.VILRecord.DATA_TYPE; -import com.raytheon.uf.common.dataplugin.vil.dao.VILDao; import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager; import com.raytheon.uf.common.monitor.events.MonitorConfigEvent; import com.raytheon.uf.common.monitor.events.MonitorConfigListener;