From da7d5888b0fd702f7f95ecba057afd6ae14ba4dd Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Mon, 19 May 2014 15:12:53 -0500
Subject: [PATCH] Omaha #2536 merged edex.textdb into text plugins

Former-commit-id: 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c
---
 .../com.raytheon.viz.text.feature/feature.xml |   7 --
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../viz/texteditor/AfosBrowserModel.java      |   4 +-
 .../viz/texteditor/command/AFOSCommand.java   |   2 +-
 .../texteditor/command/CommandFactory.java    |   2 +-
 .../texteditor/dialogs/AfosBrowserDlg.java    |   4 +-
 .../texteditor/dialogs/TextEditorDialog.java  |   2 +-
 .../viz/texteditor/util}/AFOS_CLASS.java      |   6 +-
 .../viz/texteditor/util}/AFOS_ORIGIN.java     |   6 +-
 .../build.edex/esb/conf/logback-ingest.xml    |   5 --
 .../META-INF/MANIFEST.MF                      |   1 -
 edexOsgi/com.raytheon.edex.textdb/.classpath  |   7 --
 .../.settings/org.eclipse.jdt.core.prefs      |  11 ---
 .../META-INF/MANIFEST.MF                      |  25 ------
 .../com.raytheon.edex.textdb/build.properties |   5 --
 .../com.raytheon.edex.textdb.ecl              |   0
 .../res/spring/textdb-ingest.xml              |  52 ------------
 .../res/spring/textdb-request.xml             |  78 ------------------
 .../raytheon/edex/textdb/TextConstants.java   |  42 ----------
 .../handler/RemoteRetrievalHandler.java       |  33 --------
 .../.classpath                                |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  12 ++-
 .../META-INF/MANIFEST.MF                      |   8 +-
 .../dataplugin/text/util}/AFOSParser.java     |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../ohd/reportalarm/RunReportAlarmSrv.java    |   2 +-
 .../.classpath                                |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  12 ++-
 .../META-INF/MANIFEST.MF                      |   8 +-
 .../res/spring/text-common.xml                |   2 +-
 .../res/spring/text-ingest.xml                |  44 ++++++++++
 .../res/spring/text-request.xml               |  69 ++++++++++++++++
 .../uf/edex/plugin/text/TextDecoder.java      |   4 +-
 .../uf/edex/plugin/text/TextVersionPurge.java |   2 +-
 .../edex/plugin/text}/dao/StateMatchDao.java  |   5 +-
 .../plugin/text}/dao/StdTextProductDao.java   |   3 +-
 .../uf/edex/plugin/text/dao/TextDao.java      |   3 +-
 .../plugin/text}/dao/TextProductInfoDao.java  |   3 +-
 .../edex/plugin/text}/dao/WatchWarnDao.java   |   3 +-
 .../uf/edex/plugin/text/db}/RequestType.java  |   5 +-
 .../uf/edex/plugin/text/db}/TextDB.java       |  13 +--
 .../text/dbsrv/impl}/AlarmAlertUtil.java      |   3 +-
 .../text/dbsrv/impl/StateTableAdapter.java    |   2 +-
 .../text/dbsrv/impl/TextViewAdapter.java      |   3 +-
 .../text/dbsrv/impl/VersionsAdapter.java      |   2 +-
 .../text/dbsrv/impl/WarnTableAdapter.java     |   2 +-
 .../uf/edex/plugin/text}/fax/AutoFaxDao.java  |   5 +-
 .../uf/edex/plugin/text}/fax/FaxSender.java   |   5 +-
 .../text/handler/AutoFaxRequestHandler.java   |   2 +-
 .../text}/handler/ExecuteAfosCmdHandler.java  |   7 +-
 .../text}/handler/ExecuteAwipsCmdHandler.java |   7 +-
 .../text}/handler/ExecuteWmoCmdHandler.java   |   7 +-
 .../GetAutoFaxRecordsRequestHandler.java      |   2 +-
 .../handler/InsertStdTextProductHandler.java  |   4 +-
 .../text/handler/RemoteRetrievalHandler.java  |  69 ++++++++++++++++
 .../text}/handler/RemoteRetrievalManager.java |  37 ++++++++-
 .../text/handler/SendFaxRequestHandler.java   |   6 +-
 .../handler/StdTextProductRequestHandler.java |   4 +-
 .../handler/TextProductInfoCreateHandler.java |   2 +-
 .../text}/handler/WriteProductHandler.java    |   9 +-
 .../plugin/text}/impl/TextDBStaticData.java   |   3 +-
 .../text/impl/TextSeparatorFactory.java       |   3 +-
 .../edex/plugin/text}/impl/WMOReportData.java |   6 +-
 .../separator/StdCollectiveSeparator.java     |   4 +-
 .../text/impl/separator/StdTextSeparator.java |   4 +-
 .../impl/separator/UACollectiveSeparator.java |   4 +-
 .../impl/separator/WMOMessageSeparator.java   |   2 +-
 .../SiteMapNationalDatasetSubscriber.java     |   3 +-
 .../ingest/TextDBStaticDataSubscriber.java    |   5 +-
 .../text/subscription/AutoFaxManager.java     |   6 +-
 .../common_static/base/images/bell.gif        | Bin
 .../base/textdb/afosMasterPIL.txt             |   0
 .../common_static/base/textdb/bit_table.dat   |   0
 .../base/textdb/checkProductFile.dat          |   0
 .../base/textdb/collective_table.dat          |   0
 .../base/textdb/exclusionProductList.dat      |   0
 .../common_static/base/textdb/ispan_table.dat |   0
 .../base/textdb/station_table.dat             |   0
 .../common_static/base/textdb/textCCChelp.txt |   0
 .../base/textdb/textCategoryClass.txt         |   0
 .../common_static/base/textdb/textNNNhelp.txt |   0
 .../base/textdb/textOriginTable.txt           |   0
 .../common_static/base/textdb/upair_table.dat |   0
 .../feature.xml                               |   7 --
 .../com.raytheon.uf.docs.datauri/.classpath   |   2 -
 85 files changed, 355 insertions(+), 376 deletions(-)
 rename {edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl => cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util}/AFOS_CLASS.java (92%)
 rename {edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl => cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util}/AFOS_ORIGIN.java (90%)
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/.classpath
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/build.properties
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/com.raytheon.edex.textdb.ecl
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-ingest.xml
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/TextConstants.java
 delete mode 100644 edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/RemoteRetrievalHandler.java
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl => com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/util}/AFOSParser.java (99%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/dao/StateMatchDao.java (96%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/dao/StdTextProductDao.java (99%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/dao/TextProductInfoDao.java (97%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/dao/WatchWarnDao.java (96%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db}/RequestType.java (89%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db}/TextDB.java (98%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/alarms => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl}/AlarmAlertUtil.java (97%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/fax/AutoFaxDao.java (97%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/fax/FaxSender.java (97%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/handler/ExecuteAfosCmdHandler.java (88%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/handler/ExecuteAwipsCmdHandler.java (89%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/handler/ExecuteWmoCmdHandler.java (88%)
 create mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalHandler.java
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/handler/RemoteRetrievalManager.java (72%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/handler/WriteProductHandler.java (92%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/impl/TextDBStaticData.java (99%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/impl/WMOReportData.java (92%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/ingest/SiteMapNationalDatasetSubscriber.java (97%)
 rename edexOsgi/{com.raytheon.edex.textdb/src/com/raytheon/edex/textdb => com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text}/ingest/TextDBStaticDataSubscriber.java (94%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/images/bell.gif (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/afosMasterPIL.txt (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/bit_table.dat (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/checkProductFile.dat (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/collective_table.dat (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/exclusionProductList.dat (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/ispan_table.dat (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/station_table.dat (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/textCCChelp.txt (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/textCategoryClass.txt (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/textNNNhelp.txt (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/textOriginTable.txt (100%)
 rename edexOsgi/{com.raytheon.edex.textdb => com.raytheon.uf.edex.plugin.text}/utility/common_static/base/textdb/upair_table.dat (100%)

diff --git a/cave/com.raytheon.viz.text.feature/feature.xml b/cave/com.raytheon.viz.text.feature/feature.xml
index c964f9fb5f..48f1d7288c 100644
--- a/cave/com.raytheon.viz.text.feature/feature.xml
+++ b/cave/com.raytheon.viz.text.feature/feature.xml
@@ -45,13 +45,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.edex.textdb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.viz.texteditor"
          download-size="0"
diff --git a/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF
index 61d0e5e277..1ee295e076 100644
--- a/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF
@@ -6,9 +6,7 @@ Bundle-Version: 1.14.0.qualifier
 Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
 Bundle-Activator: com.raytheon.viz.texteditor.Activator
 Bundle-Vendor: Raytheon
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.edex.textdb,
- com.raytheon.uf.common.activetable,
+Require-Bundle: com.raytheon.uf.common.activetable,
  com.raytheon.uf.common.auth;bundle-version="1.12.1174",
  com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.text;bundle-version="1.11.30",
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/AfosBrowserModel.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/AfosBrowserModel.java
index 0c9b3c9f1c..38f65989c9 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/AfosBrowserModel.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/AfosBrowserModel.java
@@ -35,8 +35,6 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import com.raytheon.edex.textdb.dbapi.impl.AFOS_CLASS;
-import com.raytheon.edex.textdb.dbapi.impl.AFOS_ORIGIN;
 import com.raytheon.uf.common.dataplugin.radar.util.RadarTextProductUtil;
 import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
 import com.raytheon.uf.common.localization.IPathManager;
@@ -49,6 +47,8 @@ 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.viz.core.localization.LocalizationManager;
+import com.raytheon.viz.texteditor.util.AFOS_CLASS;
+import com.raytheon.viz.texteditor.util.AFOS_ORIGIN;
 
 /**
  * Singleton class that contains information related to querying for or updating
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/AFOSCommand.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/AFOSCommand.java
index a329df8917..783f123826 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/AFOSCommand.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/AFOSCommand.java
@@ -22,11 +22,11 @@ package com.raytheon.viz.texteditor.command;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.raytheon.edex.textdb.dbapi.impl.AFOSParser;
 import com.raytheon.uf.common.dataplugin.text.StdTextProductContainer;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.IQueryTransport;
 import com.raytheon.uf.common.dataplugin.text.request.ExecuteAfosCmdRequest;
+import com.raytheon.uf.common.dataplugin.text.util.AFOSParser;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/CommandFactory.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/CommandFactory.java
index bfbacc1f34..e6c5d2e775 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/CommandFactory.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/command/CommandFactory.java
@@ -19,7 +19,7 @@
  **/
 package com.raytheon.viz.texteditor.command;
 
-import com.raytheon.edex.textdb.dbapi.impl.AFOSParser;
+import com.raytheon.uf.common.dataplugin.text.util.AFOSParser;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.viz.texteditor.util.TextEditorUtil;
 
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosBrowserDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosBrowserDlg.java
index 3354e8f971..940794dd32 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosBrowserDlg.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosBrowserDlg.java
@@ -59,8 +59,6 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.ScrollBar;
 import org.eclipse.swt.widgets.Shell;
 
-import com.raytheon.edex.textdb.dbapi.impl.AFOS_CLASS;
-import com.raytheon.edex.textdb.dbapi.impl.AFOS_ORIGIN;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.IQueryTransport;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.TextDBQuery;
 import com.raytheon.uf.common.message.Message;
@@ -77,6 +75,8 @@ import com.raytheon.viz.texteditor.TextDisplayModel;
 import com.raytheon.viz.texteditor.command.CommandFactory;
 import com.raytheon.viz.texteditor.msgs.IAfosBrowserCallback;
 import com.raytheon.viz.texteditor.msgs.ITextWorkstationCallback;
+import com.raytheon.viz.texteditor.util.AFOS_CLASS;
+import com.raytheon.viz.texteditor.util.AFOS_ORIGIN;
 import com.raytheon.viz.texteditor.util.TextEditorUtil;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
index a53f7ad8aa..1a6dd87729 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
@@ -111,7 +111,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.menus.IMenuService;
 
-import com.raytheon.edex.textdb.dbapi.impl.AFOSParser;
 import com.raytheon.uf.common.activetable.SendPracticeProductRequest;
 import com.raytheon.uf.common.dataplugin.text.RemoteRetrievalResponse;
 import com.raytheon.uf.common.dataplugin.text.alarms.AlarmAlertProduct;
@@ -121,6 +120,7 @@ import com.raytheon.uf.common.dataplugin.text.dbsrv.IQueryTransport;
 import com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest;
 import com.raytheon.uf.common.dataplugin.text.request.StdTextProductServerRequest;
 import com.raytheon.uf.common.dataplugin.text.request.TextProductInfoCreateRequest;
+import com.raytheon.uf.common.dataplugin.text.util.AFOSParser;
 import com.raytheon.uf.common.dissemination.OUPRequest;
 import com.raytheon.uf.common.dissemination.OUPResponse;
 import com.raytheon.uf.common.dissemination.OUPTestRequest;
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOS_CLASS.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util/AFOS_CLASS.java
similarity index 92%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOS_CLASS.java
rename to cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util/AFOS_CLASS.java
index e370b1d4c5..8c9d416ef3 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOS_CLASS.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util/AFOS_CLASS.java
@@ -17,18 +17,20 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.dbapi.impl;
+package com.raytheon.viz.texteditor.util;
 
 import java.util.HashMap;
 
 /**
- * TODO Add Description
+ * Automation of Field Operations and Services classification enum
  * 
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 13, 2008            jkorman     Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to viz.texteditor
+ * 
  * </pre>
  * 
  * @author jkorman
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOS_ORIGIN.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util/AFOS_ORIGIN.java
similarity index 90%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOS_ORIGIN.java
rename to cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util/AFOS_ORIGIN.java
index b2a8bca507..3df7674888 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOS_ORIGIN.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/util/AFOS_ORIGIN.java
@@ -17,18 +17,20 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.dbapi.impl;
+package com.raytheon.viz.texteditor.util;
 
 import java.util.HashMap;
 
 /**
- * TODO Add Description
+ * Automation of Field Operations and Services origin enum
  * 
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 13, 2008            jkorman     Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to viz.texteditor
+ * 
  * </pre>
  * 
  * @author jkorman
diff --git a/edexOsgi/build.edex/esb/conf/logback-ingest.xml b/edexOsgi/build.edex/esb/conf/logback-ingest.xml
index 3c6677418a..9534aaaf92 100644
--- a/edexOsgi/build.edex/esb/conf/logback-ingest.xml
+++ b/edexOsgi/build.edex/esb/conf/logback-ingest.xml
@@ -222,11 +222,6 @@
    		<level value="INFO"/>
    		<appender-ref ref="purge"/>
    </logger>
-
-   <logger name="com.raytheon.edex.textdb.dao.StdTextProductDao.PurgeLogger" additivity="false">
-   		<level value="INFO"/>
-   		<appender-ref ref="purge"/>
-   </logger>
    
    <logger name="RouteFailedLog" additivity="false">
       <level value="WARN"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
index ce36a9e372..3d7cfd474b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
@@ -23,7 +23,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.raytheon.edex.plugin.obs,
  com.raytheon.edex.plugin.obs.metar,
  com.raytheon.edex.plugin.obs.metar.util,
- com.raytheon.edex.textdb.dbapi.impl,
  com.raytheon.uf.common.dataplugin.obs.metar,
  com.raytheon.uf.common.dataplugin.obs.metar.util,
  com.raytheon.uf.common.dataplugin.sfcobs,
diff --git a/edexOsgi/com.raytheon.edex.textdb/.classpath b/edexOsgi/com.raytheon.edex.textdb/.classpath
deleted file mode 100644
index 098194ca4b..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/edexOsgi/com.raytheon.edex.textdb/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.edex.textdb/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7341ab1683..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF
deleted file mode 100644
index 02b68a42a7..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Textdb Plug-in
-Bundle-SymbolicName: com.raytheon.edex.textdb
-Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
-Bundle-Vendor: RAYTHEON
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.localization,
- org.apache.commons.lang,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- javax.persistence,
- com.raytheon.uf.common.dataplugin.text,
- com.raytheon.uf.common.status;bundle-version="1.12.1122",
- com.raytheon.uf.common.site;bundle-version="1.0.0",
- com.raytheon.uf.edex.ndm;bundle-version="1.0.0"
-Export-Package: com.raytheon.edex.textdb.alarms,
- com.raytheon.edex.textdb.dao,
- com.raytheon.edex.textdb.dbapi.impl,
- com.raytheon.edex.textdb.fax
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: com.raytheon.uf.common.message,
- com.raytheon.uf.common.serialization.comm,
- com.raytheon.uf.common.wmo,
- org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.edex.textdb/build.properties b/edexOsgi/com.raytheon.edex.textdb/build.properties
deleted file mode 100644
index 5791d48d5f..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               res/
diff --git a/edexOsgi/com.raytheon.edex.textdb/com.raytheon.edex.textdb.ecl b/edexOsgi/com.raytheon.edex.textdb/com.raytheon.edex.textdb.ecl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-ingest.xml b/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-ingest.xml
deleted file mode 100644
index ca6c7af184..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-ingest.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    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
-    http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-    <bean id="textDBStaticDataListener" class="com.raytheon.edex.textdb.ingest.TextDBStaticDataSubscriber">
-        <constructor-arg value="jms-generic:topic:textDBFilesChanged"/>
-    </bean>
-    <bean id="siteMapListener" class="com.raytheon.edex.textdb.ingest.SiteMapNationalDatasetSubscriber" />
-
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="bit_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="collective_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="exclusionProductList.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="ispan_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="station_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="upair_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="afos_lookup_table.dat" />
-        <constructor-arg ref="siteMapListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="national_category_table.template" />
-        <constructor-arg ref="siteMapListener" />
-    </bean>
-
-	<camelContext id="textDbContext"
-		xmlns="http://camel.apache.org/schema/spring"
-		errorHandlerRef="errorHandler">
-        <route id="textDBStaticSetDirty">
-            <from uri="jms-generic:topic:textDBFilesChanged"/>
-            <bean ref="textDBStaticDataListener" method="setDirty"/>
-		</route>
-    </camelContext>
-
-</beans>
diff --git a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml b/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
deleted file mode 100644
index 12bb2fc4aa..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	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
-  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-		
-	<bean id="executeAfosCmdHandler" class="com.raytheon.edex.textdb.handler.ExecuteAfosCmdHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAfosCmdRequest"/>
-  		<constructor-arg ref="executeAfosCmdHandler"/>
-  	</bean>
-
-        <bean id="executeAwipsCmdHandler" class="com.raytheon.edex.textdb.handler.ExecuteAwipsCmdHandler" />
-        <bean factory-bean="handlerRegistry" factory-method="register">
-                <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAwipsCmdRequest"/>
-                <constructor-arg ref="executeAwipsCmdHandler"/>
-        </bean>
-
-        <bean id="executeWmoCmdHandler" class="com.raytheon.edex.textdb.handler.ExecuteWmoCmdHandler" />
-        <bean factory-bean="handlerRegistry" factory-method="register">
-                <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteWmoCmdRequest"/>
-                <constructor-arg ref="executeWmoCmdHandler"/>
-        </bean>
-
-	<bean id="writeProductHandler" class="com.raytheon.edex.textdb.handler.WriteProductHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.WriteProductRequest"/>
-  		<constructor-arg ref="writeProductHandler"/>
-  	</bean>
-
-	<bean id="remoteRetrievalHandler" class="com.raytheon.edex.textdb.handler.RemoteRetrievalHandler">
-		<property name="rrManager" ref="remoteRetrievalManager" />
-	</bean>
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest"/>
-  		<constructor-arg ref="remoteRetrievalHandler"/>
-  	</bean>
-
-  	<bean id="remoteRetrievalManager" class="com.raytheon.edex.textdb.handler.RemoteRetrievalManager">
-  		<!--  <property name="remoteRetrievalExternalURI" value="direct-vm:remoteRetrievalExternalRoute" />  -->
-  		<property name="rrDelegate" ref="textdbRemoteRetrievalTarget" />
-  	</bean>
-
-	<!-- JmsPooled* do not work... -->	
-    <bean id="jms-mhs" class="org.apache.camel.component.jms.JmsComponent">
-       <constructor-arg ref="jmsMhsConfig" />
-       <property name="taskExecutor" ref="mhsThreadPool" />
-	</bean>
-
-    <bean id="mhsThreadPool"
-        class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
-        <property name="corePoolSize" value="1" />
-        <property name="maxPoolSize" value="1" />
-    </bean>
-    
-	<bean id="jmsMhsConfig" class="org.apache.camel.component.jms.JmsConfiguration">
-		<property name="recoveryInterval" value="1000"/>
-		<property name="connectionFactory" ref="amqConnectionFactory" />
-		<property name="destinationResolver" ref="qpidNoDurableResolver"/>
-	</bean>
-
-	<camelContext id="textdb-remote-retrieval" xmlns="http://camel.apache.org/schema/spring"
-		errorHandlerRef="errorHandler">
-
-		<proxy id="textdbRemoteRetrievalTarget"
-			serviceInterface="com.raytheon.edex.textdb.handler.RemoteRetrievalManager$IRRDelegate"
-			serviceUrl="direct-vm:remoteRetrievalExternalRoute" />
-
-		<route id="remoteRetrievalExternal">
-			<from uri="direct-vm:remoteRetrievalExternalRoute" />
-			<!-- Convert from BeanInvocation if needed. -->
-			<convertBodyTo type="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest" />
-			<bean ref="serializationUtil" method="transformToThrift" />
-			<to uri="jms-mhs:queue:fxa.mhs.request?requestTimeout=122000" pattern="InOut" />
-			<bean ref="serializationUtil" method="transformFromThrift" />
-		</route>
-	</camelContext>
-  	 
-</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/TextConstants.java b/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/TextConstants.java
deleted file mode 100644
index 4b9ff3767c..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/TextConstants.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.edex.textdb;
-
-/**
- * TODO Add Description
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jul 6, 2010  4687       cjeanbap    Initial creation
- * 
- * </pre>
- * 
- * @author mschenke
- * @version 1.0
- */
-
-public class TextConstants {
-    public static final String PLUGIN_NAME = "com.raytheon.edex.textdb";
-
-    public static final String CATEGORY = "TextDBPlugin";
-}
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/RemoteRetrievalHandler.java b/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/RemoteRetrievalHandler.java
deleted file mode 100644
index f1ea931d7e..0000000000
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/RemoteRetrievalHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.raytheon.edex.textdb.handler;
-
-import com.raytheon.edex.textdb.handler.RemoteRetrievalManager.RRJob;
-import com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest;
-import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-
-public class RemoteRetrievalHandler implements
-    IRequestHandler<RemoteRetrievalRequest> {
-
-    private RemoteRetrievalManager rrManager;
-    
-    @Override
-    public Object handleRequest(RemoteRetrievalRequest request)
-            throws Exception {
-        RRJob job = rrManager.submitRequest(request);
-        return job.waitResponse();
-    }
-
-    /**
-     * @return the rrManager
-     */
-    public RemoteRetrievalManager getRrManager() {
-        return rrManager;
-    }
-
-    /**
-     * @param rrManager the rrManager to set
-     */
-    public void setRrManager(RemoteRetrievalManager rrManager) {
-        this.rrManager = rrManager;
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/.classpath b/edexOsgi/com.raytheon.uf.common.dataplugin.text/.classpath
index 1fa3e6803d..098194ca4b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/.classpath
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.common.dataplugin.text/.settings/org.eclipse.jdt.core.prefs
index 6f3729f6c2..7341ab1683 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/.settings/org.eclipse.jdt.core.prefs
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,11 @@
-#Tue Feb 02 15:27:55 CST 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF
index ce8092292d..bf827e7da0 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Textdb Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.text
 Bundle-Version: 1.14.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Require-Bundle: com.raytheon.uf.common.serialization,
  org.hibernate,
@@ -14,6 +14,9 @@ Import-Package: com.raytheon.uf.common.dataplugin.persist,
  com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.serialization.annotations,
  com.raytheon.uf.common.serialization.comm,
+ com.raytheon.uf.common.site,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.common.util,
  com.raytheon.uf.common.wmo,
  javax.persistence,
  org.apache.commons.lang.builder
@@ -21,5 +24,6 @@ Export-Package: com.raytheon.uf.common.dataplugin.text;uses:="com.raytheon.uf.co
  com.raytheon.uf.common.dataplugin.text.alarms,
  com.raytheon.uf.common.dataplugin.text.db;uses:="com.raytheon.uf.common.dataplugin.persist,com.raytheon.uf.common.wmo,com.raytheon.uf.common.serialization",
  com.raytheon.uf.common.dataplugin.text.dbsrv,
- com.raytheon.uf.common.dataplugin.text.request;uses:="com.raytheon.uf.common.serialization.comm"
+ com.raytheon.uf.common.dataplugin.text.request;uses:="com.raytheon.uf.common.serialization.comm",
+ com.raytheon.uf.common.dataplugin.text.util
 
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOSParser.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/util/AFOSParser.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOSParser.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/util/AFOSParser.java
index 7317ea4cca..38f90bb894 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/AFOSParser.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/util/AFOSParser.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.dbapi.impl;
+package com.raytheon.uf.common.dataplugin.text.util;
 
 import com.raytheon.uf.common.site.SiteMap;
 
@@ -93,6 +93,8 @@ import com.raytheon.uf.common.site.SiteMap;
  * Jul 29, 2011  10237     R. Ferrel   parseCommand now properly validates
  *                                     commands with large index.
  * Jan 29, 2014 DR14595 mgamazaychikov Added handling of M: command
+ * May 20, 2014 2536       bclement    moved from edex.textdb to common.dataplugin.text
+ * 
  * </pre>
  * 
  * @author jkorman
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
index d1e5a71a0a..040cd72056 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Import-Package: com.raytheon.edex.util,
  com.raytheon.uf.edex.database,
  com.raytheon.uf.edex.database.dao,
  com.raytheon.uf.edex.database.plugin,
+ com.raytheon.uf.edex.plugin.text.db,
  org.quartz
 Export-Package: com.raytheon.uf.edex.ohd,
  com.raytheon.uf.edex.ohd.reportalarm,
@@ -32,5 +33,4 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.common.units;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.shef,
  com.raytheon.uf.common.dataplugin.text,
- com.raytheon.edex.textdb,
  com.raytheon.uf.edex.decodertools
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
index 0eb6ad519f..61dde4658d 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
@@ -24,12 +24,12 @@ import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.ohd.AppsDefaults;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.uf.common.util.FileUtil;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
  * Provides SHEF with the ability to generate alert/alarms report products and
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.text/.classpath
index 1fa3e6803d..098194ca4b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/.classpath
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs
index 91e0c78000..7341ab1683 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,11 @@
-#Thu Mar 26 10:26:04 CDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
index 3cf67c8c6a..667915fff0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ 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,
- org.apache.commons.lang,
+Require-Bundle: org.apache.commons.lang,
  com.raytheon.edex.common,
  javax.persistence,
  com.raytheon.uf.common.serialization.comm,
@@ -18,12 +17,15 @@ Require-Bundle: com.raytheon.edex.textdb,
  com.raytheon.uf.common.localization;bundle-version="1.14.0"
 Export-Package: com.raytheon.uf.edex.plugin.text,
  com.raytheon.uf.edex.plugin.text.dao,
+ com.raytheon.uf.edex.plugin.text.db,
  com.raytheon.uf.edex.plugin.text.dbsrv
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.raytheon.uf.common.dataplugin.text,
+ com.raytheon.uf.common.dataplugin.text.alarms,
  com.raytheon.uf.common.dataplugin.text.db,
  com.raytheon.uf.common.dataplugin.text.dbsrv,
  com.raytheon.uf.common.dataplugin.text.request,
+ com.raytheon.uf.common.dataplugin.text.util,
  com.raytheon.uf.common.message,
  com.raytheon.uf.common.wmo,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
index bcddc719bd..3b68a133d6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
@@ -38,7 +38,7 @@
 		<property name="sessionFactory" ref="fxaSessionFactory" />
 	</bean>
  	
-     <bean id="autoFaxDao" class="com.raytheon.edex.textdb.fax.AutoFaxDao">
+     <bean id="autoFaxDao" class="com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao">
        <property name="autoFaxNotifyURI" value="jms-generic:topic:autofax.notify"/>
     </bean>
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
index 9cf4c4f61a..44b3a91a75 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
@@ -73,6 +73,45 @@
         <constructor-arg ref="afosBrowserListener" />
     </bean>
     
+    <!-- textdb -->
+    <bean id="textDBStaticDataListener" class="com.raytheon.uf.edex.plugin.text.ingest.TextDBStaticDataSubscriber">
+        <constructor-arg value="jms-generic:topic:textDBFilesChanged"/>
+    </bean>
+    <bean id="siteMapListener" class="com.raytheon.uf.edex.plugin.text.ingest.SiteMapNationalDatasetSubscriber" />
+
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="bit_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="collective_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="exclusionProductList.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="ispan_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="station_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="upair_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="afos_lookup_table.dat" />
+        <constructor-arg ref="siteMapListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="national_category_table.template" />
+        <constructor-arg ref="siteMapListener" />
+    </bean>
+    
 	<camelContext id="text-camel"
 		xmlns="http://camel.apache.org/schema/spring"
 		errorHandlerRef="errorHandler">
@@ -209,6 +248,11 @@
 				</doCatch>
 			</doTry>
 		</route>
+                
+        <route id="textDBStaticSetDirty">
+            <from uri="jms-generic:topic:textDBFilesChanged"/>
+            <bean ref="textDBStaticDataListener" method="setDirty"/>
+        </route>
 	</camelContext>
 
 	<camelContext id="clustered-text-camel"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
index 74045aa4cf..bc5a45505c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
@@ -1,6 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	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
+     http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
      http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="getAfosIdHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetAfosIdHandler" />
@@ -66,8 +67,67 @@
         <property name="byteLimitInMB" value="${textdbsrv.byteLimitInMB}"/>
     </bean>
 
+    <bean id="executeAfosCmdHandler" class="com.raytheon.uf.edex.plugin.text.handler.ExecuteAfosCmdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAfosCmdRequest"/>
+        <constructor-arg ref="executeAfosCmdHandler"/>
+    </bean>
+
+    <bean id="executeAwipsCmdHandler" class="com.raytheon.uf.edex.plugin.text.handler.ExecuteAwipsCmdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAwipsCmdRequest"/>
+        <constructor-arg ref="executeAwipsCmdHandler"/>
+    </bean>
+
+    <bean id="executeWmoCmdHandler" class="com.raytheon.uf.edex.plugin.text.handler.ExecuteWmoCmdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteWmoCmdRequest"/>
+        <constructor-arg ref="executeWmoCmdHandler"/>
+    </bean>
+
+    <bean id="writeProductHandler" class="com.raytheon.uf.edex.plugin.text.handler.WriteProductHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.WriteProductRequest"/>
+        <constructor-arg ref="writeProductHandler"/>
+    </bean>
+
+    <bean id="remoteRetrievalHandler" class="com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalHandler">
+        <property name="rrManager" ref="remoteRetrievalManager" />
+    </bean>
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest"/>
+        <constructor-arg ref="remoteRetrievalHandler"/>
+    </bean>
+
+    <bean id="remoteRetrievalManager" class="com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalManager">
+        <!--  <property name="remoteRetrievalExternalURI" value="direct-vm:remoteRetrievalExternalRoute" />  -->
+        <property name="rrDelegate" ref="textdbRemoteRetrievalTarget" />
+    </bean>
+
+    <!-- JmsPooled* do not work... -->  
+    <bean id="jms-mhs" class="org.apache.camel.component.jms.JmsComponent">
+       <constructor-arg ref="jmsMhsConfig" />
+       <property name="taskExecutor" ref="mhsThreadPool" />
+    </bean>
+
+    <bean id="mhsThreadPool"
+        class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
+        <property name="corePoolSize" value="1" />
+        <property name="maxPoolSize" value="1" />
+    </bean>
+    
+    <bean id="jmsMhsConfig" class="org.apache.camel.component.jms.JmsConfiguration">
+        <property name="recoveryInterval" value="1000"/>
+        <property name="connectionFactory" ref="amqConnectionFactory" />
+        <property name="destinationResolver" ref="qpidNoDurableResolver"/>
+    </bean>
+
     <camelContext id="textdbsrv-request-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
 
+        <proxy id="textdbRemoteRetrievalTarget"
+            serviceInterface="com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalManager$IRRDelegate"
+            serviceUrl="direct-vm:remoteRetrievalExternalRoute" />
+
         <endpoint id="textdbsrvXml_from"
             uri="jetty:http://0.0.0.0:${HTTP_PORT}/services/textdbsrv?disableStreamCache=true" />
 
@@ -75,5 +135,14 @@
             <from uri="ref:textdbsrvXml_from" />
             <bean ref="textDbSrvWrapper" method="executeTextDBMessage" />
         </route>
+        
+        <route id="remoteRetrievalExternal">
+            <from uri="direct-vm:remoteRetrievalExternalRoute" />
+            <!-- Convert from BeanInvocation if needed. -->
+            <convertBodyTo type="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest" />
+            <bean ref="serializationUtil" method="transformToThrift" />
+            <to uri="jms-mhs:queue:fxa.mhs.request?requestTimeout=122000" pattern="InOut" />
+            <bean ref="serializationUtil" method="transformFromThrift" />
+        </route>
     </camelContext>
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
index 9c3f1f35fa..9fcf2980a7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
@@ -43,8 +43,6 @@ 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.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.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwips;
@@ -55,7 +53,9 @@ import com.raytheon.uf.common.wmo.WMOHeader;
 import com.raytheon.uf.edex.core.props.PropertiesFactory;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
+import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
 
 /**
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextVersionPurge.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextVersionPurge.java
index a95450f58f..a25dbdab99 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextVersionPurge.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextVersionPurge.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.raytheon.edex.textdb.dao.StdTextProductDao;
 import com.raytheon.uf.edex.database.purge.PurgeLogger;
+import com.raytheon.uf.edex.plugin.text.dao.StdTextProductDao;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/StateMatchDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StateMatchDao.java
similarity index 96%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/StateMatchDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StateMatchDao.java
index 6d931e09e9..b69e274ce9 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/StateMatchDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StateMatchDao.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.textdb.dao;
+package com.raytheon.uf.edex.plugin.text.dao;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,8 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * 09/04/07     400        garmendariz Initial Check in    
  * Oct 1, 2008  1538       jkorman     Added additional functionality.
  * 08/31/10     2103       cjeanbap    Updated criteria field of primary key.
- *
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * 
  * </pre>
  * 
  * @author garmendariz
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/StdTextProductDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StdTextProductDao.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/StdTextProductDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StdTextProductDao.java
index 991871f9ba..88307cfb69 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/StdTextProductDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StdTextProductDao.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.textdb.dao;
+package com.raytheon.uf.edex.plugin.text.dao;
 
 import java.math.BigInteger;
 import java.sql.Connection;
@@ -88,6 +88,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  * 23May2012    14952       rferrel     Added cccnnnxxxByRefTime.
  * 03Oct2012	15244		mgamazaychikov	Added the fix to query the appropriate table
  * 											(operational or practice)
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * </pre>
  * 
  * @author garmendariz
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextDao.java
index 1c5782d3e0..3f928a20d7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextDao.java
@@ -25,8 +25,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.raytheon.edex.db.dao.DefaultPluginDao;
-import com.raytheon.edex.textdb.dao.StdTextProductDao;
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataquery.db.QueryParam.QueryOperand;
 import com.raytheon.uf.common.time.util.TimeUtil;
@@ -34,6 +32,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.database.processor.IDatabaseProcessor;
 import com.raytheon.uf.edex.database.purge.PurgeLogger;
 import com.raytheon.uf.edex.database.query.DatabaseQuery;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
  * DAO for text products
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/TextProductInfoDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextProductInfoDao.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/TextProductInfoDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextProductInfoDao.java
index e595c025d6..67455f8f46 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/TextProductInfoDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/TextProductInfoDao.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.textdb.dao;
+package com.raytheon.uf.edex.plugin.text.dao;
 
 import java.util.List;
 
@@ -44,6 +44,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * 09/04/07     400         garmendariz Initial Check in
+ * May 20, 2014 2536        bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/WatchWarnDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/WatchWarnDao.java
similarity index 96%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/WatchWarnDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/WatchWarnDao.java
index 7f4bcff237..c8456ed499 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/WatchWarnDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/WatchWarnDao.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.textdb.dao;
+package com.raytheon.uf.edex.plugin.text.dao;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +43,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * 09/04/07     400         garmendariz Initial Check in    
  * Oct 1, 2008  1538        jkorman     Added additional functionality.
  * Aug 9, 2010  3944        cjeanbap    Added method, queryAllWatchWarn. 
+ * May 20, 2014 2536        bclement    moved from edex.textdb to edex.plugin.text
  * </pre>
  * 
  * @author garmendariz
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/RequestType.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/RequestType.java
similarity index 89%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/RequestType.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/RequestType.java
index 746d8d7287..fcd43876b4 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/RequestType.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/RequestType.java
@@ -17,15 +17,16 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.dbapi.impl;
+package com.raytheon.uf.edex.plugin.text.db;
 
 /**
- * 
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 10, 2009 2191       rjpeter     Initial implementation.
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * 
  * </pre>
  * 
  * @author rjpeter
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java
similarity index 98%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java
index f8020fbd74..3f0dbd1cad 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.dbapi.impl;
+package com.raytheon.uf.edex.plugin.text.db;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -28,21 +28,23 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-import com.raytheon.edex.textdb.dao.StateMatchDao;
-import com.raytheon.edex.textdb.dao.StdTextProductDao;
-import com.raytheon.edex.textdb.dao.TextProductInfoDao;
-import com.raytheon.edex.textdb.dao.WatchWarnDao;
 import com.raytheon.uf.common.dataplugin.text.db.OperationalStdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.PracticeStdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.StateMatch;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.TextProductInfo;
 import com.raytheon.uf.common.dataplugin.text.db.WatchWarn;
+import com.raytheon.uf.common.dataplugin.text.util.AFOSParser;
 import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.wmo.AFOSProductId;
 import com.raytheon.uf.common.wmo.WMOHeader;
 import com.raytheon.uf.common.wmo.WMOTimeParser;
 import com.raytheon.uf.edex.core.props.PropertiesFactory;
+import com.raytheon.uf.edex.plugin.text.dao.StateMatchDao;
+import com.raytheon.uf.edex.plugin.text.dao.StdTextProductDao;
+import com.raytheon.uf.edex.plugin.text.dao.TextProductInfoDao;
+import com.raytheon.uf.edex.plugin.text.dao.WatchWarnDao;
+import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 /**
  * Text Database.
@@ -71,6 +73,7 @@ import com.raytheon.uf.edex.core.props.PropertiesFactory;
  * Feb 18, 2014       2652  skorolev    Corrected writeProduct for WMO header if archive is allowed. Deleted unused code.
  * May 14, 2014 2536        bclement    moved WMO Header to common, removed TimeTools usage
  * May 15, 2014 2536        bclement    moved asciiToHex() hexToAscii() and getProperty() to PropConverter
+ * May 20, 2014 2536        bclement    moved from edex.textdb to edex.plugin.text
  * </pre>
  * 
  * @author jkorman
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/alarms/AlarmAlertUtil.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/AlarmAlertUtil.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/alarms/AlarmAlertUtil.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/AlarmAlertUtil.java
index 566857bd0a..e189e2b9a8 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/alarms/AlarmAlertUtil.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/AlarmAlertUtil.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.alarms;
+package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.core.EdexException;
  * 15Feb2010    4426       MW Fegan    Added over-ride of sendProductAlarmAlert(...)
  * 08Jul2010    2187       cjeanbap    Added Operational mode functionality.
  * 23May2012    14952      rferrel     Added reference time.
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
index 08d50f06ee..319df012e2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
@@ -22,7 +22,6 @@ package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
 
 import java.util.List;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.db.StateMatch;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.ICommandExecutor;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.PropConverter;
@@ -31,6 +30,7 @@ import com.raytheon.uf.common.dataplugin.text.dbsrv.TextDBSrvCommandTags;
 import com.raytheon.uf.common.message.Header;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
index d27ff893b7..5005e201d5 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
@@ -33,8 +33,6 @@ import javax.xml.bind.JAXBException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.textdb.alarms.AlarmAlertUtil;
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.ICommandExecutor;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.PropConverter;
@@ -51,6 +49,7 @@ import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
  * Handles database interactions with the Text DB's standard text products
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
index 3255ee8448..ab6bceee31 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
@@ -20,7 +20,6 @@
 package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
 
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.ICommandExecutor;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.PropConverter;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.TextDBSrvCommandTags;
@@ -29,6 +28,7 @@ import com.raytheon.uf.common.message.Header;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
 import com.raytheon.uf.common.wmo.AFOSProductId;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
  * Manipulates version headers on textdbsrv messages
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/WarnTableAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/WarnTableAdapter.java
index e6463d4943..966c7b3860 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/WarnTableAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/WarnTableAdapter.java
@@ -26,7 +26,6 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.db.WatchWarn;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.ICommandExecutor;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.PropConverter;
@@ -37,6 +36,7 @@ import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
  * Processes warning textdbsrv command messages
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/fax/AutoFaxDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/AutoFaxDao.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/fax/AutoFaxDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/AutoFaxDao.java
index 72d7820a44..c65afc2fdb 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/fax/AutoFaxDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/AutoFaxDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.fax;
+package com.raytheon.uf.edex.plugin.text.fax;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +38,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.core.EDEXUtil;
 
 /**
- * TODO Add Description
+ * Data access object for storing and retrieving AutoFaxRecords
  * 
  * <pre>
  * 
@@ -47,6 +47,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 2, 2010            bfarmer     Initial creation
+ * May 20, 2014 2536      bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/fax/FaxSender.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/fax/FaxSender.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
index 6669d67d34..9d8a0cf4b7 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/fax/FaxSender.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.fax;
+package com.raytheon.uf.edex.plugin.text.fax;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -27,7 +27,7 @@ import java.io.IOException;
 import com.raytheon.uf.common.util.RunProcess;
 
 /**
- * TODO Add Description
+ * Sends FAX to number using LDAD system
  * 
  * <pre>
  * 
@@ -38,6 +38,7 @@ import com.raytheon.uf.common.util.RunProcess;
  * Oct 28, 2010            bfarmer     Initial creation
  * Sep 19, 2011 10955      rferrel     Use RunProcess
  * Jan 10, 2012  4550	   mgamazaychikov	Fixed the sshCommand
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java
index 934f6ee2ad..7052e35eca 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java
@@ -22,11 +22,11 @@ package com.raytheon.uf.edex.plugin.text.handler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.textdb.fax.AutoFaxDao;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
 import com.raytheon.uf.common.dataplugin.text.request.AutoFaxRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteAfosCmdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAfosCmdHandler.java
similarity index 88%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteAfosCmdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAfosCmdHandler.java
index 4d08e27499..1025f11e73 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteAfosCmdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAfosCmdHandler.java
@@ -17,15 +17,15 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.StdTextProductContainer;
 import com.raytheon.uf.common.dataplugin.text.request.ExecuteAfosCmdRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
- * TODO Add Description
+ * Request handler for ExecuteAfosCmdRequests. Forwards request to textdb.
  * 
  * <pre>
  * 
@@ -35,6 +35,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * Feb 2, 2010             njensen     Initial creation
  * Apri 14, 2010 4734      mhuang      Returned StdTextProductContainer object
  * May 23, 2012  14952     rferrel     Added refTime.
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * </pre>
  * 
  * @author njensen
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteAwipsCmdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAwipsCmdHandler.java
similarity index 89%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteAwipsCmdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAwipsCmdHandler.java
index 659de35560..c445d21b16 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteAwipsCmdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAwipsCmdHandler.java
@@ -17,17 +17,17 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.List;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.request.ExecuteAwipsCmdRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
- * TODO Add Description
+ * Request handler for ExecuteAwipsCmdRequests. Forwards request to textdb.
  * 
  * <pre>
  * 
@@ -36,6 +36,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 4, 2011            rferrel     Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteWmoCmdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteWmoCmdHandler.java
similarity index 88%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteWmoCmdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteWmoCmdHandler.java
index 43575d5933..b3fa201672 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/ExecuteWmoCmdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteWmoCmdHandler.java
@@ -17,17 +17,17 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.List;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.request.ExecuteAwipsCmdRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
- * TODO Add Description
+ * Request handler for ExecuteAwipsCmdRequests. Forwards request to textdb.
  * 
  * <pre>
  * 
@@ -36,6 +36,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 5, 2011            rferrel      Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
index 0b302d2696..3c518a6c50 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
@@ -22,11 +22,11 @@ package com.raytheon.uf.edex.plugin.text.handler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.textdb.fax.AutoFaxDao;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.text.AutoFaxContainer;
 import com.raytheon.uf.common.dataplugin.text.request.GetAutoFaxRecordsRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
index adc1a1b6e6..3ce82b4ee9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
@@ -21,8 +21,6 @@ package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.Date;
 
-import com.raytheon.edex.textdb.alarms.AlarmAlertUtil;
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.request.InsertStdTextProductRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -30,6 +28,8 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
+import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 /**
  * Handles InsertStdTextProductRequests by placing them onto the LDAD queue and
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalHandler.java
new file mode 100644
index 0000000000..749b753c73
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalHandler.java
@@ -0,0 +1,69 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.edex.plugin.text.handler;
+
+import com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest;
+import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalManager.RRJob;
+
+/**
+ * Request handler for RemoteRetrievalRequests. Forwards request to
+ * RemoteRetrievalManager for delegation.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ???                                 Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * 
+ * </pre>
+ * 
+ * @version 1.0
+ */
+public class RemoteRetrievalHandler implements
+    IRequestHandler<RemoteRetrievalRequest> {
+
+    private RemoteRetrievalManager rrManager;
+    
+    @Override
+    public Object handleRequest(RemoteRetrievalRequest request)
+            throws Exception {
+        RRJob job = rrManager.submitRequest(request);
+        return job.waitResponse();
+    }
+
+    /**
+     * @return the rrManager
+     */
+    public RemoteRetrievalManager getRrManager() {
+        return rrManager;
+    }
+
+    /**
+     * @param rrManager the rrManager to set
+     */
+    public void setRrManager(RemoteRetrievalManager rrManager) {
+        this.rrManager = rrManager;
+    }
+
+}
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/RemoteRetrievalManager.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalManager.java
similarity index 72%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/RemoteRetrievalManager.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalManager.java
index 27638e4ba8..07a8ef25c0 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/RemoteRetrievalManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalManager.java
@@ -1,4 +1,23 @@
-package com.raytheon.edex.textdb.handler;
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.HashMap;
 
@@ -8,6 +27,22 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 
+/**
+ * Manages remote retrieval job delegation.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ???                                 Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * 
+ * </pre>
+ * 
+ * @version 1.0
+ */
 public class RemoteRetrievalManager {
     public interface IRRDelegate {
         RemoteRetrievalResponse retrieve(RemoteRetrievalRequest req) throws Exception;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java
index 286398a54b..82427f40d2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java
@@ -19,12 +19,13 @@
  **/
 package com.raytheon.uf.edex.plugin.text.handler;
 
-import com.raytheon.edex.textdb.fax.FaxSender;
 import com.raytheon.uf.common.dataplugin.text.request.SendFaxRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.fax.FaxSender;
 
 /**
- * TODO Add Description
+ * Request handler for SendFaxRequests. Sends FAX message using
+ * {@link FaxSender}
  * 
  * <pre>
  * 
@@ -33,6 +34,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Oct 21, 2010            bfarmer     Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
index 36bcb53be7..a5f740170e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
@@ -22,8 +22,6 @@ package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.Date;
 
-import com.raytheon.edex.textdb.alarms.AlarmAlertUtil;
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.db.OperationalStdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.PracticeStdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
@@ -34,6 +32,8 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
+import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 /**
  * Handles StdTextProductServerRequest by placing them onto the LDAD queue and
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/TextProductInfoCreateHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/TextProductInfoCreateHandler.java
index 1032096aff..786e4ad4da 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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,9 +1,9 @@
 package com.raytheon.uf.edex.plugin.text.handler;
 
-import com.raytheon.edex.textdb.dao.TextProductInfoDao;
 import com.raytheon.uf.common.dataplugin.text.db.TextProductInfo;
 import com.raytheon.uf.common.dataplugin.text.request.TextProductInfoCreateRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.edex.plugin.text.dao.TextProductInfoDao;
 
 /**
  * TODO Add Description Register request and handler beans in text-request.xml.
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/WriteProductHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/WriteProductHandler.java
similarity index 92%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/WriteProductHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/WriteProductHandler.java
index ea335f022b..92256dd7b5 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/handler/WriteProductHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/WriteProductHandler.java
@@ -17,13 +17,11 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.handler;
+package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.Date;
 import java.util.logging.Logger;
 
-import com.raytheon.edex.textdb.alarms.AlarmAlertUtil;
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
 import com.raytheon.uf.common.dataplugin.text.request.WriteProductRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -31,9 +29,11 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
+import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 /**
- * TODO Add Description
+ * Request handler for WriteProductRequests. Forwards request to textdb.
  * 
  * <pre>
  * 
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.core.EdexException;
  * Jul 02, 2010 4687       cjeanbap    Added watch warn queue.
  * May 23, 2012 14952      rferrel     Alarm Alerts date now set to the
  *                                      products reference/create time.
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextDBStaticData.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextDBStaticData.java
index a7c471063c..e917148d30 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextDBStaticData.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.dbapi.impl;
+package com.raytheon.uf.edex.plugin.text.impl;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -58,6 +58,7 @@ import com.raytheon.uf.common.util.StringUtil;
  * Mar 17, 2014 DR 16449   D. Friedman Fix reload/populate.
  * Apr 01, 2014 2915       dgilling    Major re-factor, all methods are now
  *                                     static.
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * </pre>
  * 
  * @author jkorman
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
index 1abd6cdf7a..c320efbda1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
@@ -25,10 +25,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
-import com.raytheon.edex.textdb.dbapi.impl.TextDBStaticData;
 import com.raytheon.uf.common.wmo.WMOHeader;
 import com.raytheon.uf.edex.core.props.PropertiesFactory;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
 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;
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/WMOReportData.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/WMOReportData.java
similarity index 92%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/WMOReportData.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/WMOReportData.java
index 87fcebbb78..1584e5a446 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/WMOReportData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/WMOReportData.java
@@ -17,19 +17,21 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.dbapi.impl;
+package com.raytheon.uf.edex.plugin.text.impl;
 
 import com.raytheon.uf.common.wmo.AFOSProductId;
 import com.raytheon.uf.common.wmo.WMOHeader;
 
 /**
- * TODO Add Description
+ * Data object containing the WMO headers, AFOS product ID and report data as a
+ * string
  * 
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Oct 1, 2008        1538 jkorman     Initial creation
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * </pre>
  * 
  * @author jkorman
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
index 5640ccc8a8..c8c310a063 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
@@ -26,12 +26,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-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.common.wmo.AFOSProductId;
 import com.raytheon.uf.common.wmo.WMOHeader;
+import com.raytheon.uf.edex.plugin.text.impl.TextDBStaticData;
 import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
+import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 /**
  * Standard Message Collective Separator.
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
index 8e7159dd46..3b3d95f29b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
@@ -23,12 +23,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-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.common.wmo.AFOSProductId;
 import com.raytheon.uf.common.wmo.WMOHeader;
+import com.raytheon.uf.edex.plugin.text.impl.TextDBStaticData;
 import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
+import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 /**
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
index 623e3d6c58..17eaafe07e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
@@ -28,11 +28,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
-import com.raytheon.edex.textdb.dbapi.impl.TextDBStaticData;
-import com.raytheon.edex.textdb.dbapi.impl.WMOReportData;
 import com.raytheon.uf.common.wmo.AFOSProductId;
 import com.raytheon.uf.common.wmo.WMOHeader;
+import com.raytheon.uf.edex.plugin.text.impl.TextDBStaticData;
 import com.raytheon.uf.edex.plugin.text.impl.TextSeparatorFactory;
+import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 /**
  * Upper Air Collective text Separator.
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
index e6e5d1afa5..4f560d0f43 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/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
@@ -30,9 +30,9 @@ import org.apache.commons.logging.LogFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
-import com.raytheon.edex.textdb.dbapi.impl.WMOReportData;
 import com.raytheon.uf.common.wmo.AFOSProductId;
 import com.raytheon.uf.common.wmo.WMOHeader;
+import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 /**
  * Decoder implementation for text products
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/SiteMapNationalDatasetSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/SiteMapNationalDatasetSubscriber.java
similarity index 97%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/SiteMapNationalDatasetSubscriber.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/SiteMapNationalDatasetSubscriber.java
index 67f330a179..a746b070d6 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/SiteMapNationalDatasetSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/SiteMapNationalDatasetSubscriber.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.ingest;
+package com.raytheon.uf.edex.plugin.text.ingest;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -51,6 +51,7 @@ import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
  * ------------ ---------- ----------- --------------------------
  * Jan 06, 2011            bfarmer     Initial creation
  * Mar 06, 2014   2876     mpduff      New NDM plugin.
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/TextDBStaticDataSubscriber.java
similarity index 94%
rename from edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/TextDBStaticDataSubscriber.java
index aaa186559a..8e1fb81c36 100644
--- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/TextDBStaticDataSubscriber.java
@@ -17,12 +17,11 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.edex.textdb.ingest;
+package com.raytheon.uf.edex.plugin.text.ingest;
 
 import java.io.File;
 import java.io.IOException;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDBStaticData;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -34,6 +33,7 @@ import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
 import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.plugin.text.impl.TextDBStaticData;
 
 /**
  * Text DB static data subscriber.
@@ -49,6 +49,7 @@ import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
  * Mar 06, 2014   2876     mpduff      New NDM plugin.
  * Mar 17, 2014 DR 16449   D. Friedman Send 'setDirty' notification to all nodes.
  * Mar 20, 2014   2915     dgilling    Code cleanup.
+ * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
index fde0b0ed9a..8765164356 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
@@ -26,9 +26,6 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
-import com.raytheon.edex.textdb.fax.AutoFaxDao;
-import com.raytheon.edex.textdb.fax.FaxSender;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.text.AutoFaxContainer;
@@ -36,6 +33,9 @@ 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;
+import com.raytheon.uf.edex.plugin.text.db.TextDB;
+import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
+import com.raytheon.uf.edex.plugin.text.fax.FaxSender;
 
 /**
  * TODO Add Description
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/images/bell.gif b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/images/bell.gif
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/images/bell.gif
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/images/bell.gif
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/afosMasterPIL.txt b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/afosMasterPIL.txt
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/afosMasterPIL.txt
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/afosMasterPIL.txt
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/bit_table.dat b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/bit_table.dat
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/bit_table.dat
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/bit_table.dat
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/checkProductFile.dat b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/checkProductFile.dat
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/checkProductFile.dat
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/checkProductFile.dat
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/collective_table.dat b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/collective_table.dat
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/collective_table.dat
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/collective_table.dat
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/exclusionProductList.dat b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/exclusionProductList.dat
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/exclusionProductList.dat
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/exclusionProductList.dat
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/ispan_table.dat b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/ispan_table.dat
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/ispan_table.dat
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/ispan_table.dat
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/station_table.dat b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/station_table.dat
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/station_table.dat
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/station_table.dat
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textCCChelp.txt b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textCCChelp.txt
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textCCChelp.txt
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textCCChelp.txt
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textCategoryClass.txt b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textCategoryClass.txt
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textCategoryClass.txt
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textCategoryClass.txt
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textNNNhelp.txt b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textNNNhelp.txt
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textNNNhelp.txt
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textNNNhelp.txt
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textOriginTable.txt b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textOriginTable.txt
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/textOriginTable.txt
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textOriginTable.txt
diff --git a/edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/upair_table.dat b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/upair_table.dat
similarity index 100%
rename from edexOsgi/com.raytheon.edex.textdb/utility/common_static/base/textdb/upair_table.dat
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/upair_table.dat
diff --git a/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
index f8de12083f..5727b25fde 100644
--- a/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
@@ -22,13 +22,6 @@
       <import feature="com.raytheon.uf.edex.archive.feature" version="1.0.0.qualifier"/>
    </requires>
 
-   <plugin
-         id="com.raytheon.edex.textdb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.edex.dissemination"
          download-size="0"
diff --git a/javaUtilities/com.raytheon.uf.docs.datauri/.classpath b/javaUtilities/com.raytheon.uf.docs.datauri/.classpath
index bbc46d50e6..04d0895910 100644
--- a/javaUtilities/com.raytheon.uf.docs.datauri/.classpath
+++ b/javaUtilities/com.raytheon.uf.docs.datauri/.classpath
@@ -23,10 +23,8 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.sfcobs"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.shef"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.taf"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.text"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.textlightning"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.warning"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.textdb"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.dataaccess"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.dataplugin"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.dataplugin.acars"/>