From 9c271453d28e369ec47cf66ea22593544505f466 Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Mon, 12 May 2014 17:32:54 -0500
Subject: [PATCH] Omaha #2536 moved com.raytheon.edex.plugin.text to
 com.raytheon.uf.edex.plugin.text

minor clode cleanup


Former-commit-id: 6cea46e573cd5696e96a5472fec0e39e4ce42804 [formerly 648bed10a3f52f03205b6fa04c2ab1a0d9ea51af] [formerly b9d9beeb4682efb9837667527bcdc81be751fe3b] [formerly 6cea46e573cd5696e96a5472fec0e39e4ce42804 [formerly 648bed10a3f52f03205b6fa04c2ab1a0d9ea51af] [formerly b9d9beeb4682efb9837667527bcdc81be751fe3b] [formerly 994f7d820d9f741e375501fc2353d0f34069db26 [formerly b9d9beeb4682efb9837667527bcdc81be751fe3b [formerly f68b6921c08b8bccf355fa9c991c232f2ffa2076]]]]
Former-commit-id: 994f7d820d9f741e375501fc2353d0f34069db26
Former-commit-id: 6de69577a92b8e0fdebe205f0a51d534b71b80a4 [formerly a7b1987c9711372973b46939e69ce28056771480] [formerly 260cc2147914106364196d699e8ba1cafe95b79e [formerly 558aefad6c60ac2198b287d3fbce7825f3136750]]
Former-commit-id: 16656f3cd1ed18d642972a4ba6865b7349c9fdcf [formerly c68dabe4109e6e9c553acf32431de6ba4e05ae9c]
Former-commit-id: 7fb1888b5fe5e6cf8ae2402ec24bb8f890610c1d
---
 .../base/textproducts/Generator.py            |  5 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../uf/edex/dissemination/ModifyProduct.java  |  2 +-
 .../.classpath                                |  0
 .../.project                                  |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  0
 .../META-INF/MANIFEST.MF                      |  8 +--
 .../build.properties                          |  0
 .../com.raytheon.edex.plugin.text.ecl         |  0
 .../res/spring/text-common.xml                |  4 +-
 .../res/spring/text-ingest.xml                | 12 ++--
 .../res/spring/text-request.xml               | 18 +++---
 .../com.raytheon.edex.text.properties         |  0
 .../uf}/edex/plugin/text/TextConstants.java   |  4 +-
 .../uf}/edex/plugin/text/TextDecoder.java     | 58 +++++++++----------
 .../uf}/edex/plugin/text/TextRecord.java      | 12 +---
 .../edex/plugin/text/TextVersionPurge.java    |  2 +-
 .../edex/plugin/text/dao/AfosToAwipsDao.java  |  2 +-
 .../uf}/edex/plugin/text/dao/TextDao.java     |  2 +-
 .../text/handler/AutoFaxRequestHandler.java   |  2 +-
 .../plugin/text/handler/GetAfosIdHandler.java |  4 +-
 .../GetAutoFaxRecordsRequestHandler.java      |  2 +-
 .../text/handler/GetPartialAfosIdHandler.java |  4 +-
 .../plugin/text/handler/GetWmoIdHandler.java  |  4 +-
 .../handler/InsertStdTextProductHandler.java  |  7 ++-
 .../text/handler/SendFaxRequestHandler.java   |  2 +-
 .../handler/StdTextProductRequestHandler.java |  7 ++-
 .../handler/TextProductInfoCreateHandler.java |  2 +-
 .../text/impl/TextSeparatorFactory.java       | 12 ++--
 .../edex/plugin/text/impl/WMOMessageType.java |  2 +-
 .../separator/StdCollectiveSeparator.java     |  8 +--
 .../text/impl/separator/StdTextSeparator.java |  4 +-
 .../text/impl/separator/TextDecoderMode.java  |  2 +-
 .../impl/separator/UACollectiveSeparator.java |  4 +-
 .../impl/separator/WMOMessageSeparator.java   |  2 +-
 .../ingest/AfosBrowserModelSubscriber.java    |  2 +-
 .../text/ingest/AfosToAwipsListener.java      |  4 +-
 .../TextArchiveFileNameFormatter.java         |  2 +-
 .../text/subscription/AutoFaxManager.java     |  4 +-
 .../edex_static/base/distribution/text.xml    |  0
 .../feature.xml                               |  2 +-
 41 files changed, 104 insertions(+), 111 deletions(-)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/.classpath (100%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/.project (92%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/META-INF/MANIFEST.MF (83%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/build.properties (100%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/com.raytheon.edex.plugin.text.ecl (100%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/res/spring/text-common.xml (93%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/res/spring/text-ingest.xml (92%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/res/spring/text-request.xml (74%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/resources/com.raytheon.edex.text.properties (100%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/TextConstants.java (90%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/TextDecoder.java (92%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/TextRecord.java (93%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/TextVersionPurge.java (98%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/dao/AfosToAwipsDao.java (99%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/dao/TextDao.java (99%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/AutoFaxRequestHandler.java (97%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/GetAfosIdHandler.java (94%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java (97%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/GetPartialAfosIdHandler.java (94%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/GetWmoIdHandler.java (94%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/InsertStdTextProductHandler.java (93%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/SendFaxRequestHandler.java (97%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/StdTextProductRequestHandler.java (94%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/handler/TextProductInfoCreateHandler.java (96%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/impl/TextSeparatorFactory.java (96%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/impl/WMOMessageType.java (96%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/impl/separator/StdCollectiveSeparator.java (98%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/impl/separator/StdTextSeparator.java (99%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/impl/separator/TextDecoderMode.java (95%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/impl/separator/UACollectiveSeparator.java (99%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/impl/separator/WMOMessageSeparator.java (99%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java (99%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/ingest/AfosToAwipsListener.java (97%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java (97%)
 rename edexOsgi/{com.raytheon.edex.plugin.text/src/com/raytheon => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf}/edex/plugin/text/subscription/AutoFaxManager.java (97%)
 rename edexOsgi/{com.raytheon.edex.plugin.text => com.raytheon.uf.edex.plugin.text}/utility/edex_static/base/distribution/text.xml (100%)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
index f15ea5c911..45d2fbb5d1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
@@ -32,7 +32,8 @@ Jul 08, 2008    1222           jelkins     Modified for use within Java
 Jul 09, 2008    1222           jelkins     Split command line loader from class
 Jul 24, 2012    #944           dgilling    Refactored to support separate
                                            generation of products and utilities.
-Sep 07, 2012    #1150          dgilling    Ensure all necessary dirs get created.                                   
+Sep 07, 2012    #1150          dgilling    Ensure all necessary dirs get created.   
+May 12, 2014    2536           bclement    renamed text plugin to include uf in name
 
 @author: jelkins
 """
@@ -392,7 +393,7 @@ class Generator():
         siteD = SITE_INFO[siteid]
         stationID4 = siteD['fullStationID']
         
-        from com.raytheon.edex.plugin.text.dao import AfosToAwipsDao
+        from com.raytheon.uf.edex.plugin.text.dao import AfosToAwipsDao
         
         dao = AfosToAwipsDao()
         response = dao.lookupAfosId(stationID4, None, None)
diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.dissemination/META-INF/MANIFEST.MF
index a26c1d0d81..0d01471ea9 100644
--- a/edexOsgi/com.raytheon.uf.edex.dissemination/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.dissemination/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Import-Package: com.raytheon.edex.exception,
  com.raytheon.uf.edex.database.purge,
  org.apache.camel
 Require-Bundle: org.jep;bundle-version="1.0.0",
- com.raytheon.edex.plugin.text,
+ com.raytheon.uf.edex.plugin.text,
  com.raytheon.uf.common.site;bundle-version="1.12.1174",
  org.springframework;bundle-version="2.5.6",
  com.raytheon.uf.edex.database,
diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java b/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java
index a6fa5407dc..2c0c07abb8 100644
--- a/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java
+++ b/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java
@@ -23,13 +23,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-import com.raytheon.edex.plugin.text.dao.AfosToAwipsDao;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwips;
 import com.raytheon.uf.common.dissemination.OUPRequest;
 import com.raytheon.uf.common.dissemination.OfficialUserProduct;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.dissemination.transmitted.TransProdHeader;
 import com.raytheon.uf.edex.dissemination.transmitted.TransmittedProductList;
+import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
  * Utilities for generating a wmo header or tracking headers
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.text/.classpath
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.text/.classpath
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/.classpath
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/.project b/edexOsgi/com.raytheon.uf.edex.plugin.text/.project
similarity index 92%
rename from edexOsgi/com.raytheon.edex.plugin.text/.project
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/.project
index 73ee4cbea2..00593b273a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/.project
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.raytheon.edex.plugin.text</name>
+	<name>com.raytheon.uf.edex.plugin.text</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
similarity index 83%
rename from edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
index 3167641bc6..40b42b4e33 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Text Plug-in
-Bundle-SymbolicName: com.raytheon.edex.plugin.text
-Bundle-Version: 1.12.1174.qualifier
+Bundle-SymbolicName: com.raytheon.uf.edex.plugin.text
+Bundle-Version: 1.14.0.qualifier
 Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.textdb,
@@ -16,8 +16,8 @@ Require-Bundle: com.raytheon.edex.textdb,
  com.raytheon.uf.edex.archive,
  com.raytheon.uf.edex.ndm;bundle-version="1.0.0",
  com.raytheon.uf.common.localization;bundle-version="1.14.0"
-Export-Package: com.raytheon.edex.plugin.text,
- com.raytheon.edex.plugin.text.dao
+Export-Package: com.raytheon.uf.edex.plugin.text,
+ com.raytheon.uf.edex.plugin.text.dao
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.raytheon.uf.common.dataplugin.text,
  com.raytheon.uf.common.dataplugin.text.db,
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.text/build.properties
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.text/build.properties
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/build.properties
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/com.raytheon.edex.plugin.text.ecl b/edexOsgi/com.raytheon.uf.edex.plugin.text/com.raytheon.edex.plugin.text.ecl
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.text/com.raytheon.edex.plugin.text.ecl
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/com.raytheon.edex.plugin.text.ecl
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
similarity index 93%
rename from edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
index 207c661ebd..81b1801fde 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
@@ -6,9 +6,9 @@
   	<bean id="textProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="text" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.text" />
-		<property name="dao" value="com.raytheon.edex.plugin.text.dao.TextDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.text.dao.TextDao" />
 		<property name="database" value="fxa"/>
-		<property name="record" value="com.raytheon.edex.plugin.text.TextRecord"/>
+		<property name="record" value="com.raytheon.uf.edex.plugin.text.TextRecord"/>
 	</bean>
 	
 	<bean id="textRegistered" factory-bean="pluginRegistry" factory-method="register"
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
similarity index 92%
rename from edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
index dacd8ec427..9cf4c4f61a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
@@ -7,7 +7,7 @@
         <constructor-arg value="Ingest.Text.*" />
     </bean>
 
-	<bean id="textDecoder" class="com.raytheon.edex.plugin.text.TextDecoder">
+	<bean id="textDecoder" class="com.raytheon.uf.edex.plugin.text.TextDecoder">
 		<property name="pluginName" value="text" />
 		<property name="decoderMode" value="STD" />
 	</bean>
@@ -25,15 +25,15 @@
 	</bean>
 
 	<!-- define the bean that handles automatic faxing of products. -->
-	<bean id="autoFaxManager" class="com.raytheon.edex.plugin.text.subscription.AutoFaxManager">
+	<bean id="autoFaxManager" class="com.raytheon.uf.edex.plugin.text.subscription.AutoFaxManager">
 	</bean>
 
     <!-- verify text product info for site, spawns in separate thread to not delay start up -->
-    <bean id="textVersionPurge" class="com.raytheon.edex.plugin.text.TextVersionPurge" depends-on="textRegistered"/>
+    <bean id="textVersionPurge" class="com.raytheon.uf.edex.plugin.text.TextVersionPurge" depends-on="textRegistered"/>
 
 	<!-- Special handler for text plugin archives that bases filenames off 
 	     creation time-->
-    <bean id="textArchiveNamer" class="com.raytheon.edex.plugin.text.maintenance.archiver.TextArchiveFileNameFormatter" />
+    <bean id="textArchiveNamer" class="com.raytheon.uf.edex.plugin.text.maintenance.archiver.TextArchiveFileNameFormatter" />
 	<bean factory-bean="databaseArchiver" factory-method="registerPluginArchiveFormatter" depends-on="databaseArchiver">
 		<constructor-arg value="text" />
 		<constructor-arg ref="textArchiveNamer" />
@@ -44,8 +44,8 @@
         <constructor-arg value="1000" type="java.lang.Integer"/>
     </bean>
 
-    <bean id="afosToAwipsListener" class="com.raytheon.edex.plugin.text.ingest.AfosToAwipsListener" />
-    <bean id="afosBrowserListener" class="com.raytheon.edex.plugin.text.ingest.AfosBrowserModelSubscriber" />
+    <bean id="afosToAwipsListener" class="com.raytheon.uf.edex.plugin.text.ingest.AfosToAwipsListener" />
+    <bean id="afosBrowserListener" class="com.raytheon.uf.edex.plugin.text.ingest.AfosBrowserModelSubscriber" />
     
     <bean factory-bean="ndmProc" factory-method="registerListener">
         <constructor-arg value="afos2awips.txt" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
similarity index 74%
rename from edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
index 75855d8a24..eb51d477d1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
@@ -2,32 +2,32 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
   
-  	<bean id="getAfosIdHandler" class="com.raytheon.edex.plugin.text.handler.GetAfosIdHandler" />
+  	<bean id="getAfosIdHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetAfosIdHandler" />
 	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetAfosIdRequest"/>
   		<constructor-arg ref="getAfosIdHandler"/>
   	</bean>
   	
-  	<bean id="getPartialAfosIdHandler" class="com.raytheon.edex.plugin.text.handler.GetPartialAfosIdHandler" />
+  	<bean id="getPartialAfosIdHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetPartialAfosIdHandler" />
 	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetPartialAfosIdRequest"/>
   		<constructor-arg ref="getPartialAfosIdHandler"/>
   	</bean>
 
-	<bean id="getWmoIdHandler" class="com.raytheon.edex.plugin.text.handler.GetWmoIdHandler" />
+	<bean id="getWmoIdHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetWmoIdHandler" />
 	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetWmoIdRequest"/>
   		<constructor-arg ref="getWmoIdHandler"/>
   	</bean>
   	
-  	<bean id="insertStdTextProduct" class="com.raytheon.edex.plugin.text.handler.InsertStdTextProductHandler"/>  	
+  	<bean id="insertStdTextProduct" class="com.raytheon.uf.edex.plugin.text.handler.InsertStdTextProductHandler"/>  	
   	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.InsertStdTextProductRequest"/>
   		<constructor-arg ref="insertStdTextProduct"/>
   	</bean>
   	
   	<!-- Instantiate the handler class for StdTextProductRequestHandler -->
-  	<bean id="stdTextProduct" class="com.raytheon.edex.plugin.text.handler.StdTextProductRequestHandler"/>
+  	<bean id="stdTextProduct" class="com.raytheon.uf.edex.plugin.text.handler.StdTextProductRequestHandler"/>
   	<!-- Register the handler class with the StdTextProductServerHandlerRegister. -->  	
   	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.StdTextProductServerRequest"/>
@@ -35,25 +35,25 @@
   	</bean>
   	
   	<!-- Instantiate the handler class for TextProductInfoRequestHandler -->
-  	<bean id="textProductInfo" class="com.raytheon.edex.plugin.text.handler.TextProductInfoCreateHandler"/>
+  	<bean id="textProductInfo" class="com.raytheon.uf.edex.plugin.text.handler.TextProductInfoCreateHandler"/>
   	<!-- Register the handler class with the TextProductInfoHandlerRegister. -->  	
   	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.TextProductInfoCreateRequest"/>
   		<constructor-arg ref="textProductInfo"/>
   	</bean>
   
-	<bean id="sendFaxRequestHandler" class="com.raytheon.edex.plugin.text.handler.SendFaxRequestHandler" />
+	<bean id="sendFaxRequestHandler" class="com.raytheon.uf.edex.plugin.text.handler.SendFaxRequestHandler" />
 	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.SendFaxRequest"/>
   		<constructor-arg ref="sendFaxRequestHandler"/>
   	</bean>
   	
-	<bean id="autoFaxRequestHandler" class="com.raytheon.edex.plugin.text.handler.AutoFaxRequestHandler" />
+	<bean id="autoFaxRequestHandler" class="com.raytheon.uf.edex.plugin.text.handler.AutoFaxRequestHandler" />
 	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.AutoFaxRequest"/>
   		<constructor-arg ref="autoFaxRequestHandler"/>
   	</bean>
-	<bean id="getAutoFaxRecordsRequestHandler" class="com.raytheon.edex.plugin.text.handler.GetAutoFaxRecordsRequestHandler" />
+	<bean id="getAutoFaxRecordsRequestHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetAutoFaxRecordsRequestHandler" />
 	<bean factory-bean="handlerRegistry" factory-method="register">
   		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetAutoFaxRecordsRequest"/>
   		<constructor-arg ref="getAutoFaxRecordsRequestHandler"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/resources/com.raytheon.edex.text.properties b/edexOsgi/com.raytheon.uf.edex.plugin.text/resources/com.raytheon.edex.text.properties
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.text/resources/com.raytheon.edex.text.properties
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/resources/com.raytheon.edex.text.properties
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextConstants.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextConstants.java
similarity index 90%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextConstants.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextConstants.java
index 14b0d5fa70..879606f225 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextConstants.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextConstants.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.text;
+package com.raytheon.uf.edex.plugin.text;
 
 /**
  * TODO Add Description
@@ -36,7 +36,7 @@ package com.raytheon.edex.plugin.text;
  */
 
 public class TextConstants {
-    public static final String PLUGIN_NAME = "com.raytheon.edex.plugin.text";
+    public static final String PLUGIN_NAME = "com.raytheon.uf.edex.plugin.text";
 
     public static final String CATEGORY = "TextPlugin";
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
similarity index 92%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextDecoder.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
index 657ad86440..918ad99e27 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.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.text;
+package com.raytheon.uf.edex.plugin.text;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -42,20 +43,18 @@ 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.text.dao.AfosToAwipsDao;
-import com.raytheon.edex.plugin.text.impl.TextSeparatorFactory;
-import com.raytheon.edex.plugin.text.impl.separator.WMOMessageSeparator;
 import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.edex.textdb.dbapi.impl.WMOReportData;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwips;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.edex.core.props.PropertiesFactory;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
-import com.raytheon.uf.edex.decodertools.time.TimeTools;
+import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
+import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
+import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
 import com.raytheon.uf.edex.wmo.message.AFOSProductId;
 import com.raytheon.uf.edex.wmo.message.WMOHeader;
 
@@ -80,6 +79,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
  * Jul 16, 2013 16323       D. Friedman Use concurrent map
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
  * Mar 14, 2014 2652        skorolev    Changed logging for skipped headers.
+ * May 12, 2014 2536        bclement    added createTextRecord(), removed deprecated code
  * </pre>
  * 
  * @author
@@ -128,7 +128,7 @@ public class TextDecoder extends AbstractDecoder {
     /**
      * 
      * 
-     * @see com.raytheon.edex.plugin.IMessageDecoder#decode()
+     * @see com.raytheon.edex.uf.plugin.IMessageDecoder#decode()
      */
     public PluginDataObject[] writeTextProduct(StdTextProduct textProduct)
             throws DecoderException {
@@ -143,12 +143,9 @@ public class TextDecoder extends AbstractDecoder {
                 boolean success = textdb.writeProduct(textProduct);
 
                 if (success) {
-                    pdo = new TextRecord();
-                    pdo.setProductId(textProduct.getCccid()
-                            + textProduct.getNnnid() + textProduct.getXxxid());
-                    DataTime dt = new DataTime(
-                            TimeTools.newCalendar(textProduct.getRefTime()));
-                    pdo.setDataTime(dt);
+                    String productId = textProduct.getCccid()
+                            + textProduct.getNnnid() + textProduct.getXxxid();
+                    pdo = createTextRecord(productId, textProduct.getRefTime());
                 } else {
                     // throw new Exception("product already exists");
                 }
@@ -160,11 +157,6 @@ public class TextDecoder extends AbstractDecoder {
 
         if (pdo != null) {
             pdo.setTraceId(traceId);
-            try {
-                pdo.constructDataURI();
-            } catch (PluginException e) {
-                logger.error("Unable to construct dataURI", e);
-            }
             logger.debug(traceId + " - " + pdo);
 
             returnObjects = new TextRecord[1];
@@ -176,6 +168,21 @@ public class TextDecoder extends AbstractDecoder {
         return returnObjects;
     }
 
+    /**
+     * Construct a new text record with the given product ID and refTime
+     * 
+     * @param productId
+     * @param refTime
+     * @return
+     */
+    private static TextRecord createTextRecord(String productId, long refTime) {
+        TextRecord pdo = new TextRecord();
+        pdo.setProductId(productId);
+        DataTime dt = new DataTime(new Date(refTime));
+        pdo.setDataTime(dt);
+        return pdo;
+    }
+
     /**
      * 
      * 
@@ -299,12 +306,9 @@ public class TextDecoder extends AbstractDecoder {
                                     operationalMode, headers);
 
                             if (writeTime != Long.MIN_VALUE) {
-                                pdo = new TextRecord();
-                                pdo.setProductId(rptData.getAfosProdId()
-                                        .toString());
-                                DataTime dt = new DataTime(
-                                        TimeTools.newCalendar(writeTime));
-                                pdo.setDataTime(dt);
+                                String productId = rptData.getAfosProdId()
+                                        .toString();
+                                pdo = createTextRecord(productId, writeTime);
                                 stored++;
                             } else {
                                 // throw new
@@ -320,12 +324,6 @@ public class TextDecoder extends AbstractDecoder {
 
                     if (pdo != null) {
                         pdo.setTraceId(traceId);
-                        try {
-                            pdo.constructDataURI();
-                        } catch (PluginException e) {
-                            logger.error("Unable to construct dataURI", e);
-                            continue;
-                        }
                         logger.debug(traceId + " - " + pdo);
                         reports.add(pdo);
                     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextRecord.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextRecord.java
similarity index 93%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextRecord.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextRecord.java
index 43a9094555..22c842b536 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextRecord.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextRecord.java
@@ -17,14 +17,13 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.text;
+package com.raytheon.uf.edex.plugin.text;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.xml.bind.annotation.XmlElement;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@@ -42,6 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * May 12, 2014 2536       bclement    removed IDecoderGettable
  * 
  * </pre>
  * 
@@ -94,14 +94,6 @@ public class TextRecord extends PluginDataObject {
         this.productId = productId;
     }
 
-    /**
-     * 
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     @Override
     @Column
     @Access(AccessType.PROPERTY)
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextVersionPurge.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextVersionPurge.java
similarity index 98%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextVersionPurge.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextVersionPurge.java
index 4841fef814..a95450f58f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/TextVersionPurge.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextVersionPurge.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.text;
+package com.raytheon.uf.edex.plugin.text;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/AfosToAwipsDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/AfosToAwipsDao.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/AfosToAwipsDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/AfosToAwipsDao.java
index 7c10c32caf..4c5c3c0f5d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/AfosToAwipsDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/AfosToAwipsDao.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.plugin.text.dao;
+package com.raytheon.uf.edex.plugin.text.dao;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextDao.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextDao.java
index 43512d7cb1..1c5782d3e0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextDao.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.text.dao;
+package com.raytheon.uf.edex.plugin.text.dao;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/AutoFaxRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/AutoFaxRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java
index c69b483d63..934f6ee2ad 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/AutoFaxRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.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.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetAfosIdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAfosIdHandler.java
similarity index 94%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetAfosIdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAfosIdHandler.java
index 2b08534395..9deeae8d06 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetAfosIdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAfosIdHandler.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.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.plugin.text.dao.AfosToAwipsDao;
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.request.GetAfosIdRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
index f49a50b053..0b302d2696 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.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.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetPartialAfosIdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetPartialAfosIdHandler.java
similarity index 94%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetPartialAfosIdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetPartialAfosIdHandler.java
index 33acbc959d..a162185cc1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetPartialAfosIdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetPartialAfosIdHandler.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.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.plugin.text.dao.AfosToAwipsDao;
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.request.GetPartialAfosIdRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetWmoIdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetWmoIdHandler.java
similarity index 94%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetWmoIdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetWmoIdHandler.java
index c742d8b44b..d63fbedf09 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/GetWmoIdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetWmoIdHandler.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.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.plugin.text.dao.AfosToAwipsDao;
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.request.GetWmoIdRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/InsertStdTextProductHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
similarity index 93%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/InsertStdTextProductHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
index 98b61fbb71..adc1a1b6e6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/InsertStdTextProductHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
@@ -17,11 +17,10 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.Date;
 
-import com.raytheon.edex.plugin.text.TextConstants;
 import com.raytheon.edex.textdb.alarms.AlarmAlertUtil;
 import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.request.InsertStdTextProductRequest;
@@ -33,7 +32,8 @@ import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
 
 /**
- * TODO Add Description
+ * Handles InsertStdTextProductRequests by placing them onto the LDAD queue and
+ * sending product alarm alerts as specified by the request
  * 
  * <pre>
  * 
@@ -43,6 +43,7 @@ import com.raytheon.uf.edex.core.EdexException;
  * Nov 12, 2009            mschenke     Initial creation
  * 01Jun2010               cjeanbap    Added operational mode functionality.
  * 08Jul2010    2187       cjeanbap    Added operational mode functionality.
+ * May 12, 2014 2536       bclement    removed unused import
  * </pre>
  * 
  * @author mschenke
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/SendFaxRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/SendFaxRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java
index 9630ed8bc1..286398a54b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/SendFaxRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.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.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import com.raytheon.edex.textdb.fax.FaxSender;
 import com.raytheon.uf.common.dataplugin.text.request.SendFaxRequest;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/StdTextProductRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
similarity index 94%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/StdTextProductRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
index 6b8f6c3c38..36bcb53be7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/StdTextProductRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
@@ -18,11 +18,10 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.Date;
 
-import com.raytheon.edex.plugin.text.TextConstants;
 import com.raytheon.edex.textdb.alarms.AlarmAlertUtil;
 import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.db.OperationalStdTextProduct;
@@ -37,7 +36,8 @@ import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
 
 /**
- * TODO Add Description
+ * Handles StdTextProductServerRequest by placing them onto the LDAD queue and
+ * sending product alarm alerts as specified by the request
  * 
  * <pre>
  * 
@@ -49,6 +49,7 @@ import com.raytheon.uf.edex.core.EdexException;
  * 07Jul2010    2187       cjeanbap    Submit AfosId to AlarmAlertUtil.
  * 02Aug2010    2187       cjeanbap    Move AlarmAlertUtil.sendProductAlarmAlert() 
  *                                     outside of if-statement.
+ * May 12, 2014 2536       bclement    removed unused import
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/TextProductInfoCreateHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/TextProductInfoCreateHandler.java
similarity index 96%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/TextProductInfoCreateHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/TextProductInfoCreateHandler.java
index 9c3094c60c..1032096aff 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/handler/TextProductInfoCreateHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/TextProductInfoCreateHandler.java
@@ -1,4 +1,4 @@
-package com.raytheon.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import com.raytheon.edex.textdb.dao.TextProductInfoDao;
 import com.raytheon.uf.common.dataplugin.text.db.TextProductInfo;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/TextSeparatorFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
similarity index 96%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/TextSeparatorFactory.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
index d7751be185..213c01ddd4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/TextSeparatorFactory.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.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.text.impl;
+package com.raytheon.uf.edex.plugin.text.impl;
 
 import java.util.regex.Pattern;
 
@@ -25,14 +25,14 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-import com.raytheon.edex.plugin.text.impl.separator.StdCollectiveSeparator;
-import com.raytheon.edex.plugin.text.impl.separator.StdTextSeparator;
-import com.raytheon.edex.plugin.text.impl.separator.TextDecoderMode;
-import com.raytheon.edex.plugin.text.impl.separator.UACollectiveSeparator;
-import com.raytheon.edex.plugin.text.impl.separator.WMOMessageSeparator;
 import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.edex.textdb.dbapi.impl.TextDBStaticData;
 import com.raytheon.uf.edex.core.props.PropertiesFactory;
+import com.raytheon.uf.edex.plugin.text.impl.separator.StdCollectiveSeparator;
+import com.raytheon.uf.edex.plugin.text.impl.separator.StdTextSeparator;
+import com.raytheon.uf.edex.plugin.text.impl.separator.TextDecoderMode;
+import com.raytheon.uf.edex.plugin.text.impl.separator.UACollectiveSeparator;
+import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
 import com.raytheon.uf.edex.wmo.message.WMOHeader;
 
 /**
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/WMOMessageType.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/WMOMessageType.java
similarity index 96%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/WMOMessageType.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/WMOMessageType.java
index 8e731fd998..09d1796506 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/WMOMessageType.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/WMOMessageType.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.text.impl;
+package com.raytheon.uf.edex.plugin.text.impl;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
similarity index 98%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
index b01739305a..8d2745cc1a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdCollectiveSeparator.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.text.impl.separator;
+package com.raytheon.uf.edex.plugin.text.impl.separator;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -26,10 +26,10 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-import com.raytheon.edex.plugin.text.impl.TextSeparatorFactory;
 import com.raytheon.edex.textdb.dbapi.impl.TextDBStaticData;
 import com.raytheon.edex.textdb.dbapi.impl.WMOReportData;
 import com.raytheon.uf.common.site.SiteMap;
+import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
 import com.raytheon.uf.edex.wmo.message.AFOSProductId;
 import com.raytheon.uf.edex.wmo.message.WMOHeader;
 
@@ -87,7 +87,7 @@ public class StdCollectiveSeparator extends WMOMessageSeparator {
     /*
      * (non-Javadoc)
      * 
-     * @see com.raytheon.edex.plugin.text.impl.separator.WMOMessageSeparator#
+     * @see com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator#
      * createProductId()
      */
     @Override
@@ -117,7 +117,7 @@ public class StdCollectiveSeparator extends WMOMessageSeparator {
     /*
      * (non-Javadoc)
      * 
-     * @see com.raytheon.edex.plugin.text.impl.separator.WMOMessageSeparator#
+     * @see com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator#
      * identifyReports(byte[], com.raytheon.edex.esb.Headers)
      */
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdTextSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdTextSeparator.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdTextSeparator.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdTextSeparator.java
index 533fa72a7a..e3fc3cdc62 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdTextSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdTextSeparator.java
@@ -17,16 +17,16 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.plugin.text.impl.separator;
+package com.raytheon.uf.edex.plugin.text.impl.separator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-import com.raytheon.edex.plugin.text.impl.TextSeparatorFactory;
 import com.raytheon.edex.textdb.dbapi.impl.TextDBStaticData;
 import com.raytheon.edex.textdb.dbapi.impl.WMOReportData;
 import com.raytheon.uf.common.site.SiteMap;
+import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
 import com.raytheon.uf.edex.wmo.message.AFOSProductId;
 import com.raytheon.uf.edex.wmo.message.WMOHeader;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/TextDecoderMode.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/TextDecoderMode.java
similarity index 95%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/TextDecoderMode.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/TextDecoderMode.java
index 3fff680cd8..5b920b3afb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/TextDecoderMode.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/TextDecoderMode.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.text.impl.separator;
+package com.raytheon.uf.edex.plugin.text.impl.separator;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/UACollectiveSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/UACollectiveSeparator.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java
index c2bfe2b396..9dbd020e85 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/UACollectiveSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.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.text.impl.separator;
+package com.raytheon.uf.edex.plugin.text.impl.separator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,9 +28,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-import com.raytheon.edex.plugin.text.impl.TextSeparatorFactory;
 import com.raytheon.edex.textdb.dbapi.impl.TextDBStaticData;
 import com.raytheon.edex.textdb.dbapi.impl.WMOReportData;
+import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
 import com.raytheon.uf.edex.wmo.message.AFOSProductId;
 import com.raytheon.uf.edex.wmo.message.WMOHeader;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/WMOMessageSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/WMOMessageSeparator.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/WMOMessageSeparator.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/WMOMessageSeparator.java
index 9bb5bdd97a..a70e91940d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/WMOMessageSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/WMOMessageSeparator.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.text.impl.separator;
+package com.raytheon.uf.edex.plugin.text.impl.separator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java
index 7498db05ea..8a3d82b5c0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosBrowserModelSubscriber.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.text.ingest;
+package com.raytheon.uf.edex.plugin.text.ingest;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/ingest/AfosToAwipsListener.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosToAwipsListener.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/ingest/AfosToAwipsListener.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosToAwipsListener.java
index 5c8f898cf3..cbeebab918 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/ingest/AfosToAwipsListener.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosToAwipsListener.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.text.ingest;
+package com.raytheon.uf.edex.plugin.text.ingest;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -30,7 +30,6 @@ import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.raytheon.edex.plugin.text.dao.AfosToAwipsDao;
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwips;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwipsId;
@@ -38,6 +37,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
  * Updates the afos_to_awips table in the database based on the supplied
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java
index f9448db854..1a164b52b0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.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.text.maintenance.archiver;
+package com.raytheon.uf.edex.plugin.text.maintenance.archiver;
 
 import java.util.Date;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/subscription/AutoFaxManager.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/subscription/AutoFaxManager.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
index c5a9bfcbb5..fde0b0ed9a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/subscription/AutoFaxManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.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.text.subscription;
+package com.raytheon.uf.edex.plugin.text.subscription;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,7 +26,6 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.plugin.text.TextRecord;
 import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.edex.textdb.fax.AutoFaxDao;
 import com.raytheon.edex.textdb.fax.FaxSender;
@@ -36,6 +35,7 @@ import com.raytheon.uf.common.dataplugin.text.AutoFaxContainer;
 import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.TextRecord;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/utility/edex_static/base/distribution/text.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/edex_static/base/distribution/text.xml
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.text/utility/edex_static/base/distribution/text.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/edex_static/base/distribution/text.xml
diff --git a/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
index 6758a13f01..af819da6f6 100644
--- a/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
@@ -44,7 +44,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.raytheon.edex.plugin.text"
+         id="com.raytheon.uf.edex.plugin.text"
          download-size="0"
          install-size="0"
          version="0.0.0"