Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development

Former-commit-id: 1473d04e25 [formerly 82472058e9] [formerly 1473d04e25 [formerly 82472058e9] [formerly de38280317 [formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]]
Former-commit-id: de38280317
Former-commit-id: 65c7c9e9b3 [formerly f6c4ec164f]
Former-commit-id: 5b096c5524

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,
+Export-Package: com.raytheon.uf.common.dataplugin.cwa
- com.raytheon.uf.common.dataplugin.cwa.dao
+Require-Bundle: com.raytheon.uf.common.serialization,
-Require-Bundle: com.raytheon.edex.common,
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.16",
  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,
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
- com.raytheon.uf.edex.decodertools.core,
- com.raytheon.uf.edex.decodertools.time
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization

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,
+Require-Bundle: com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.16",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: com.raytheon.uf.common.status,
+ com.raytheon.uf.common.dataplugin
- com.raytheon.uf.edex.decodertools.core,
+Import-Package: com.raytheon.uf.common.geospatial
- com.raytheon.uf.edex.decodertools.time
+Export-Package: com.raytheon.uf.common.dataplugin.lsr
-Export-Package: com.raytheon.uf.common.dataplugin.lsr,
- com.raytheon.uf.common.dataplugin.lsr.dao

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,
+Require-Bundle: com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.16",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: com.raytheon.uf.common.status,
+ com.raytheon.uf.common.dataplugin
- com.raytheon.uf.edex.decodertools.core,
+Import-Package: com.raytheon.uf.common.geospatial
- com.raytheon.uf.edex.decodertools.time
+Export-Package: com.raytheon.uf.common.dataplugin.svrwx
-Export-Package: com.raytheon.uf.common.dataplugin.svrwx,
- com.raytheon.uf.common.dataplugin.svrwx.dao

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,
+Require-Bundle: com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.16",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: com.raytheon.uf.common.status,
+ com.raytheon.uf.common.dataplugin
- com.raytheon.uf.edex.decodertools.core,
+Import-Package: com.raytheon.uf.common.geospatial
- com.raytheon.uf.edex.decodertools.time
+Export-Package: com.raytheon.uf.common.dataplugin.tcg
-Export-Package: com.raytheon.uf.common.dataplugin.tcg,
- com.raytheon.uf.common.dataplugin.tcg.dao

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,
+Require-Bundle: com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.16",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: com.raytheon.uf.common.status,
+ com.raytheon.uf.common.dataplugin
- com.raytheon.uf.edex.decodertools.core,
+Import-Package: com.raytheon.uf.common.geospatial
- com.raytheon.uf.edex.decodertools.time
 Export-Package: com.raytheon.uf.common.dataplugin.tcs,
- com.raytheon.uf.common.dataplugin.tcs.util,
+ com.raytheon.uf.common.dataplugin.tcs.util
- com.raytheon.uf.common.dataplugin.tcs.dao

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,
+Require-Bundle: com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
+ com.raytheon.uf.common.pointdata,
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: com.raytheon.uf.edex.decodertools.core,
+ com.raytheon.uf.common.dataplugin
- com.raytheon.uf.edex.decodertools.time
+Import-Package: com.raytheon.uf.common.geospatial
-Export-Package: com.raytheon.uf.common.dataplugin.vaa,
+Export-Package: com.raytheon.uf.common.dataplugin.vaa
- com.raytheon.uf.common.dataplugin.vaa.dao

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,
+Export-Package: com.raytheon.uf.common.dataplugin.vil
- com.raytheon.uf.common.dataplugin.vil.dao
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 

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,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
  com.raytheon.uf.common.localization,
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: org.apache.commons.logging
+ 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

edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml

@@ -9,7 +9,7 @@
     <bean id="cwaProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="cwaPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.cwa" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.cwa.dao.CWARecordDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.cwa.CWARecordDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.cwa.CWARecord" />
     </bean>
     

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;

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;
 

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;

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,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: org.apache.commons.logging
+ 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

edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml

@@ -9,7 +9,7 @@
     <bean id="lclstrmrptProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="lclstrmrptPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.lsr" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.lsr.dao.LocalStormReportDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.lsr.LocalStormReportDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.lsr.LocalStormReport" />
     </bean>
     

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;
 

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;
 

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;
 
 /**

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,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: org.apache.commons.logging
+ 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

edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml

@@ -9,7 +9,7 @@
     <bean id="svrwxProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="svrwxPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.svrwx" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.svrwx.dao.SvrWxRecordDao" /> 
+        <property name="dao" value="com.raytheon.uf.edex.plugin.svrwx.SvrWxRecordDao" /> 
         <property name="record" value="com.raytheon.uf.common.dataplugin.svrwx.SvrWxRecord" />     
     </bean>
     

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;
 

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;
 

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;
 
 /**

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,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: org.apache.commons.logging
+ 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

edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml

@@ -9,7 +9,7 @@
     <bean id="tcgProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="tcgPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.tcg" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.tcg.dao.TropicalCycloneGuidanceDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance" />
     </bean>
     

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;

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;
 

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;
 
 /**

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
  * 

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

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

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;
 
 /**

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,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: org.apache.commons.logging
+ 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

edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml

@@ -9,7 +9,7 @@
     <bean id="tcsProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="tcsPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.tcs" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.tcs.dao.TropicalCycloneSummaryDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.tcs.TropicalCycloneSummaryDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary" />
     </bean>
     

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;

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;
 

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

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

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;
 
 /**

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",
+Require-Bundle: com.raytheon.uf.edex.decodertools,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
+ com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.pointdata,
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
-Import-Package: com.raytheon.uf.common.dataplugin.vaa,
+ com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.dataplugin.vaa.dao,
+ 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

edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml

@@ -9,7 +9,7 @@
     <bean id="vaaProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="vaaPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.vaa" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.vaa.dao.VAARecordDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.vaa.VAARecordDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.vaa.VAARecord" />
     </bean>
     

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;
 
 /**

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;
 

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",
+Require-Bundle: com.raytheon.uf.common.monitor,
- com.raytheon.edex.common;bundle-version="1.11.1",
+ com.raytheon.uf.edex.cpgsrv;resolution:=optional,
- com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.1";resolution:=optional,
  com.raytheon.uf.common.dataplugin.vil,
- com.raytheon.uf.common.monitor.cpg;bundle-version="1.0.0",
+ com.raytheon.uf.common.monitor.cpg,
- com.raytheon.uf.common.status;bundle-version="1.12.1152",
+ com.raytheon.uf.common.dataplugin.radar,
- com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0"
+ com.raytheon.uf.common.geospatial,
-Import-Package: com.raytheon.uf.edex.plugin.scan.common,
+ 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

edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml

@@ -10,7 +10,7 @@
    <bean id="vilProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="vilPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.vil" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.vil.dao.VILDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.vil.VILDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.vil.VILRecord" />
 		<property name="dependencyFQNs">
 		    <list>

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;

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;