Issue #2170: Initial plugin rename for notification framework

Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: 359ee5d1af [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]
Former-commit-id: 8ba840f1d9

RadarServer/com.raytheon.rcm.lib/component-deploy.xml

@@ -1,11 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.rcm.lib">
-    <available file="../../edexOsgi/build.edex" 
-    	property="build.dir.location" 
-    	value="../../edexOsgi/build.edex"/>
-    <available file="../../../../../build.edex" 
-    	property="build.dir.location" 
-    	value="../../../../../build.edex"/>
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>	
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-</project>

edexOsgi/com.raytheon.edex.adaptersrv/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.edex.adaptersrv">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.edex.ingestsrv/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.edex.ingestsrv">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrv.java

@@ -1,348 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-package com.raytheon.edex.services;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.raytheon.uf.edex.core.EdexException;
-
-/**
- * The archive service listens to staging service and moves any files that pass
- * through staging service when the archive mode is on.<br>
- * 
- * This implementation moves the file to the specified archive directory.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * 12/12/2007   561         dfitch      Initial Creation
- * 
- * </pre>
- * 
- * @author dfitch
- * @version 1
- */
-
-public class ArchiveSrv implements ArchiveSrvInterface {
-
-    /**
-     * Location of the archive.
-     */
-    private String archiveDirectoryLocation = "";
-
-    /**
-     * Status of the Archive/teeMode.
-     */
-    private boolean teeModeOn = false;
-
-    /**
-     * Status of the jmxMode.
-     */
-    private boolean jmxModeOn = false;
-
-    /**
-     * Name describing the data ingesting.
-     */
-    private String name = null;
-
-    /**
-     * could also just use the statistics that are already under
-     * org.mule.Statistics in jconsole.
-     */
-    private int numMessagesServed;
-
-    private int numMessagesCopied;
-
-    private boolean bRegistered = false;
-
-    private String recordLocations = null;
-
-    private boolean multipleLocationsPerFile = false;
-
-    private String locationField = null;
-
-    private Log logger = LogFactory.getLog(getClass());
-
-    /**
-     * List of the ArchiveSrvs
-     */
-    private static List<ArchiveSrv> lstOfArchiveSrv = null;
-
-    private static Map<String, Integer> map = new HashMap<String, Integer>();
-
-    /**
-     * Define the datatype and index filtering this instance handles.
-     */
-    private String pluginName = "";
-
-    /**
-     * Constructor.
-     */
-    public ArchiveSrv() {
-
-        numMessagesServed = numMessagesCopied = 0;
-        if (null == lstOfArchiveSrv) {
-            lstOfArchiveSrv = new ArrayList<ArchiveSrv>();
-        }
-        synchronized (lstOfArchiveSrv) {
-            lstOfArchiveSrv.add(this);
-        }
-    }
-
-    public Object process(String filePath) throws EdexException {
-
-        numMessagesServed++;
-
-        if (logger.isInfoEnabled()) {
-            logger.info("***** archiveDirectoryLocation="
-                    + archiveDirectoryLocation);
-        }
-        if (teeModeOn) {
-            numMessagesCopied++;
-            // Copy the filename
-            copyFile(archiveDirectoryLocation, filePath);
-        }
-
-        return filePath;
-    }
-
-    public void dispose() {
-        // intentially left empty
-
-    }
-
-    /**
-     * @param archiveDirectoryLocation
-     *            Location of the Archive Directory
-     * @param fileName
-     *            File name to be copied
-     */
-    public static void copyFile(String archiveDirectoryLocation, String fileName) {
-        try {
-            File file = new File(fileName);
-            file = file.getCanonicalFile();
-
-            File archiveDir = new File(archiveDirectoryLocation);
-            archiveDir.mkdirs();
-            String archiveFileName = archiveDirectoryLocation + file.getName();
-            File archiveFile = new File(archiveFileName);
-            OutputStream out = new FileOutputStream(archiveFile);
-            InputStream is = new FileInputStream(file);
-            byte[] bytes = new byte[8 * 1024];
-
-            // Read in the bytes
-            int numRead = 0;
-            while (0 <= (numRead = is.read(bytes))) {
-                out.write(bytes, 0, numRead);
-            }
-            // Close the input stream and return bytes
-            is.close();
-            out.close();
-
-            // Get the last modified time
-            long modifiedTime = file.lastModified();
-            // 0L is returned if the file does not exist
-
-            // Set the last modified time
-            archiveFile.setLastModified(modifiedTime);
-
-        } catch (Exception bland) {
-            bland.printStackTrace();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.edex.services.ArchiveTeeSrvInterface#getArchiveDirectoryLocation
-     * ()
-     */
-    public String getArchiveDirectoryLocation() {
-        return archiveDirectoryLocation;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.edex.services.ArchiveTeeSrvInterface#setArchiveDirectoryLocation
-     * (java.lang.String)
-     */
-    public void setArchiveDirectoryLocation(String archiveDirectoryLocation) {
-        if (archiveDirectoryLocation.endsWith("NAME")) {
-            archiveDirectoryLocation = archiveDirectoryLocation.substring(0,
-                    archiveDirectoryLocation.length() - "NAME".length());
-
-            archiveDirectoryLocation = archiveDirectoryLocation + "/"
-                    + ((name == null) ? pluginName : name) + "/";
-        }
-        this.archiveDirectoryLocation = archiveDirectoryLocation;
-
-    }
-
-    /**
-     * @return the teeModeOn
-     */
-    public boolean isTeeModeOn() {
-        return teeModeOn;
-    }
-
-    /**
-     * @param teeModeOn
-     *            the teeModeOn to set
-     */
-    public void setTeeModeOn(boolean teeModeOn) {
-        this.teeModeOn = teeModeOn;
-    }
-
-    /**
-     * @return the lstOfArchiveSrv
-     */
-    public static List<ArchiveSrv> getLstOfArchiveSrv() {
-        return lstOfArchiveSrv;
-    }
-
-    /**
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name
-     *            the name to set
-     */
-    public void setName(String name) {
-        if (null == this.name) {
-            this.name = name;
-        }
-
-    }
-
-    /**
-     * @return the numMessagesServed
-     */
-    public int getNumMessagesServed() {
-        return numMessagesServed;
-    }
-
-    /**
-     * @return the numMessagesCopied
-     */
-    public int getNumMessagesCopied() {
-        return numMessagesCopied;
-    }
-
-    /**
-     * @return the jmxModeOn
-     */
-    public boolean isJmxModeOn() {
-
-        return jmxModeOn;
-
-    }
-
-    /**
-     * @return the recordLocations
-     */
-    public String getRecordLocations() {
-        return recordLocations;
-    }
-
-    /**
-     * @param recordLocations
-     *            the recordLocations to set
-     */
-    public void setRecordLocations(String recordLocations) {
-        this.recordLocations = recordLocations;
-    }
-
-    /**
-     * @return the multipleLocationsPerFile
-     */
-    public boolean isMultipleLocationsPerFile() {
-        return multipleLocationsPerFile;
-    }
-
-    /**
-     * @param multipleLocationsPerFile
-     *            the multipleLocationsPerFile to set
-     */
-    public void setMultipleLocationsPerFile(boolean multipleLocationsPerFile) {
-        this.multipleLocationsPerFile = multipleLocationsPerFile;
-    }
-
-    /**
-     * @return the locationField
-     */
-    public String getLocationField() {
-        return locationField;
-    }
-
-    /**
-     * @param locationField
-     *            the locationField to set
-     */
-    public void setLocationField(String locationField) {
-        this.locationField = locationField;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.edex.services.ArchiveSrvInterface#getPluginName()
-     */
-    public String getPluginName() {
-        return pluginName;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.edex.services.ArchiveSrvInterface#setPluginName(java.lang
-     * .String)
-     */
-    public void setPluginName(String pluginName) {
-        this.pluginName = pluginName;
-
-        if (null == this.name) {
-            this.name = pluginName;
-        }
-
-    }
-}

edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrvInterface.java

@@ -1,97 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.edex.services;
-
-
-/**
- * The archive service listens to staging service and moves any files that
- * pass through staging service when the archive mode is on.<br>
- * 
- * This implementation moves the file to the specified archive directory. 
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * 12/12/2007   561         dfitch      Initial Creation	
- * 
- * </pre>
- * 
- * @author dfitch
- * @version 1
- */
-public interface ArchiveSrvInterface {
-	
-    /**
-     * @return the dataType
-     */
-    public abstract String getPluginName();
-    
-    /**
-     * @param dataType
-     *            the dataType to set
-     */
-    public abstract void setPluginName(String pluginName);
-    
-    /**
-     * @return the archiveDirectoryLocation
-     */
-    public abstract String getArchiveDirectoryLocation();
-
-    /**
-     * @param archiveDirectoryLocation
-     *            the archiveDirectoryLocation to set
-     */
-    public abstract void setArchiveDirectoryLocation(
-            String archiveDirectoryLocation);
-
-   /**
-    * 
-    * @return the status of Archive/TeeMode
-    */
-    public boolean isTeeModeOn();
-
-    /**
-     * @param teeModeOn the teeModeOn to set
-     */
-    public void setTeeModeOn(boolean teeModeOn);
-    
-    /**
-     * 
-     * @return the number of messaged serviced.
-     */
-    public int getNumMessagesServed();
-  
-    /**
-     * 
-     * @return the record locations
-     */
-    public String getRecordLocations();
-    
-    /**
-     * 
-     * @param recordLocations 
-     * 		Location to set the record location.
-     */
-    public void setRecordLocations(String recordLocations);
-
-}

edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/package-info.java

@@ -1,28 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-/**
- * Includes classes implementing Mule ESB Endpoint services. Classes in this
- * package implement com.raytheon.edex.util.AbstractMessageSrv and provide
- * basic message handling capabilities. Classes in this package may be instrumented
- * by inplementing an interface that extends com.raytheon.edex.util.AbstractSrvMBean. 
- * 
- * 
- */
-package com.raytheon.edex.services;

edexOsgi/com.raytheon.edex.plugin.goessounding/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.edex.plugin.goessounding">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.edex.rpgenvdata/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.edex.rpgenvdata">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.messaging.mhs/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.messaging.mhs">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.activetable/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.activetable">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.alertmonitor/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.alertmonitor">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

edexOsgi/com.raytheon.uf.common.alertviz/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.alertviz">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.auth/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.auth">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.awipstools/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.awipstools">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.cache/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.cache">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.colormap/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.colormap">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.comm/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.comm">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

edexOsgi/com.raytheon.uf.common.datadelivery.event/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.datadelivery.event">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.datadelivery.harvester/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.datadelivery.harvester">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.datadelivery.retrieval">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.airep/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.airep">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.bufrascat">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.bufrhdw">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.bufrmthdw">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.bufrncwf">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.bufrquikscat">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.bufrssmi">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.cwa/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.cwa">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/component-deploy.xml

@@ -1,5 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.ffmp">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.fog/component-deploy.xml

@@ -1,5 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.fog">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/component-deploy.xml

@@ -1,5 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.datobs">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.level/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.level">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.lsr/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.lsr">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.pirep/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.pirep">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.qc/component-deploy.xml

@@ -1,6 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.qc">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.shef/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.shef">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.svrwx">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.tcg/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.tcg">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.tcs/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.tcs">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.text/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.textdb">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.vaa/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.vaa">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-    
-    <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
-</project>

edexOsgi/com.raytheon.uf.common.dataplugin.warning/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.warning">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dataquery/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dataquery">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.datastorage/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.datastorage">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.derivparam/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.derivparam">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.dissemination/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.dissemination">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.event/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.event">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.jms/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.jms">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.management/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.management">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.monitor.cpg/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.monitor.cpg">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

edexOsgi/com.raytheon.uf.common.plugin.nwsauth/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.plugin.nwsauth">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

edexOsgi/com.raytheon.uf.common.pointdata/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.pointData">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

edexOsgi/com.raytheon.uf.common.pypies/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.pypies">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

edexOsgi/com.raytheon.uf.common.registry.schemas.iso19115/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.datadelivery.registry.schemas.iso19115">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.serialization.comm/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.thriftserver">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.site/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.site">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.status/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.status">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.common.tafqueue/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.tafqueue">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml

@@ -35,8 +35,8 @@
 			value="com.raytheon.uf.common.dataplugin.warning.WarningRecord" />
 	</bean>
 	<bean id="practiceProductOfftimeHandler" class="com.raytheon.uf.edex.activetable.PracticeProductOfftimeHandler"/>
-   <bean id="uriAggregator" class="com.raytheon.uf.edex.esb.camel.DataUriAggregator" />
+   <bean id="uriAggregator" class="com.raytheon.uf.edex.ingest.notification.DataUriAggregator" />
-   <bean id="toDataURI" class="com.raytheon.uf.edex.esb.camel.ToDataURI" />
+   <bean id="toDataURI" class="com.raytheon.uf.edex.ingest.notification.ToDataURI" />
 	<camelContext id="activetable-camel"
 		xmlns="http://camel.apache.org/schema/spring"
 		errorHandlerRef="errorHandler">

edexOsgi/com.raytheon.uf.edex.alertviz/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.alertviz">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.auth/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.auth">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.awipstools/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.awipstools">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml

@@ -35,7 +35,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.raytheon.edex.ingestsrv"
+         id="com.raytheon.uf.edex.ingest"
          download-size="0"
          install-size="0"
          version="0.0.0"

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

@@ -154,11 +154,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.edex.notification"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

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

@@ -81,7 +81,7 @@
 			<property name="ws" value="gtk"/>
 			<property name="os" value="linux"/>
 		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.ingestsrv" target="${target}">
+		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.ingest" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="ws" value="gtk"/>
 			<property name="os" value="linux"/>
@@ -199,7 +199,7 @@
 				<include name="feature.xml"/>
 			</fileset>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.adaptersrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.monitorsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.autobldsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.common:0.0.0,1.12.1174.201206061635,com.raytheon.edex.ingestsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.notifysrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.productsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.uengine:0.0.0,1.12.1174.201206061635,com.raytheon.edex.utilitysrv:0.0.0,1.12.1174.201206061635,com.raytheon.messaging.mhs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.alertviz:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.auth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.awipstools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.decodertools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.distribution:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel.launcher:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.log:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.pointdata:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.purgesrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.python.decoder:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.site:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.topo:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.manualIngest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.nwsauth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.maintenance:0.0.0,1.0.0.201206061635,"/>
+		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.adaptersrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.monitorsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.autobldsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.common:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.ingest:0.0.0,1.12.1174.201206061635,com.raytheon.edex.notifysrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.productsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.uengine:0.0.0,1.12.1174.201206061635,com.raytheon.edex.utilitysrv:0.0.0,1.12.1174.201206061635,com.raytheon.messaging.mhs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.alertviz:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.auth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.awipstools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.decodertools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.distribution:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel.launcher:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.log:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.pointdata:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.purgesrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.python.decoder:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.site:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.topo:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.manualIngest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.nwsauth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.maintenance:0.0.0,1.0.0.201206061635,"/>
 		<eclipse.gatherFeature 
 		   metadataRepository="${p2.build.repo}"
 		   artifactRepository="${p2.build.repo}"
@@ -219,7 +219,7 @@
 				<include name="feature.xml"/>
 			</fileset>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.adaptersrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.monitorsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.autobldsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.common:0.0.0,1.12.1174.201206061635,com.raytheon.edex.ingestsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.notifysrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.productsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.uengine:0.0.0,1.12.1174.201206061635,com.raytheon.edex.utilitysrv:0.0.0,1.12.1174.201206061635,com.raytheon.messaging.mhs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.alertviz:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.auth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.awipstools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.decodertools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.distribution:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel.launcher:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.log:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.pointdata:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.purgesrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.python.decoder:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.site:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.topo:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.manualIngest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.nwsauth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.maintenance:0.0.0,1.0.0.201206061635,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.adaptersrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.monitorsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.autobldsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.common:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.ingest:0.0.0,1.12.1174.201206061635,com.raytheon.edex.notifysrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.productsrv:0.0.0,1.12.1174.201206061635,com.raytheon.edex.uengine:0.0.0,1.12.1174.201206061635,com.raytheon.edex.utilitysrv:0.0.0,1.12.1174.201206061635,com.raytheon.messaging.mhs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.alertviz:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.auth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.awipstools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.decodertools:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.distribution:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.esb.camel.launcher:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.log:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.pointdata:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.purgesrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.python.decoder:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.site:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.topo:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.manualIngest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.nwsauth:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.maintenance:0.0.0,1.0.0.201206061635,"/>
 		<antcall target="rootFiles">
 			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
 		</antcall>

edexOsgi/com.raytheon.uf.edex.core/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.core">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

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

@@ -7,7 +7,6 @@ Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.common.status;bundle-version="1.10.13",
  com.raytheon.uf.common.monitor.cpg;bundle-version="1.0.0",
- com.raytheon.edex.ingestsrv,
  com.raytheon.uf.common.stats;bundle-version="1.0.0",
  com.raytheon.uf.edex.event;bundle-version="1.0.0",
  com.raytheon.uf.common.event;bundle-version="1.0.0"

edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.datadelivery.bandwidth">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
-
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
-</project>

edexOsgi/com.raytheon.uf.edex.datadelivery.event/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.datadelivery.event">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.datadelivery.retrieval">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.datadelivery.service/component-deploy.xml

@@ -1,6 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.datadelivery.service">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />	
-</project>

edexOsgi/com.raytheon.uf.edex.dissemination/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.dissemination">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.distribution/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.distribution">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.esb.camel.launcher">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.esb.camel/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.esb">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.event/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.event">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.raytheon.edex.ingestsrv</name>
+	<name>com.raytheon.uf.edex.ingest</name>
 	<comment></comment>
 	<projects>
 	</projects>

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

@@ -1,14 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ingestsrv Plug-in
+Bundle-Name: Edex Ingest Plug-in
-Bundle-SymbolicName: com.raytheon.edex.ingestsrv
+Bundle-SymbolicName: com.raytheon.uf.edex.ingest
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
+ com.google.guava,
+ org.apache.camel,
  org.apache.commons.lang,
  org.springframework;bundle-version="2.5.6",
  org.slf4j;bundle-version="1.7.5"
-Export-Package: com.raytheon.edex.services
+Export-Package: com.raytheon.uf.edex.ingest
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.raytheon.uf.edex.core,
  com.raytheon.uf.common.status,

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

@@ -7,11 +7,13 @@
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
   
   
-  	<bean id="uriAggregator" class="com.raytheon.uf.edex.esb.camel.DataUriAggregator" />
+  	<bean id="uriAggregator" class="com.raytheon.uf.edex.ingest.notification.DataUriAggregator" />
-  	<bean id="toDataURI" class="com.raytheon.uf.edex.esb.camel.ToDataURI" />
+  	<bean id="toDataURI" class="com.raytheon.uf.edex.ingest.notification.ToDataURI" />
-  	
+
-  	<bean id="persist" class="com.raytheon.edex.services.PersistSrv" factory-method="getInstance"/>
+  	<bean id="persist" class="com.raytheon.uf.edex.ingest.PersistSrv" factory-method="getInstance"/>
-    <bean id="index" class="com.raytheon.edex.services.IndexSrv"/>        
+    <bean id="index" class="com.raytheon.uf.edex.ingest.IndexSrv"/>        
+
+    <bean id="pluginNotifier" class="com.raytheon.uf.edex.ingest.notification.PluginNotifier" />
   
     <bean id="persistCamelRegistered" factory-bean="contextManager"
 		factory-method="register">
@@ -58,16 +60,6 @@
         <route id="notificationAggregation">
         	<from uri="vm:stageNotification"/>
    			<bean ref="uriAggregator" method="addDataUris" />
-        	<!--
-        	<multicast>
-        		<pipeline>
-        			<bean ref="uriAggregator" method="addDataUris" />
-        		</pipeline>
-        		<pipeline>
-        			<to uri="jms-generic:queue:subscriptions" />
-        		</pipeline>
-        	</multicast>
-        	-->
         </route>
         
         <route id="notificationTimer">
@@ -79,5 +71,5 @@
         	    <to uri="jms-generic:topic:edex.alerts?timeToLive=60000&amp;deliveryPersistent=false"/>
         	</filter>
         </route>
-    </camelContext>
+    </camelContext>    
- </beans>
+ </beans>

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

@@ -4,6 +4,6 @@
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
     
-   <bean id="index" class="com.raytheon.edex.services.IndexSrv"/>        
+   <bean id="index" class="com.raytheon.uf.edex.ingest.IndexSrv"/>        
   
- </beans>
+ </beans>

edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/IndexSrv.java

@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.services;
+package com.raytheon.uf.edex.ingest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/PersistSrv.java

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

edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/DataUriAggregator.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.esb.camel;
+package com.raytheon.uf.edex.ingest.notification;
 
 import java.util.ArrayList;
 import java.util.List;

edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.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.notification;
+package com.raytheon.uf.edex.ingest.notification;
 
 import java.util.ArrayList;
 import java.util.List;

edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/ToDataURI.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.esb.camel;
+package com.raytheon.uf.edex.ingest.notification;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 

edexOsgi/com.raytheon.uf.edex.log/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.log">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.maintenance/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.maintenance">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.management/component-deploy.xml

@@ -1,8 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.edex.management">
-	
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.notification/.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.notification/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.raytheon.uf.edex.notification</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.notification/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

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

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Distributor
-Bundle-SymbolicName: com.raytheon.uf.edex.notification
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.apache.camel;bundle-version="1.0.0",
- com.google.guava;bundle-version="1.0.0",
- com.raytheon.uf.edex.core;bundle-version="1.12.1174",
- com.raytheon.uf.common.status;bundle-version="1.12.1174"

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

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

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

@@ -1,6 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
-  
-	<bean id="pluginNotifier" class="com.raytheon.uf.edex.notification.PluginNotifier" />
-</beans>