diff --git a/RadarServer/com.raytheon.rcm.lib/component-deploy.xml b/RadarServer/com.raytheon.rcm.lib/component-deploy.xml deleted file mode 100644 index fb828b1a35..0000000000 --- a/RadarServer/com.raytheon.rcm.lib/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.edex.adaptersrv/component-deploy.xml b/edexOsgi/com.raytheon.edex.adaptersrv/component-deploy.xml deleted file mode 100644 index 51b3a6284d..0000000000 --- a/edexOsgi/com.raytheon.edex.adaptersrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/component-deploy.xml b/edexOsgi/com.raytheon.edex.ingestsrv/component-deploy.xml deleted file mode 100644 index 47b13efb61..0000000000 --- a/edexOsgi/com.raytheon.edex.ingestsrv/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrv.java b/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrv.java deleted file mode 100644 index 12cde9fafd..0000000000 --- a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrv.java +++ /dev/null @@ -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.
- * - * This implementation moves the file to the specified archive directory. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * 12/12/2007   561         dfitch      Initial Creation
- * 
- *
- * - * @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 lstOfArchiveSrv = null; - - private static Map map = new HashMap(); - - /** - * Define the datatype and index filtering this instance handles. - */ - private String pluginName = ""; - - /** - * Constructor. - */ - public ArchiveSrv() { - - numMessagesServed = numMessagesCopied = 0; - if (null == lstOfArchiveSrv) { - lstOfArchiveSrv = new ArrayList(); - } - 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 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; - } - - } -} diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrvInterface.java b/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrvInterface.java deleted file mode 100644 index a3abe5f4b9..0000000000 --- a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/ArchiveSrvInterface.java +++ /dev/null @@ -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.
- * - * This implementation moves the file to the specified archive directory. - * - * 
- * 
- * SOFTWARE HISTORY
- * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * 12/12/2007   561         dfitch      Initial Creation	
- * 
- *
- * - * @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); - -} diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/package-info.java b/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/package-info.java deleted file mode 100644 index 57059e287f..0000000000 --- a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/package-info.java +++ /dev/null @@ -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; \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/component-deploy.xml b/edexOsgi/com.raytheon.edex.plugin.goessounding/component-deploy.xml deleted file mode 100644 index c3291f3c1d..0000000000 --- a/edexOsgi/com.raytheon.edex.plugin.goessounding/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.rpgenvdata/component-deploy.xml b/edexOsgi/com.raytheon.edex.rpgenvdata/component-deploy.xml deleted file mode 100644 index f7f5dc9165..0000000000 --- a/edexOsgi/com.raytheon.edex.rpgenvdata/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.messaging.mhs/component-deploy.xml b/edexOsgi/com.raytheon.messaging.mhs/component-deploy.xml deleted file mode 100644 index c5eca59d04..0000000000 --- a/edexOsgi/com.raytheon.messaging.mhs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.activetable/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.activetable/component-deploy.xml deleted file mode 100644 index 8326cf19e6..0000000000 --- a/edexOsgi/com.raytheon.uf.common.activetable/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.alertmonitor/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.alertmonitor/component-deploy.xml deleted file mode 100644 index 3f9638929b..0000000000 --- a/edexOsgi/com.raytheon.uf.common.alertmonitor/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.alertviz/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.alertviz/component-deploy.xml deleted file mode 100644 index e91a96418a..0000000000 --- a/edexOsgi/com.raytheon.uf.common.alertviz/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.auth/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.auth/component-deploy.xml deleted file mode 100644 index 6cb10d03a7..0000000000 --- a/edexOsgi/com.raytheon.uf.common.auth/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.awipstools/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.awipstools/component-deploy.xml deleted file mode 100644 index 980484cb85..0000000000 --- a/edexOsgi/com.raytheon.uf.common.awipstools/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.cache/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.cache/component-deploy.xml deleted file mode 100644 index b575e6e13d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.cache/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.colormap/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.colormap/component-deploy.xml deleted file mode 100644 index 794bb2bc4d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.colormap/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.comm/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.comm/component-deploy.xml deleted file mode 100644 index 3942f3abb2..0000000000 --- a/edexOsgi/com.raytheon.uf.common.comm/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.event/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.datadelivery.event/component-deploy.xml deleted file mode 100644 index 86012d433a..0000000000 --- a/edexOsgi/com.raytheon.uf.common.datadelivery.event/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.harvester/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.datadelivery.harvester/component-deploy.xml deleted file mode 100644 index be6bc841ce..0000000000 --- a/edexOsgi/com.raytheon.uf.common.datadelivery.harvester/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/component-deploy.xml deleted file mode 100644 index 980c1c8cad..0000000000 --- a/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/component-deploy.xml deleted file mode 100644 index 9a6944a799..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/component-deploy.xml deleted file mode 100644 index 2f315a7eae..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/component-deploy.xml deleted file mode 100644 index c478c5a97d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/component-deploy.xml deleted file mode 100644 index 4219c5bbfd..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/component-deploy.xml deleted file mode 100644 index 0915fc433b..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/component-deploy.xml deleted file mode 100644 index bf51d2dd26..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/component-deploy.xml deleted file mode 100644 index ae36572695..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/component-deploy.xml deleted file mode 100644 index ff9355468a..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/component-deploy.xml deleted file mode 100644 index f8fe79c72c..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/component-deploy.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/component-deploy.xml deleted file mode 100644 index d8d21821e7..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/component-deploy.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/component-deploy.xml deleted file mode 100644 index f46cd7ff30..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/component-deploy.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.level/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.level/component-deploy.xml deleted file mode 100644 index f619812901..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.level/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/component-deploy.xml deleted file mode 100644 index c596f8f95d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.pirep/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.pirep/component-deploy.xml deleted file mode 100644 index 4d703b4bd1..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.pirep/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qc/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.qc/component-deploy.xml deleted file mode 100644 index 7ef8f7eced..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.qc/component-deploy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.shef/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.shef/component-deploy.xml deleted file mode 100644 index 132cce8c8a..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.shef/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/component-deploy.xml deleted file mode 100644 index 034c82167e..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/component-deploy.xml deleted file mode 100644 index 3ae74a6aa1..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/component-deploy.xml deleted file mode 100644 index 526e5b322e..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.text/component-deploy.xml deleted file mode 100644 index fcf1bb750f..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/component-deploy.xml deleted file mode 100644 index 51451bdf06..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/component-deploy.xml deleted file mode 100644 index 86eb8ad5e4..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataquery/component-deploy.xml deleted file mode 100644 index 4cb6427a36..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dataquery/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.datastorage/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.datastorage/component-deploy.xml deleted file mode 100644 index 3ff36e2f22..0000000000 --- a/edexOsgi/com.raytheon.uf.common.datastorage/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.derivparam/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.derivparam/component-deploy.xml deleted file mode 100644 index 762594adb3..0000000000 --- a/edexOsgi/com.raytheon.uf.common.derivparam/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dissemination/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dissemination/component-deploy.xml deleted file mode 100644 index 59bbfb4789..0000000000 --- a/edexOsgi/com.raytheon.uf.common.dissemination/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.event/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.event/component-deploy.xml deleted file mode 100644 index a4b7d8c4f6..0000000000 --- a/edexOsgi/com.raytheon.uf.common.event/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.jms/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.jms/component-deploy.xml deleted file mode 100644 index 6b5beaf577..0000000000 --- a/edexOsgi/com.raytheon.uf.common.jms/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.management/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.management/component-deploy.xml deleted file mode 100644 index 9b85be90bc..0000000000 --- a/edexOsgi/com.raytheon.uf.common.management/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.monitor.cpg/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.monitor.cpg/component-deploy.xml deleted file mode 100644 index c5301a843d..0000000000 --- a/edexOsgi/com.raytheon.uf.common.monitor.cpg/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/component-deploy.xml deleted file mode 100644 index 133448eea1..0000000000 --- a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.pointdata/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.pointdata/component-deploy.xml deleted file mode 100644 index fe96533a56..0000000000 --- a/edexOsgi/com.raytheon.uf.common.pointdata/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.pypies/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.pypies/component-deploy.xml deleted file mode 100644 index 98aee920da..0000000000 --- a/edexOsgi/com.raytheon.uf.common.pypies/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.registry.schemas.iso19115/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.registry.schemas.iso19115/component-deploy.xml deleted file mode 100644 index fdd7d2961f..0000000000 --- a/edexOsgi/com.raytheon.uf.common.registry.schemas.iso19115/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.serialization.comm/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.serialization.comm/component-deploy.xml deleted file mode 100644 index aa5510c6ab..0000000000 --- a/edexOsgi/com.raytheon.uf.common.serialization.comm/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.site/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.site/component-deploy.xml deleted file mode 100644 index aadf283d76..0000000000 --- a/edexOsgi/com.raytheon.uf.common.site/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.status/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.status/component-deploy.xml deleted file mode 100644 index 5a1e7e84f7..0000000000 --- a/edexOsgi/com.raytheon.uf.common.status/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.tafqueue/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.tafqueue/component-deploy.xml deleted file mode 100644 index 774cfa1df3..0000000000 --- a/edexOsgi/com.raytheon.uf.common.tafqueue/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml index 403e49cd4b..0cf40db440 100644 --- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml @@ -35,8 +35,8 @@ value="com.raytheon.uf.common.dataplugin.warning.WarningRecord" /> - - + + diff --git a/edexOsgi/com.raytheon.uf.edex.alertviz/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.alertviz/component-deploy.xml deleted file mode 100644 index 56c801305e..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.alertviz/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.auth/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.auth/component-deploy.xml deleted file mode 100644 index 7a2cd9757b..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.auth/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.awipstools/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.awipstools/component-deploy.xml deleted file mode 100644 index b74ac7e6cc..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.awipstools/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml index 86abdf2f3c..6862aaabed 100644 --- a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml @@ -35,7 +35,7 @@ unpack="false"/> - - diff --git a/edexOsgi/com.raytheon.uf.edex.core.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.core.feature/build.xml index 76b8884e93..c9a6e7eb0a 100644 --- a/edexOsgi/com.raytheon.uf.edex.core.feature/build.xml +++ b/edexOsgi/com.raytheon.uf.edex.core.feature/build.xml @@ -81,7 +81,7 @@ - + @@ -199,7 +199,7 @@ - + - + diff --git a/edexOsgi/com.raytheon.uf.edex.core/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.core/component-deploy.xml deleted file mode 100644 index 17ff3a564b..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.core/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF index e3b480ec6f..3c357b0d15 100644 --- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF +++ b/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" diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/component-deploy.xml deleted file mode 100644 index 25643ae3a1..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/component-deploy.xml deleted file mode 100644 index 749a2e25a7..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/component-deploy.xml deleted file mode 100644 index 90d15d4241..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/component-deploy.xml deleted file mode 100644 index 161f5ed125..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/component-deploy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.dissemination/component-deploy.xml deleted file mode 100644 index 9f8621b6b7..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.dissemination/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.distribution/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.distribution/component-deploy.xml deleted file mode 100644 index 10ad92d793..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.distribution/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/component-deploy.xml deleted file mode 100644 index 432d89bcdb..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.esb.camel/component-deploy.xml deleted file mode 100644 index 2d9e18e91c..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.esb.camel/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.event/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.event/component-deploy.xml deleted file mode 100644 index 98acd607b6..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.event/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/.classpath b/edexOsgi/com.raytheon.uf.edex.ingest/.classpath similarity index 100% rename from edexOsgi/com.raytheon.edex.ingestsrv/.classpath rename to edexOsgi/com.raytheon.uf.edex.ingest/.classpath diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/.project b/edexOsgi/com.raytheon.uf.edex.ingest/.project similarity index 93% rename from edexOsgi/com.raytheon.edex.ingestsrv/.project rename to edexOsgi/com.raytheon.uf.edex.ingest/.project index c796161b2f..28bcea0b1a 100644 --- a/edexOsgi/com.raytheon.edex.ingestsrv/.project +++ b/edexOsgi/com.raytheon.uf.edex.ingest/.project @@ -1,6 +1,6 @@ - com.raytheon.edex.ingestsrv + com.raytheon.uf.edex.ingest diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.ingest/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from edexOsgi/com.raytheon.edex.ingestsrv/.settings/org.eclipse.jdt.core.prefs rename to edexOsgi/com.raytheon.uf.edex.ingest/.settings/org.eclipse.jdt.core.prefs diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.ingest/META-INF/MANIFEST.MF similarity index 71% rename from edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF rename to edexOsgi/com.raytheon.uf.edex.ingest/META-INF/MANIFEST.MF index c583801bba..964144d6b0 100644 --- a/edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF +++ b/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-SymbolicName: com.raytheon.edex.ingestsrv +Bundle-Name: Edex Ingest Plug-in +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, diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/build.properties b/edexOsgi/com.raytheon.uf.edex.ingest/build.properties similarity index 100% rename from edexOsgi/com.raytheon.edex.ingestsrv/build.properties rename to edexOsgi/com.raytheon.uf.edex.ingest/build.properties diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/com.raytheon.edex.ingestsrv.ecl b/edexOsgi/com.raytheon.uf.edex.ingest/com.raytheon.uf.edex.ingest.ecl similarity index 100% rename from edexOsgi/com.raytheon.edex.ingestsrv/com.raytheon.edex.ingestsrv.ecl rename to edexOsgi/com.raytheon.uf.edex.ingest/com.raytheon.uf.edex.ingest.ecl diff --git a/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/.persist-ingest.xml.swp b/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/.persist-ingest.xml.swp new file mode 100644 index 0000000000..4a6bbcb6b9 Binary files /dev/null and b/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/.persist-ingest.xml.swp differ diff --git a/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/.persist-request.xml.swp b/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/.persist-request.xml.swp new file mode 100644 index 0000000000..b12de2cc11 Binary files /dev/null and b/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/.persist-request.xml.swp differ diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml b/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml similarity index 81% rename from edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml rename to edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml index ca32da1f75..f0ba066b0e 100644 --- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml +++ b/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"> - - - - - + + + + + + + @@ -58,16 +60,6 @@ - @@ -79,5 +71,5 @@ - - \ No newline at end of file + + diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml b/edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml similarity index 79% rename from edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml rename to edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml index cafb0835fd..5e69e19501 100644 --- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml +++ b/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"> - + - \ No newline at end of file + diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/IndexSrv.java b/edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/IndexSrv.java similarity index 99% rename from edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/IndexSrv.java rename to edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/IndexSrv.java index e0f678e18d..0966dbf6a8 100644 --- a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/IndexSrv.java +++ b/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; diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/PersistSrv.java b/edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/PersistSrv.java similarity index 99% rename from edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/PersistSrv.java rename to edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/PersistSrv.java index 0e4cc8f3e8..cf9b8576e6 100644 --- a/edexOsgi/com.raytheon.edex.ingestsrv/src/com/raytheon/edex/services/PersistSrv.java +++ b/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; diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/DataUriAggregator.java b/edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/DataUriAggregator.java similarity index 98% rename from edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/DataUriAggregator.java rename to edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/DataUriAggregator.java index ee53cdf46e..75c7141183 100644 --- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/DataUriAggregator.java +++ b/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; diff --git a/edexOsgi/com.raytheon.uf.edex.notification/src/com/raytheon/uf/edex/notification/PluginNotifier.java b/edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java similarity index 98% rename from edexOsgi/com.raytheon.uf.edex.notification/src/com/raytheon/uf/edex/notification/PluginNotifier.java rename to edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java index 35651ccffa..aa03dd085b 100644 --- a/edexOsgi/com.raytheon.uf.edex.notification/src/com/raytheon/uf/edex/notification/PluginNotifier.java +++ b/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; diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ToDataURI.java b/edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/ToDataURI.java similarity index 96% rename from edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ToDataURI.java rename to edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/ToDataURI.java index d47fbbbe02..8261d6b071 100644 --- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/ToDataURI.java +++ b/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; diff --git a/edexOsgi/com.raytheon.uf.edex.log/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.log/component-deploy.xml deleted file mode 100644 index e5fa9381f7..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.log/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.maintenance/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.maintenance/component-deploy.xml deleted file mode 100644 index 2fa640c974..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.maintenance/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.management/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.management/component-deploy.xml deleted file mode 100644 index ef3fa31519..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.management/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.notification/.classpath b/edexOsgi/com.raytheon.uf.edex.notification/.classpath deleted file mode 100644 index ad32c83a78..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.notification/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.notification/.project b/edexOsgi/com.raytheon.uf.edex.notification/.project deleted file mode 100644 index 0dbeb2c2e9..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.notification/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.raytheon.uf.edex.notification - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/edexOsgi/com.raytheon.uf.edex.notification/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.notification/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b63063..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.notification/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -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 diff --git a/edexOsgi/com.raytheon.uf.edex.notification/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.notification/META-INF/MANIFEST.MF deleted file mode 100644 index 7ffc6e619a..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.notification/META-INF/MANIFEST.MF +++ /dev/null @@ -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" diff --git a/edexOsgi/com.raytheon.uf.edex.notification/build.properties b/edexOsgi/com.raytheon.uf.edex.notification/build.properties deleted file mode 100644 index 5791d48d5f..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.notification/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - res/ diff --git a/edexOsgi/com.raytheon.uf.edex.notification/res/spring/notification-ingest.xml b/edexOsgi/com.raytheon.uf.edex.notification/res/spring/notification-ingest.xml deleted file mode 100644 index ea051007a5..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.notification/res/spring/notification-ingest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/component-deploy.xml deleted file mode 100644 index 29b7518d04..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fog/component-deploy.xml deleted file mode 100644 index 2b0b602a00..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.level/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.level/component-deploy.xml deleted file mode 100644 index 21ff62fc0b..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.level/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/component-deploy.xml deleted file mode 100644 index 3475733f78..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/component-deploy.xml deleted file mode 100644 index 24ac4bd0ee..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/component-deploy.xml deleted file mode 100644 index e0a6e2bfcd..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.pointdata/component-deploy.xml deleted file mode 100644 index 9ef567d32e..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.pointdata/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.purgesrv/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.purgesrv/component-deploy.xml deleted file mode 100644 index b2c3395b24..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.purgesrv/component-deploy.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.site/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.site/component-deploy.xml deleted file mode 100644 index 74e6637952..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.site/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml deleted file mode 100644 index 3a7c439e89..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.useradmin/component-deploy.xml b/edexOsgi/com.raytheon.uf.edex.useradmin/component-deploy.xml deleted file mode 100644 index fc956c8caf..0000000000 --- a/edexOsgi/com.raytheon.uf.edex.useradmin/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/component-deploy.xml b/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/component-deploy.xml deleted file mode 100644 index 897420c4f2..0000000000 --- a/edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/component-deploy.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ncep/edu.wisc.ssec.mcidas/component-deploy.xml b/ncep/edu.wisc.ssec.mcidas/component-deploy.xml deleted file mode 100644 index 4d6e732a18..0000000000 --- a/ncep/edu.wisc.ssec.mcidas/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml deleted file mode 100644 index 9b691065f8..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml deleted file mode 100644 index 7b3c481790..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml deleted file mode 100644 index 4c1455d742..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml deleted file mode 100644 index 6d06d9c6d7..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml deleted file mode 100644 index 138c84c754..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/component-deploy.xml deleted file mode 100644 index 4bddea3a50..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml deleted file mode 100644 index 92cbfc15e2..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/component-deploy.xml deleted file mode 100644 index 24076d6711..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml deleted file mode 100644 index 75dd10e1f3..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/component-deploy.xml deleted file mode 100644 index 540abc36b8..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/component-deploy.xml deleted file mode 100644 index 0ac9792e40..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/component-deploy.xml deleted file mode 100644 index 373dbfe401..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml deleted file mode 100644 index eebaed9875..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml deleted file mode 100644 index d68e103639..0000000000 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.common/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common/component-deploy.xml deleted file mode 100644 index ff8e58cff7..0000000000 --- a/ncep/gov.noaa.nws.ncep.common/component-deploy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/ncep/gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml deleted file mode 100644 index bc28b70d62..0000000000 --- a/ncep/gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - -