remove com.raytheon.uf.edex.ndm, remove static/spatial/radar/fsl-w88d shapefiles

edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml

@@ -112,13 +112,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.edex.ndm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.wmo"
          download-size="0"

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/META-INF/MANIFEST.MF

@@ -5,8 +5,7 @@ Bundle-SymbolicName: com.raytheon.uf.edex.ndm.dataplugin
 Bundle-Version: 1.16.1.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.raytheon.uf.edex.ndm;bundle-version="1.14.0",
+Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.15.1",
- com.raytheon.uf.common.localization;bundle-version="1.15.1",
  com.raytheon.uf.common.dataplugin;bundle-version="1.14.0",
  com.raytheon.uf.common.dataplugin.redbook;bundle-version="1.15.0",
  com.raytheon.uf.common.status;bundle-version="1.15.0",
@@ -28,3 +27,4 @@ Require-Bundle: com.raytheon.uf.edex.ndm;bundle-version="1.14.0",
  com.raytheon.edex.plugin.goessounding;bundle-version="1.15.0"
 Import-Package: com.raytheon.uf.edex.plugin.text,
  com.raytheon.uf.common.geospatial.spi
+Export-Package: com.raytheon.uf.edex.ndm.dataplugin.ingest

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/res/spring/ndm-dataplugin-ingest.xml

@@ -5,6 +5,8 @@
     http://camel.apache.org/schema/spring
     http://camel.apache.org/schema/spring/camel-spring.xsd">
     
+    <bean id="ndmProc" class="com.raytheon.uf.edex.ndm.dataplugin.ingest.NationalDatasetIngester"/>
+
     <!-- redbook -->
     <bean id="redbookNdmMenuListener"
         class="com.raytheon.uf.edex.ndm.dataplugin.subscriber.RedbookNdmMenuSubscriber" />
@@ -133,7 +135,6 @@
 
     <!-- radar -->
     <bean id="radarMenuCreator" class="com.raytheon.uf.edex.ndm.dataplugin.subscriber.RadarMenuUtil"/>
-    <bean id="import88dLocations" class="com.raytheon.uf.edex.ndm.dataplugin.subscriber.Import88DLocationsUtil"/>
 
     <bean factory-bean="ndmProc" factory-method="registerListener">
         <constructor-arg value="elevationLists.txt" />
@@ -147,18 +148,6 @@
         <constructor-arg value="ssssElevationLists.txt" />
         <constructor-arg ref="radarMenuCreator" />
     </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="fsl-w88d.shp" />
-        <constructor-arg ref="import88dLocations" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="fsl-w88d.shx" />
-        <constructor-arg ref="import88dLocations" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="fsl-w88d.dbf" />
-        <constructor-arg ref="import88dLocations" />
-    </bean>
 
     <!-- obs -->
     <bean id="mtrListener" class="com.raytheon.uf.edex.ndm.dataplugin.subscriber.MTRSubscriber" />

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/ingest/IDataSetIngester.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.ndm.ingest;
+package com.raytheon.uf.edex.ndm.dataplugin.ingest;
 
 
 /**

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/ingest/INationalDatasetSubscriber.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.ndm.ingest;
+package com.raytheon.uf.edex.ndm.dataplugin.ingest;
 
 import java.io.File;
 

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/ingest/NationalDatasetIngester.java

@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.ndm.ingest;
+package com.raytheon.uf.edex.ndm.dataplugin.ingest;
 
 import java.io.File;
 import java.util.ArrayList;

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/AbstractBufrSoundingSubscriber.java

@@ -40,7 +40,7 @@ import com.raytheon.uf.common.pointdata.vadriver.VA_Driver;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * A National Dataset Subscriber for BUFR Sounding Data

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/AbstractRedbookNdmSubscriber.java

@@ -39,7 +39,7 @@ import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * Abstract class for listening for Redbook NDM files that are dropped into EDEX

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/BuoySubscriber.java

@@ -38,7 +38,7 @@ import com.raytheon.uf.common.pointdata.vadriver.VA_Driver;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * Buoy NDM subscriber.

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/IcaoSubscriber.java

@@ -36,7 +36,7 @@ import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 import com.raytheon.uf.edex.plugin.text.IcaoMap;
 
 /**

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/Import88DLocationsUtil.java

@@ -1,383 +0,0 @@
-package com.raytheon.uf.edex.ndm.dataplugin.subscriber;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import org.opengis.feature.Property;
-import org.opengis.feature.simple.SimpleFeature;
-
-import com.raytheon.edex.plugin.radar.dao.RadarStationDao;
-import com.raytheon.uf.common.dataplugin.radar.RadarStation;
-import com.raytheon.uf.common.localization.ILocalizationFile;
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.dataplugin.util.Shapefile;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.PrecisionModel;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
-
-/**
- * Decoder implementation for radar shape files plugin
- * 
- * <pre>
- * SOFTWARE HISTORY
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- * 10Oct2011    10520       JWork       Initial check-in.
- * 09/11/2012   DR 15366    D. Friedman Set SRID on radar stations.
- * Mar 06, 2014 2876        mpduff      Moved NationalDatasetSubscriber.
- * Jul 09, 2015 4500        rjpeter     Fix SQL Injection concern.
- * Jan 27, 2016 5237        tgurney     Replace deprecated LocalizationFile
- *                                      method call
- * Mar 02, 2016 5434        bkowal      Relocated to ndm dataplugin. Eliminated
- *                                      deprecation warnings.
- * Jul 18, 2016 5744        mapeters    Use common_static instead of edex_static
- *                                      for saving/retrieving shape files
- * </pre>
- */
-public class Import88DLocationsUtil implements INationalDatasetSubscriber {
-    private static final IUFStatusHandler statusHandler = UFStatus
-            .getHandler(Import88DLocationsUtil.class);
-
-    private static final String SHAPEFILE = "fsl-w88d.shp";
-
-    private static final String NDM_DIR_NAME = "ndm" + IPathManager.SEPARATOR;
-
-    private static final int WGS84_SRID = 4326;
-
-    /** The list of the required files comprising a Shapefile set */
-    private static final String[] SHAPE_FILES = new String[] { "fsl-w88d.shp",
-            "fsl-w88d.shx", "fsl-w88d.dbf" };
-
-    /**
-     * The collection of feature attribute names this code needs from the
-     * shapefile
-     */
-    private enum databaseColumns {
-        LAT, EQP_ELV, NAME, LON, IMMUTABLEX, RDA_ID, ELEVMETER, THE_GEOM, WFO_ID, RPG_ID_DEC
-    }
-
-    private final long theTimeRange = 3600000l;
-
-    /** The file name of the file currently being processed. */
-    private String fileName = null;
-
-    /** The date, in millis, of the file currently being processed. */
-    private long theCurrentFileDateMillis = 0;
-
-    /**
-     * The list of RDA_ID's from the shapefile used to determine if an ID has
-     * been removed from the database
-     */
-    private ArrayList<String> theRDAList = null;
-
-    private IPathManager pathMgr = null;
-
-    private LocalizationContext commonConfiguredCtx = null;
-
-    @Override
-    public void notify(String aFileName, File aFile) {
-        pathMgr = PathManagerFactory.getPathManager();
-        commonConfiguredCtx = pathMgr.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.CONFIGURED);
-        fileName = aFileName;
-        // Read file from NDM directory and move to Common directory
-        ILocalizationFile ndmDirFile = getPathInfoWrite();
-
-        saveFile(aFile, ndmDirFile);
-
-        if (allFilesAvailable()) {
-            // Start the ShapeFile update
-            updateRadarFromShapeFiles();
-        }
-    }
-
-    /**
-     * Adaptor method to use theFileName attribute.
-     * 
-     * @return LocalizationFile
-     */
-    private ILocalizationFile getPathInfoWrite() {
-        ILocalizationFile ndmDir = pathMgr.getLocalizationFile(
-                commonConfiguredCtx, NDM_DIR_NAME + fileName);
-
-        return ndmDir;
-    }
-
-    /**
-     * Returns the localization path information for the NDM filename passed in.
-     * 
-     * @return LocalizationFile
-     */
-    private File getPathInfoRead(String aFileName) {
-        File file = pathMgr.getFile(commonConfiguredCtx, NDM_DIR_NAME
-                + aFileName);
-        return file;
-    }
-
-    /**
-     * Copies the file from NDM ingest directory to the landing zone
-     * 
-     * @param file
-     * @param outFile
-     */
-    private void saveFile(File file, ILocalizationFile outFile) {
-        if ((file != null) && file.exists()) {
-            try {
-                byte[] fileByteArray = Files.readAllBytes(Paths.get(file
-                        .getAbsolutePath()));
-
-                try (OutputStream os = outFile.openOutputStream()) {
-                    os.write(fileByteArray);
-                }
-
-                // / Add the outFile's time stamp to check later on.
-                theCurrentFileDateMillis = System.currentTimeMillis();
-
-            } catch (FileNotFoundException e) {
-                if (statusHandler.isPriorityEnabled(Priority.PROBLEM)) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            "Failed to find file: " + file.getName(), e);
-                }
-            } catch (IOException e) {
-                if (statusHandler.isPriorityEnabled(Priority.PROBLEM)) {
-                    statusHandler.handle(
-                            Priority.PROBLEM,
-                            "Could not create output file: "
-                                    + outFile.getPath(), e);
-                }
-            } catch (LocalizationException e) {
-                if (statusHandler.isPriorityEnabled(Priority.PROBLEM)) {
-                    statusHandler.handle(
-                            Priority.PROBLEM,
-                            "Failed to write localization file: "
-                                    + outFile.getPath(), e);
-                }
-            }
-        }
-    }
-
-    /**
-     * Determines if all the files required for a Shapefile are present and
-     * within a given time threshold. For this method the files are
-     * "fsl-w88d(.shp,.shx,.dbf)"
-     * 
-     * @return
-     */
-    private boolean allFilesAvailable() {
-        File tempFile = null;
-        long timeStampMillis = 0;
-        long differenceMillis = 0;
-        boolean rVal = false;
-        ArrayList<String> badList = new ArrayList<>();
-        ArrayList<String> goodList = new ArrayList<>();
-
-        // Determine if the two other files are available or if the time
-        // threshold has been crossed and are too old to process
-        for (String key : SHAPE_FILES) {
-            if (!key.equals(fileName)) {
-                tempFile = getPathInfoRead(key);
-                timeStampMillis = tempFile.lastModified();
-                differenceMillis = theCurrentFileDateMillis - timeStampMillis;
-
-                if ((timeStampMillis != 0L)
-                        && (differenceMillis <= theTimeRange)) {
-                    goodList.add(key);
-                } else {
-                    badList.add(key);
-                }
-            }
-        }
-
-        if (goodList.size() == 2) {
-            rVal = true;
-        } else {
-            // Log what files are "missing"
-            String logMessage = null;
-            String header = "Received file [" + fileName
-                    + "] still require file(s) [" + badList.get(0);
-            if (badList.size() == 2) {
-                logMessage = header + ", " + badList.get(1) + "]";
-            } else {
-                logMessage = header + "]";
-            }
-            if (statusHandler.isPriorityEnabled(Priority.INFO)) {
-                statusHandler.handle(Priority.INFO, logMessage);
-            }
-        }
-        return rVal;
-    }
-
-    private void updateRadarFromShapeFiles() {
-        SimpleFeature simpleFeature = null;
-        List<HashMap<String, String>> dataRows = new ArrayList<>();
-        HashMap<String, String> nameValuePair = null;
-        Collection<Property> propCollection = null;
-        String name = null;
-        String value = null;
-        List<RadarStation> stationList = new ArrayList<>();
-
-        File tempFile = getPathInfoRead(SHAPEFILE);
-        Shapefile shapefile = new Shapefile(tempFile);
-        if (shapefile.readShapefile()) {
-            Set<String> featureIDs = shapefile.getFeatureIDs();
-            for (String id : featureIDs) {
-                simpleFeature = shapefile.getFeature(id);
-                propCollection = simpleFeature.getProperties();
-                nameValuePair = new HashMap<>();
-                for (Property property : propCollection) {
-                    name = property.getDescriptor().getName().getLocalPart();
-                    value = property.getValue().toString();
-                    nameValuePair.put(name, value);
-                }
-                dataRows.add(nameValuePair);
-            }
-            stationList = buildStations(dataRows);
-            updateDatabase(stationList);
-            checkForMissingStations();
-
-        } else {
-            /**
-             * TODO: Add code to handle when file could not be read.
-             */
-        }
-    }
-
-    private void updateDatabase(List<RadarStation> aStationList) {
-        RadarStationDao radarStationDAO = new RadarStationDao();
-
-        for (RadarStation station : aStationList) {
-            radarStationDAO.saveOrUpdate(station);
-        }
-
-        /*
-         * Kludge for DR 15366: The GeoTools WKBWriter does not store SRIDs so
-         * we must update them manually.
-         * 
-         * Once GetTools is updated/fixed, this should be removed.
-         */
-        try {
-            radarStationDAO.setSridOnAllRadarStation();
-        } catch (Exception e) {
-            statusHandler.handle(Priority.ERROR,
-                    "Failed to update the SRIDs in the radar_spatial table", e);
-        }
-
-        if (statusHandler.isPriorityEnabled(Priority.INFO)) {
-            statusHandler
-                    .handle(Priority.INFO,
-                            "The NDM update of database table RADAR_SPATIAL has been completed successfully");
-        }
-    }
-
-    /**
-     * Using the list of RDA IDs from the shapefile determine if one or more
-     * stations are missing and log a warning message for the missing stations
-     */
-    private void checkForMissingStations() {
-        RadarStationDao dao = new RadarStationDao();
-        List<String> currentList = dao.getRDA_IDs();
-        currentList.removeAll(theRDAList);
-        if (currentList.size() > 0) {
-            for (String rda_id : currentList) {
-                if (statusHandler.isPriorityEnabled(Priority.PROBLEM)) {
-                    statusHandler
-                            .handle(Priority.PROBLEM,
-                                    "The RADAR_SPATIAL database table for the row with a RDA_ID of ["
-                                            + rda_id
-                                            + "] needs to be removed per latest NDM update");
-
-                }
-            }
-        }
-    }
-
-    private List<RadarStation> buildStations(
-            List<HashMap<String, String>> aDataList) {
-        List<RadarStation> rVal = new ArrayList<>();
-        theRDAList = new ArrayList<>();
-        String rda_id = null;
-        RadarStation tempStation = null;
-        Set<String> keySet = null;
-        GeometryFactory gf = new GeometryFactory(new PrecisionModel(),
-                WGS84_SRID);
-        WKTReader wkt = new WKTReader(gf);
-        for (HashMap<String, String> aHashMap : aDataList) {
-            keySet = aHashMap.keySet();
-            tempStation = new RadarStation();
-            for (String key : keySet) {
-                switch (databaseColumns.valueOf(key.toUpperCase())) {
-                case LAT:
-                    tempStation.setLat(Float.valueOf(aHashMap.get(key)));
-                    break;
-                case EQP_ELV:
-                    tempStation.setEqpElv(Float.valueOf(aHashMap.get(key)));
-                    break;
-                case NAME:
-                    tempStation.setName(aHashMap.get(key));
-                    break;
-                case LON:
-                    tempStation.setLon(Float.valueOf(aHashMap.get(key)));
-                    break;
-                case IMMUTABLEX:
-                    tempStation.setImmutablEx(Float.valueOf(aHashMap.get(key)));
-                    break;
-                case RDA_ID:
-                    rda_id = aHashMap.get(key);
-                    tempStation.setRdaId(rda_id);
-                    // Add the rda_id to a list in order to determine if a
-                    // rda_id has been removed from the database
-                    theRDAList.add(rda_id);
-                    break;
-                case ELEVMETER:
-                    tempStation.setElevMeter(Float.valueOf(aHashMap.get(key)));
-                    break;
-                case THE_GEOM:
-                    try {
-                        tempStation.setStation((Point) wkt.read(aHashMap
-                                .get(key)));
-                    } catch (ParseException e) {
-                        if (statusHandler.isPriorityEnabled(Priority.PROBLEM)) {
-                            statusHandler.handle(Priority.PROBLEM,
-                                    e.getLocalizedMessage() + e);
-                        }
-                    }
-                    break;
-                case WFO_ID:
-                    tempStation.setWfoId(aHashMap.get(key));
-                    break;
-                case RPG_ID_DEC:
-                    tempStation.setRpgIdDec(aHashMap.get(key));
-                    break;
-                default:
-                    if (statusHandler.isPriorityEnabled(Priority.PROBLEM)) {
-                        statusHandler.handle(Priority.PROBLEM,
-                                "Unknown token [" + key + "}");
-                    }
-                    break;
-                }
-                rVal.add(tempStation);
-            }
-        }
-        return rVal;
-    }
-}

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/MTRSubscriber.java

@@ -38,7 +38,7 @@ import com.raytheon.uf.common.pointdata.vadriver.VA_Driver;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * MTR NDM subscriber.

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/MarineInfoSubscriber.java

@@ -42,7 +42,7 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.database.dao.CoreDao;
 import com.raytheon.uf.edex.database.dao.DaoConfig;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.Point;

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/ModelBufrSubscriber.java

@@ -39,7 +39,7 @@ import com.raytheon.uf.common.pointdata.vadriver.VA_Driver;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 import com.raytheon.uf.edex.plugin.modelsounding.decoder.ModelSoundingDataAdapter;
 
 /**

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/RAOBSubscriber.java

@@ -38,7 +38,7 @@ import com.raytheon.uf.common.pointdata.vadriver.VA_Driver;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * RAOB NDM subscriber.

edexOsgi/com.raytheon.uf.edex.ndm.dataplugin/src/com/raytheon/uf/edex/ndm/dataplugin/subscriber/RadarMenuUtil.java

@@ -53,7 +53,7 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.edex.menus.AbstractMenuUtil;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * Builds menus using JAXB

edexOsgi/com.raytheon.uf.edex.ndm/.classpath

@@ -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.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

edexOsgi/com.raytheon.uf.edex.ndm/.project

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

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

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ndm
-Bundle-SymbolicName: com.raytheon.uf.edex.ndm
-Bundle-Version: 1.14.0.qualifier
-Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.14.0",
- com.raytheon.uf.common.status;bundle-version="1.12.1174",
- com.raytheon.uf.common.pointdata;bundle-version="1.13.0",
- com.raytheon.uf.common.site;bundle-version="1.12.1174",
- com.raytheon.uf.edex.core;bundle-version="1.12.1174"
-Export-Package: com.raytheon.uf.edex.ndm.ingest

edexOsgi/com.raytheon.uf.edex.ndm/build.properties

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

edexOsgi/com.raytheon.uf.edex.ndm/modes/ndm-modes.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 
-       Refer to edex/modes/README.txt for documentation
---> 
-<edexModes>
-    <mode name="ingestHydro">
-        <include>ndm-ingest.xml</include>
-    </mode>
-</edexModes>

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

@@ -1,26 +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.xsd
-    http://camel.apache.org/schema/spring
-    http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <camelContext id="clusteredNdmProc"
-        xmlns="http://camel.apache.org/schema/spring"
-        errorHandlerRef="errorHandler">
-        <endpoint id="ndmFileEndpoint"
-            uri="file:${edex.home}/data/ndm?delete=true&amp;delay=5000&amp;maxMessagesPerPoll=1000&amp;exclusiveReadLockStrategy=#ndmFileChangedStrategy" />
-
-        <route id="ndmFileScan">
-            <from ref="ndmFileEndpoint" />
-            <bean ref="ndmProc" method="processEvent" />
-        </route>
-    </camelContext>
-
-    <bean factory-bean="contextManager" factory-method="registerClusteredContext">
-        <constructor-arg ref="clusteredNdmProc"/>
-    </bean>
-
-    <bean id="ndmProc" class="com.raytheon.uf.edex.ndm.ingest.NationalDatasetIngester"/>
-    <bean id="ndmFileChangedStrategy" class="com.raytheon.uf.edex.esb.camel.FileChangedExclusiveReadLockStrategy"/>
-</beans>

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

@@ -12,10 +12,10 @@ Require-Bundle: org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.site,
  com.raytheon.uf.edex.archive,
- com.raytheon.uf.edex.ndm,
  com.raytheon.uf.common.localization;bundle-version="1.14.0",
  com.raytheon.uf.edex.plugin.text,
- com.raytheon.uf.common.dataplugin.text
+ com.raytheon.uf.common.dataplugin.text,
+ com.raytheon.uf.edex.ndm.dataplugin;bundle-version="1.16.1"
 Export-Package: com.raytheon.uf.edex.plugin.text.dbsrv,
  com.raytheon.uf.edex.plugin.text.dbsrv.impl,
  com.raytheon.uf.edex.plugin.text.dbsrv.security

edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosBrowserModelSubscriber.java

@@ -38,7 +38,7 @@ import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * AFOS NDM Subscriber.

edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosToAwipsListener.java

@@ -53,7 +53,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.database.cluster.ClusterLockUtils;
 import com.raytheon.uf.edex.database.cluster.ClusterLockUtils.LockState;
 import com.raytheon.uf.edex.database.cluster.ClusterTask;
-import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 import com.raytheon.uf.edex.plugin.text.AfosToAwipsUtil;
 
 /**

edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/SiteMapNationalDatasetSubscriber.java

@@ -40,7 +40,7 @@ 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.ndm.ingest.INationalDatasetSubscriber;
+import com.raytheon.uf.edex.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 
 /**
  * Site Map NDM subscriber.

edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/TextDBStaticDataSubscriber.java

@@ -32,7 +32,7 @@ import com.raytheon.uf.common.status.UFStatus;
 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.ndm.dataplugin.ingest.INationalDatasetSubscriber;
 import com.raytheon.uf.edex.plugin.text.impl.TextDBStaticData;
 
 /**

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

@@ -12,7 +12,6 @@ Require-Bundle: org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.site,
  com.raytheon.uf.edex.archive,
- com.raytheon.uf.edex.ndm,
  com.raytheon.uf.common.localization;bundle-version="1.14.0",
  com.raytheon.uf.edex.plugin.text,
  com.raytheon.uf.edex.plugin.text.dbsrv,