@@ -66,8 +67,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -75,5 +135,14 @@
+
+
+
+
+
+
+
+
+
\ 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
+ *
*
*
* @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
*
*
* @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
*
*
*
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
*
*
* @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;
/**
- *
*
* 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
+ *
*
*
* @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
*
*
* @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
*
*
*
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
*
*
*
@@ -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
*
*
*
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
*
*
*
@@ -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
*
*
*
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.
*
*
*
@@ -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
*
*
* @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.
*
*
*
@@ -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
*
*
*
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.
*
*
*
@@ -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
*
*
*
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.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * ??? Initial creation
+ * May 20, 2014 2536 bclement moved from edex.textdb to edex.plugin.text
+ *
+ *
+ *
+ * @version 1.0
+ */
+public class RemoteRetrievalHandler implements
+ IRequestHandler {
+
+ 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.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * ??? Initial creation
+ * May 20, 2014 2536 bclement moved from edex.textdb to edex.plugin.text
+ *
+ *
+ *
+ * @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}
*
*
*
@@ -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
*
*
*
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.
*
*
*
@@ -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
*
*
*
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
*
*
* @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
*
*
* 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
*
*
* @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
*
*
*
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
*
*
*
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 @@
-
-
-
-