Issue #3000 - Split bufrmos plugin into common and edex.

Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37

Former-commit-id: b288bd46de [formerly b288bd46de [formerly 3fd04e796b7c409c67c06517265648e576852352]]
Former-commit-id: 0be8ad31d1
Former-commit-id: 50a65c5a31

cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml

@@ -198,13 +198,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.edex.plugin.bufrmos"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.madis"
          download-size="0"
@@ -212,4 +205,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.dataplugin.bufrmos"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF

@@ -41,8 +41,7 @@ Export-Package: com.raytheon.viz.aviation,
  com.raytheon.viz.aviation.utility,
  com.raytheon.viz.aviation.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.edex.plugin.bufrmos.common,
- com.raytheon.uf.common.dataplugin.acarssounding,
+Import-Package: com.raytheon.uf.common.dataplugin.acarssounding,
  com.raytheon.uf.common.dataplugin.ccfp,
  com.raytheon.uf.common.dataplugin.gfe.point,
  com.raytheon.uf.common.dataplugin.gfe.request,

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.common.dataplugin.bufrmos</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/META-INF/MANIFEST.MF

@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Bufrmos
+Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrmos
+Bundle-Version: 1.14.0.qualifier
+Bundle-Activator: com.raytheon.uf.common.dataplugin.bufrmos.Activator
+Bundle-Vendor: RAYTHEON
+Require-Bundle: org.eclipse.core.runtime,
+ org.hibernate;bundle-version="3.5.6",
+ javax.persistence;bundle-version="1.0.0",
+ com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.pointdata;bundle-version="1.13.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: com.raytheon.uf.common.dataplugin.bufrmos.common

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/build.properties

@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosAvnData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Embedded;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosDataLocation.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosEtaData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosGfsData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosHpcData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosLampData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosMrfData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosNgmData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.common;
+package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;

edexOsgi/com.raytheon.uf.edex.bufr.feature/feature.xml

@@ -74,7 +74,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.raytheon.edex.plugin.bufrmos"
+         id="com.raytheon.uf.edex.plugin.bufrmos"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -143,4 +143,10 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.dataplugin.bufrmos"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.edex.plugin.bufrmos</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/META-INF/MANIFEST.MF

@@ -1,12 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrmos Plug-in
-Bundle-SymbolicName: com.raytheon.edex.plugin.bufrmos
-Bundle-Version: 1.12.1174.qualifier
+Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrmos
+Bundle-Version: 1.14.0.qualifier
 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
-Export-Package: com.raytheon.edex.plugin.bufrmos,
- com.raytheon.edex.plugin.bufrmos.common
+Export-Package: com.raytheon.uf.edex.plugin.bufrmos
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
@@ -15,7 +14,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.edex.core;bundle-version="1.12.1174",
  com.raytheon.uf.edex.database;bundle-version="1.0.0",
  com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174",
- com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174"
+ com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin.bufrmos;bundle-version="1.0.0"
 Import-Package: com.raytheon.edex.esb,
  com.raytheon.edex.exception,
  com.raytheon.edex.plugin,

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

@@ -4,9 +4,9 @@
 
 	<bean id="bufrmosAvnProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="bufrmosAVN" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.bufrmos" />
-		<property name="dao" value="com.raytheon.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.edex.plugin.bufrmos.common.BufrMosAvnData" />
+		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosAvnData" />
 	</bean>
 	
 	<bean factory-bean="pluginRegistry" factory-method="register">
@@ -16,9 +16,9 @@
 
 	<bean id="bufrmosEtaProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="bufrmosETA" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.bufrmos" />
-		<property name="dao" value="com.raytheon.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.edex.plugin.bufrmos.common.BufrMosEtaData" />
+		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosEtaData" />
 	</bean>
 	
 	<bean factory-bean="pluginRegistry" factory-method="register">
@@ -28,9 +28,9 @@
 
 	<bean id="bufrmosGfsProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="bufrmosGFS" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.bufrmos" />
-		<property name="dao" value="com.raytheon.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.edex.plugin.bufrmos.common.BufrMosGfsData" />
+		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosGfsData" />
 	</bean>
 	
 	<bean factory-bean="pluginRegistry" factory-method="register">
@@ -40,9 +40,9 @@
 
 	<bean id="bufrmosHpcProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="bufrmosHPC" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.bufrmos" />
-		<property name="dao" value="com.raytheon.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.edex.plugin.bufrmos.common.BufrMosHpcData" />
+		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosHpcData" />
 	</bean>
 	
 	<bean factory-bean="pluginRegistry" factory-method="register">
@@ -52,9 +52,9 @@
 
 	<bean id="bufrmosLampProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="bufrmosLAMP" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.bufrmos" />
-		<property name="dao" value="com.raytheon.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.edex.plugin.bufrmos.common.BufrMosLampData" />
+		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosLampData" />
 	</bean>
 	
 	<bean factory-bean="pluginRegistry" factory-method="register">
@@ -64,9 +64,9 @@
 
 	<bean id="bufrmosMrfProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="bufrmosMRF" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.bufrmos" />
-		<property name="dao" value="com.raytheon.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.edex.plugin.bufrmos.common.BufrMosMrfData" />
+		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosMrfData" />
 	</bean>
 	
 	<bean factory-bean="pluginRegistry" factory-method="register">
@@ -76,9 +76,9 @@
 
 	<bean id="bufrmosNgmProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="bufrmosNGM" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.bufrmos" />
-		<property name="dao" value="com.raytheon.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.edex.plugin.bufrmos.common.BufrMosNgmData" />
+		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosNgmData" />
 	</bean>
 	
 	<bean factory-bean="pluginRegistry" factory-method="register">

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-	<bean id="bufrmosDecoder" class="com.raytheon.edex.plugin.bufrmos.BufrMosDecoder" />	
+	<bean id="bufrmosDecoder" class="com.raytheon.uf.edex.plugin.bufrmos.BufrMosDecoder" />	
 
 	<bean id="bufrmosDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosDecoder.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos;
+package com.raytheon.uf.edex.plugin.bufrmos;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -29,9 +29,9 @@ import org.apache.commons.logging.LogFactory;
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.AbstractDecoder;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosData;
-import com.raytheon.edex.plugin.bufrmos.decoder.BufrMOSDataAdapter;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData;
+import com.raytheon.uf.edex.plugin.bufrmos.decoder.BufrMOSDataAdapter;
 
 /**
  * Decoder strategy for BUFR Model Output Statistics data. Most common usage is

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosSeparator.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos;
+package com.raytheon.uf.edex.plugin.bufrmos;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,14 +27,14 @@ import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
-import com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData;
-import com.raytheon.edex.plugin.bufrmos.decoder.MOSDescriptorDelegate;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDocument;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRFile;
 import com.raytheon.uf.edex.decodertools.bufr.descriptors.IDescriptorFactorySelector;
 import com.raytheon.uf.edex.decodertools.bufr.packets.BUFRSublistPacket;
 import com.raytheon.uf.edex.decodertools.bufr.packets.IBUFRDataPacket;
+import com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData;
+import com.raytheon.uf.edex.plugin.bufrmos.decoder.MOSDescriptorDelegate;
 import com.raytheon.uf.edex.wmo.message.WMOHeader;
 
 /**

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/MOSPointDataState.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos;
+package com.raytheon.uf.edex.plugin.bufrmos;
 
 import java.util.HashMap;
 import java.util.Map;

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMOSDao.java

@@ -17,23 +17,23 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.dao;
+package com.raytheon.uf.edex.plugin.bufrmos.dao;
 
 import java.io.InputStream;
 import java.util.List;
 
 import javax.xml.bind.JAXBException;
 
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosAvnData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosData.MOSType;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosEtaData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosGfsData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosHpcData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosLampData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosMrfData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosNgmData;
 import com.raytheon.uf.common.dataplugin.PluginException;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosAvnData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosEtaData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosGfsData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosHpcData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosLampData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosMrfData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosNgmData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData.MOSType;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
 import com.raytheon.uf.common.datastorage.IDataStore;
 import com.raytheon.uf.common.status.IUFStatusHandler;

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMosLocationDao.java

@@ -18,9 +18,9 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.plugin.bufrmos.dao;
+package com.raytheon.uf.edex.plugin.bufrmos.dao;
 
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosDataLocation;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosDataLocation;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.database.dao.CoreDao;
 import com.raytheon.uf.edex.database.dao.DaoConfig;

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BUFRMOSStaticData.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.decoder;
+package com.raytheon.uf.edex.plugin.bufrmos.decoder;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -33,7 +33,7 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.plugin.bufrmos.BufrMosSeparator;
+import com.raytheon.uf.edex.plugin.bufrmos.BufrMosSeparator;
 import com.raytheon.uf.edex.wmo.message.WMOHeader;
 
 /**

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMOSDataAdapter.java

@@ -17,24 +17,22 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.decoder;
+package com.raytheon.uf.edex.plugin.bufrmos.decoder;
 
 import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
 
-import com.raytheon.edex.plugin.bufrmos.BufrMosSeparator;
-import com.raytheon.edex.plugin.bufrmos.MOSPointDataState;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosAvnData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosData.MOSType;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosDataLocation;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosEtaData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosGfsData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosHpcData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosLampData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosMrfData;
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosNgmData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosAvnData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosDataLocation;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosEtaData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosGfsData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosHpcData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosLampData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosMrfData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosNgmData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData.MOSType;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataView;
 import com.raytheon.uf.common.time.DataTime;
@@ -46,6 +44,8 @@ import com.raytheon.uf.edex.decodertools.bufr.packets.BUFRNumericPacket;
 import com.raytheon.uf.edex.decodertools.bufr.packets.IBUFRDataPacket;
 import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
 import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.plugin.bufrmos.BufrMosSeparator;
+import com.raytheon.uf.edex.plugin.bufrmos.MOSPointDataState;
 
 /**
  * This class creates a completed Model Output Statistics (MOS) entry from a

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMOSElement.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.decoder;
+package com.raytheon.uf.edex.plugin.bufrmos.decoder;
 
 import com.raytheon.uf.edex.decodertools.bufr.descriptors.BUFRDescriptor;
 

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMosLocationCache.java

@@ -17,15 +17,15 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.decoder;
+package com.raytheon.uf.edex.plugin.bufrmos.decoder;
 
 import java.lang.ref.WeakReference;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import com.raytheon.edex.plugin.bufrmos.common.BufrMosDataLocation;
-import com.raytheon.edex.plugin.bufrmos.dao.BufrMosLocationDao;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosDataLocation;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
+import com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMosLocationDao;
 
 /**
  * TODO Add Description

edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java

@@ -17,15 +17,15 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.bufrmos.decoder;
+package com.raytheon.uf.edex.plugin.bufrmos.decoder;
 
-import static com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_AVN;
-import static com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_ETA;
-import static com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_GFS;
-import static com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_HPC;
-import static com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_LAMP;
-import static com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_MRF;
-import static com.raytheon.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_NGM;
+import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_AVN;
+import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_ETA;
+import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_GFS;
+import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_HPC;
+import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_LAMP;
+import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_MRF;
+import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_NGM;
 
 import java.util.HashMap;
 import java.util.Map;