diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF
index 8cf6ebc48a..5daa248af9 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@ Require-Bundle: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
javax.persistence,
org.hibernate;bundle-version="1.0.0",
- javax.measure;bundle-version="1.0.0"
+ javax.measure;bundle-version="1.0.0",
+ com.raytheon.uf.common.dataaccess;bundle-version="1.14.0"
Export-Package: com.raytheon.uf.common.dataplugin.acars
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/build.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/build.properties
index 34d2e4d2da..5791d48d5f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ res/
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF
index bf0b42cf8d..cce6abfa2a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Acars Plug-in
+Bundle-Name: Acars Decoder Plug-in
Bundle-SymbolicName: com.raytheon.uf.edex.plugin.acars
Bundle-Version: 1.14.0.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.raytheon.edex.common,
com.raytheon.uf.common.pointdata,
com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
org.geotools,
javax.persistence,
- javax.measure
+ javax.measure,
+ com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174"
Export-Package: com.raytheon.uf.edex.plugin.acars,
com.raytheon.uf.edex.plugin.acars.common,
com.raytheon.uf.edex.plugin.acars.dao
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.raytheon.uf.common.dataplugin.acars,
com.raytheon.uf.common.status,
com.raytheon.uf.common.wmo
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/pointdata/acars.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/pointdata/acars.xml
new file mode 100644
index 0000000000..17b8122d0f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/pointdata/acars.xml
@@ -0,0 +1,22 @@
+
+
+
* * SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jan 21, 2009 1939 jkorman Initial creation - * Oct 10, 2012 1261 djohnson Add some generics wildcarding. - * Nov 02, 2012 1302 djohnson Add Javadoc. - * Aug 30, 2013 2298 rjpeter Make getPluginName abstract - * Mar 27, 2014 2811 skorolev Updated logger. + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jan 21, 2009 1939 jkorman Initial creation + * Oct 10, 2012 1261 djohnson Add some generics wildcarding. + * Nov 02, 2012 1302 djohnson Add Javadoc. + * Aug 30, 2013 2298 rjpeter Make getPluginName abstract + * Mar 27, 2014 2811 skorolev Updated logger. + * Jun 06, 2014 2061 bsteffen Extend PointDataPluginDao * ** @@ -53,7 +54,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException; * @version 1.0 */ -public class ACARSDao extends DefaultPluginDao { +public class ACARSDao extends PointDataPluginDao