diff --git a/edexOsgi/com.raytheon.uf.edex.binlightning.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.binlightning.feature/build.xml
deleted file mode 100644
index e1094dd231..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.binlightning.feature/build.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.binlightning.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.binlightning" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.binlightning.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.binlightning.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.binlightning:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.binlightning:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.binlightning.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.binlightning.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.binlightning.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.binlightning.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.binlightning.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.binlightning.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.bufr.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.bufr.feature/build.xml
deleted file mode 100644
index 0de1d971d4..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.bufr.feature/build.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.bufr.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrncwf" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrascat" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrquikscat" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.bufrtools" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.bufrascat" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrssmi" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrsigwx" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.bufrsigwx" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrhdw" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.bufrquikscat" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.bufrssmi" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.bufrhdw" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.bufrncwf" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.bufrmos" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrua" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.bufrua" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.bufrmthdw" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.bufrmthdw" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.bufr.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.bufr.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.edex.plugin.bufrascat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrhdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrmthdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrncwf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrquikscat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrsigwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrssmi:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.bufrtools:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.bufrmos:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.bufrua:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrascat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrhdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrmthdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrncwf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrquikscat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrssmi:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrua:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrsigwx:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.edex.plugin.bufrascat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrhdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrmthdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrncwf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrquikscat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrsigwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.bufrssmi:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.bufrtools:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.bufrmos:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.bufrua:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrascat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrhdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrmthdw:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrncwf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrquikscat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrssmi:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrua:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.bufrsigwx:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.bufr.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.bufr.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.bufr.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.bufr.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.bufr.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.bufr.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.common.core.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.common.core.feature/build.xml
deleted file mode 100644
index 14898e7242..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.common.core.feature/build.xml
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.common.core.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.status" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.python" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.jms" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.util" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.comm" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.serialization" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.colormap" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.serialization.comm" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.datastorage" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.auth" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.localization" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.plugin.nwsauth" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dissemination" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.awipstools" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.management" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.cache" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.menus" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.message" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.datastorage.remote" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.alertmonitor" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.alertviz" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.time" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataquery" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.level" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.geospatial" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.pointdata" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.sounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.core" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.database" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.site" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.datastorage.hdf5" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.topo" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.pypies" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.hlstopo" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.derivparam" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.management" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.climo" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.common.core.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.common.core.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140/feature.xml"  selfVersion="1.0.0.201206071140" featureIds="" pluginIds="com.raytheon.uf.common.alertviz:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.awipstools:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.climo:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.cache:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dataquery:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.datastorage.hdf5:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.datastorage:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.datastorage.remote:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dataplugin.level:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.derivparam:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dissemination:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.geospatial:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.menus:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.time:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dataplugin:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.message:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.util:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.status:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.serialization:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.serialization.comm:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.auth:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.comm:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.localization:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.pointdata:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.pypies:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.python:0.0.0,1.12.1174.201206071140,com.raytheon.uf.edex.core:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.site:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.sounding:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.topo:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.management:0.0.0,1.0.0.201206071140,com.raytheon.uf.edex.management:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.colormap:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.alertmonitor:0.0.0,1.12.1174.201206071140,com.raytheon.uf.edex.database:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.hlstopo:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.jms:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.plugin.nwsauth:0.0.0,1.12.1174.201206071140,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140/feature.xml"  selfVersion="1.0.0.201206071140" featureIds="" pluginIds="com.raytheon.uf.common.alertviz:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.awipstools:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.climo:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.cache:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dataquery:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.datastorage.hdf5:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.datastorage:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.datastorage.remote:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dataplugin.level:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.derivparam:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dissemination:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.geospatial:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.menus:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.time:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.dataplugin:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.message:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.util:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.status:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.serialization:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.serialization.comm:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.auth:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.comm:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.localization:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.pointdata:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.pypies:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.python:0.0.0,1.12.1174.201206071140,com.raytheon.uf.edex.core:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.site:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.sounding:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.topo:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.management:0.0.0,1.0.0.201206071140,com.raytheon.uf.edex.management:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.colormap:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.alertmonitor:0.0.0,1.12.1174.201206071140,com.raytheon.uf.edex.database:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.hlstopo:0.0.0,1.0.0.201206071140,com.raytheon.uf.common.jms:0.0.0,1.12.1174.201206071140,com.raytheon.uf.common.plugin.nwsauth:0.0.0,1.12.1174.201206071140,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.common.core.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.common.core.feature.source_1.0.0.201206071140/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.common.core.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.common.core.feature_1.0.0.201206071140.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.common.core.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.common.core.feature.source_1.0.0.201206071140/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.core.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.core.feature/build.xml
deleted file mode 100644
index c9a6e7eb0a..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.core.feature/build.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.core.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.messaging.mhs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.esb.camel.launcher" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.distribution" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.common" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.auth" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.nwsauth" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.decodertools" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.monitorsrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.site" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.utilitysrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.notifysrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.adaptersrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.purgesrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.manualIngest" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<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"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.esb.camel" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.awipstools" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.python.decoder" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.uengine" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.alertviz" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.productsrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.autobldsrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.pointdata" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.maintenance" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.log" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.topo" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.core.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.core.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<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.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}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.core.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<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.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>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.core.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.core.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.core.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.core.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.core.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.core.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.cots.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.cots.feature/build.xml
deleted file mode 100644
index 24c8264175..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.cots.feature/build.xml
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.cots.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../../ncep/edu.wisc.ssec.mcidas" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-
-                <ant antfile="build.xml" dir="../../ncep/gov.nasa.gsfc.fits" target="${target}">
-                        <property name="arch" value="x86"/>
-                        <property name="ws" value="gtk"/>
-                        <property name="os" value="linux"/>
-                </ant>
-
-		<ant antfile="build.xml" dir="../../cots/org.eclipse.jetty" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.dom4j" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/javax.media.opengl" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/javax.mail" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/javax.persistence" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.objectweb" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/javax.measure" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/net.sf.ehcache" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.management" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.camel" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.jep" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/com.facebook.thrift" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/com.mchange" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/net.sf.cglib" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.postgres" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/com.opensymphony.ognl" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/javax.vecmath" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.cli" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/com.sun.jndi.nis" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/uk.ltd.getahead" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.pool" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.codec" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.tools.bzip2" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/com.sun.jna" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.collections" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.validator" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/javax.jms" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.log4j" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.slf4j" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/ucar.nc2" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.hibernate" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.logging" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.geotools" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.springframework" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.http" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.activemq" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.mina" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.jboss.cache" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/javax.activation" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.beanutils" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.velocity" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.digester" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.commons.configuration" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/org.apache.qpid" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../../cots/ncsa.hdf5" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.cots.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.cots.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251/feature.xml"  selfVersion="1.0.0.201206071251" featureIds="" pluginIds="com.facebook.thrift:0.0.0,1.0.0.201206071251,com.mchange:0.0.0,1.0.0.201206071251,javax.activation:0.0.0,1.0.0.201206071251,javax.mail:0.0.0,1.0.0.201206071251,javax.measure:0.0.0,1.0.0.201206071251,javax.media.opengl:0.0.0,1.1.0,javax.persistence:0.0.0,1.0.0.201206071251,javax.vecmath:0.0.0,1.3.1,ncsa.hdf5:0.0.0,2.4.0,net.sf.ehcache:0.0.0,1.0.0.201206071251,org.apache.mina:0.0.0,1.0.0.201206071251,org.apache.activemq:0.0.0,5.2.0,org.apache.commons.beanutils:0.0.0,1.8.3,org.apache.commons.codec:0.0.0,1.4.0,org.apache.commons.collections:0.0.0,3.2.0,org.apache.commons.configuration:0.0.0,1.6.0,org.apache.commons.digester:0.0.0,1.8.1,org.apache.commons.logging:0.0.0,1.1.1,org.apache.commons.pool:0.0.0,1.3.0,org.apache.commons.validator:0.0.0,1.2.0,org.apache.velocity:0.0.0,1.5.0,org.apache.log4j:0.0.0,1.0.0.201206071251,org.slf4j:0.0.0,1.6.1,org.dom4j:0.0.0,1.0.0.201206071251,org.geotools:0.0.0,2.6.4,org.jep:0.0.0,1.0.0.201206071251,ucar.nc2:0.0.0,1.0.0.201206071251,uk.ltd.getahead:0.0.0,1.0.0.201206071251,org.objectweb:0.0.0,1.0.0.201206071251,org.apache.camel:0.0.0,1.0.0.201206071251,org.postgres:0.0.0,1.0.0.201206071251,net.sf.cglib:0.0.0,2.1.3,org.springframework:0.0.0,2.5.6,org.apache.tools.bzip2:0.0.0,1.0.0.201206071251,com.opensymphony.ognl:0.0.0,1.0.0.201206071251,javax.jms:0.0.0,1.0.0.201206071251,org.apache.qpid:0.0.0,1.0.0.7,org.apache.commons.management:0.0.0,1.0.0.201206071251,org.hibernate:0.0.0,1.0.0.201206071251,org.jboss.cache:0.0.0,1.0.0.201206071251,org.eclipse.jetty:0.0.0,7.1.4.v20100610,edu.wisc.ssec.mcidas:0.0.0,1.0.0.201206071251,com.sun.jna:0.0.0,3.3.0,org.apache.http:0.0.0,4.1.2,com.sun.jndi.nis:0.0.0,1.0.0.201206071251,org.apache.commons.cli:0.0.0,1.0.0.201206071251,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251/feature.xml"  selfVersion="1.0.0.201206071251" featureIds="" pluginIds="com.facebook.thrift:0.0.0,1.0.0.201206071251,com.mchange:0.0.0,1.0.0.201206071251,javax.activation:0.0.0,1.0.0.201206071251,javax.mail:0.0.0,1.0.0.201206071251,javax.measure:0.0.0,1.0.0.201206071251,javax.media.opengl:0.0.0,1.1.0,javax.persistence:0.0.0,1.0.0.201206071251,javax.vecmath:0.0.0,1.3.1,ncsa.hdf5:0.0.0,2.4.0,net.sf.ehcache:0.0.0,1.0.0.201206071251,org.apache.mina:0.0.0,1.0.0.201206071251,org.apache.activemq:0.0.0,5.2.0,org.apache.commons.beanutils:0.0.0,1.8.3,org.apache.commons.codec:0.0.0,1.4.0,org.apache.commons.collections:0.0.0,3.2.0,org.apache.commons.configuration:0.0.0,1.6.0,org.apache.commons.digester:0.0.0,1.8.1,org.apache.commons.logging:0.0.0,1.1.1,org.apache.commons.pool:0.0.0,1.3.0,org.apache.commons.validator:0.0.0,1.2.0,org.apache.velocity:0.0.0,1.5.0,org.apache.log4j:0.0.0,1.0.0.201206071251,org.slf4j:0.0.0,1.6.1,org.dom4j:0.0.0,1.0.0.201206071251,org.geotools:0.0.0,2.6.4,org.jep:0.0.0,1.0.0.201206071251,ucar.nc2:0.0.0,1.0.0.201206071251,uk.ltd.getahead:0.0.0,1.0.0.201206071251,org.objectweb:0.0.0,1.0.0.201206071251,org.apache.camel:0.0.0,1.0.0.201206071251,org.postgres:0.0.0,1.0.0.201206071251,net.sf.cglib:0.0.0,2.1.3,org.springframework:0.0.0,2.5.6,org.apache.tools.bzip2:0.0.0,1.0.0.201206071251,com.opensymphony.ognl:0.0.0,1.0.0.201206071251,javax.jms:0.0.0,1.0.0.201206071251,org.apache.qpid:0.0.0,1.0.0.7,org.apache.commons.management:0.0.0,1.0.0.201206071251,org.hibernate:0.0.0,1.0.0.201206071251,org.jboss.cache:0.0.0,1.0.0.201206071251,org.eclipse.jetty:0.0.0,7.1.4.v20100610,edu.wisc.ssec.mcidas:0.0.0,1.0.0.201206071251,com.sun.jna:0.0.0,3.3.0,org.apache.http:0.0.0,4.1.2,com.sun.jndi.nis:0.0.0,1.0.0.201206071251,org.apache.commons.cli:0.0.0,1.0.0.201206071251,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.cots.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.cots.feature.source_1.0.0.201206071251/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.cots.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.cots.feature_1.0.0.201206071251.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.cots.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.cots.feature.source_1.0.0.201206071251/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.dat.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.dat.feature/build.xml
deleted file mode 100644
index bae35a71a8..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.dat.feature/build.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.dat.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.monitor.cpg" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.cpgsrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.monitor" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.fog" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.cwat" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.vil" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.fssobs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.fssobs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.fog" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.scan.common" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.vil" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.qpf" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.ffmp" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.scan" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.dat.utils" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.ffmp" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.scan" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.qpf" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.cwat" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.preciprate" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.preciprate" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.dat.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.dat.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.monitor.cpg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.monitor:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.dat.utils:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vil:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vil:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.cpgsrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qpf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qpf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ffmp:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ffmp:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.preciprate:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.preciprate:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.scan:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.scan:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.fssobs:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.plugin.scan.common:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.plugin.fssobs:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.fog:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.fog:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.monitor.cpg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.monitor:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.dat.utils:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vil:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vil:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.cpgsrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qpf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qpf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ffmp:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ffmp:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwat:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.preciprate:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.preciprate:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.scan:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.scan:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.fssobs:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.plugin.scan.common:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.plugin.fssobs:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.fog:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.fog:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.dat.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.dat.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.dat.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dat.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.dat.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.dat.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/build.xml
deleted file mode 100644
index 29e01809e2..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/build.xml
+++ /dev/null
@@ -1,433 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.dataplugins.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.ldad" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.ldadhydro" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.airep" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.poessounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.acars" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.goessounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.obs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.airep" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.recco" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.pirep" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.acarssounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.ccfp" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.loctables" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.vaa" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.mesowest" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.pirep" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.acars" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.level" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.ldadmanual" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.taf" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.level.handler" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.binlightning" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.qc" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.acarssounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.sfcobs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.qc" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.tcg" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.tcg" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.obs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.profiler" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.svrwx" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.svrwx" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.ldadhydro" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.goessounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.poessounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.lsr" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.lsr" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.cwa" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.cwa" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.ldadmesonet" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.ldadmesonet" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.vaa" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.profiler" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.sfcobs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.tcs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.tcs" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.modelsounding" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.redbook" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.ldadprofiler" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.dataplugins.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.dataplugins.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.binlightning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ldadhydro:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.goessounding:0.0.0,1.0.0.201206061635,com.raytheon.edex.plugin.airep:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ccfp:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.goessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadhydro:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldad:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadmanual:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadprofiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.modelsounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.obs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.pirep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.poessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.recco:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.redbook:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.taf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level.handler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.loctables:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.mesowest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.poessounding:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.airep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.pirep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.obs:0.0.0,1.0.0.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.binlightning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ldadhydro:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.goessounding:0.0.0,1.0.0.201206061635,com.raytheon.edex.plugin.airep:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ccfp:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.goessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadhydro:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldad:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadmanual:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadprofiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.modelsounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.obs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.pirep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.poessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.recco:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.redbook:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.taf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level.handler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.loctables:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.mesowest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.poessounding:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.airep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.pirep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.obs:0.0.0,1.0.0.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.dataplugins.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.dataplugins.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.dataplugins.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.dataplugins.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.gfe.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.gfe.feature/build.xml
deleted file mode 100644
index 29a0b38fb2..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.gfe.feature/build.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.gfe.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.gfe" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.gfe" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.gfe.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.gfe.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.gfe:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.gfe:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.gfe:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.gfe:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.gfe.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.gfe.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.gfe.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.gfe.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.gfe.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.gfe.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.grib.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.grib.feature/build.xml
deleted file mode 100644
index 6abdcc0c80..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.grib.feature/build.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.grib.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.grib" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.grib" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.grib.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.grib.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.grib:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.grib:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.grib:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.grib:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.grib.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.grib.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.grib.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.grib.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.grib.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.grib.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.hydro.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.hydro.feature/build.xml
deleted file mode 100644
index cb4526d23e..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.hydro.feature/build.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.hydro.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.ohd" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.hydro" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.mpe" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.shef" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.metartohmdbsrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.shef" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.ohd" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.hydro.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.hydro.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.ohd:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.ohd:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.shef:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.hydro:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.mpe:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.metartohmdbsrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.shef:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.ohd:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.ohd:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.shef:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.hydro:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.mpe:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.metartohmdbsrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.shef:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.hydro.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.hydro.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.hydro.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.hydro.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.hydro.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.hydro.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.radar.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.radar.feature/build.xml
deleted file mode 100644
index 7860b1a6cf..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.radar.feature/build.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.radar.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../../RadarServer/com.raytheon.rcm.lib" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.radar" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.radar" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.rpgenvdata" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.radar.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.radar.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.radar:0.0.0,1.12.1174.201206061635,com.raytheon.edex.rpgenvdata:0.0.0,1.12.1174.201206061635,com.raytheon.rcm.lib:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.radar:0.0.0,1.0.0.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.radar:0.0.0,1.12.1174.201206061635,com.raytheon.edex.rpgenvdata:0.0.0,1.12.1174.201206061635,com.raytheon.rcm.lib:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.radar:0.0.0,1.0.0.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.radar.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.radar.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.radar.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.radar.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.radar.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.radar.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.satellite.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.satellite.feature/build.xml
deleted file mode 100644
index 9b06f1bd5b..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.satellite.feature/build.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.satellite.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.satellite" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.satellite" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.satellite.mcidas" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.satellite.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.satellite.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.satellite:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.satellite:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.plugin.satellite.mcidas:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.plugin.satellite:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.satellite:0.0.0,1.0.0.201206061635,com.raytheon.uf.edex.plugin.satellite.mcidas:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.satellite.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.satellite.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.satellite.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.satellite.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.satellite.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.satellite.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/edexOsgi/com.raytheon.uf.edex.text.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.text.feature/build.xml
deleted file mode 100644
index 9f71153f31..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.text.feature/build.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.raytheon.uf.edex.text.feature" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
-		<property name="feature.destination" value="${basedir}"/>
-		<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-	</target>
-
-	<target name="all.plugins" depends="init">
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.warning" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.activetable" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.activetable" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.warning" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.textlightning" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.common.dataplugin.text" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.textdb" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.textdbsrv" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.text" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.dissemination" target="${target}">
-			<property name="arch" value="x86"/>
-			<property name="ws" value="gtk"/>
-			<property name="os" value="linux"/>
-		</ant>
-	</target>
-	<target name="all.features" depends="init">
-	</target>
-	<target name="update.feature" depends="init">
-	</target>
-
-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-	</target>
-
-	<target name="children" if="include.children">
-		<antcall target="all.children"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the feature: com.raytheon.uf.edex.text.feature.">
-		<antcall target="all.children">
-			<param name="target" value="build.jars"/>
-		</antcall>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.sources"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-		<antcall target="all.children">
-			<param name="target" value="build.zips"/>
-		</antcall>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the feature jar of: com.raytheon.uf.edex.text.feature for an update site.">
-		<antcall target="all.children">
-			<param name="target" value="build.update.jar"/>
-		</antcall>
-		<property name="feature.base" value="${feature.temp.folder}"/>
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635"/>
-		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="os" value="*"/>
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="updateJar.omitRootfiles" value="true"/>
-			<param name="ws" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="nl" value="*"/>
-		</antcall>
-		<jar destfile="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.jar" basedir="${feature.temp.folder}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<mkdir dir="${feature.temp.folder}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635"/>
-		<copy todir="${feature.temp.folder}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.textdb:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.textdbsrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.text:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.dissemination:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.text:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.textlightning:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.warning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.warning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.activetable:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.activetable:0.0.0,1.12.1174.201206061635,"/>
-		<eclipse.gatherFeature 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${feature.temp.folder}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635"/>
-		<antcall target="children">
-			<param name="target" value="gather.bin.parts"/>
-			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
-		</antcall>
-		<copy todir="${feature.base}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="feature.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.text.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.edex.textdb:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.textdbsrv:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.text:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.dissemination:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.text:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.textlightning:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.warning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.warning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.activetable:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.activetable:0.0.0,1.12.1174.201206061635,"/>
-		<antcall target="rootFiles">
-			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
-		</antcall>
-	</target>
-	<target name="rootFiles" unless="updateJar.omitRootfiles">
-		<antcall target="${rootTarget}"/>
-	</target>
-
-	<target name="rootFileslinux_gtk_x86">
-	</target>
-	<target name="rootFilesgroup_group_group">
-		<antcall target="rootFileslinux_gtk_x86"/>
-	</target>
-
-	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: com.raytheon.uf.edex.text.feature.">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="gather.bin.parts">
-			<param name="feature.base" value="${feature.temp.folder}"/>
-			<param name="os" value="*"/>
-			<param name="arch" value="*"/>
-			<param name="ws" value="*"/>
-			<param name="nl" value="*"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.sources" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.text.feature.source_1.0.0.201206061635/src"/>
-			<param name="include.children" value="true"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="zip.logs" depends="init">
-		<delete dir="${feature.temp.folder}"/>
-		<mkdir dir="${feature.temp.folder}"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-			<param name="include.children" value="true"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-		</antcall>
-		<zip destfile="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${feature.temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the feature: com.raytheon.uf.edex.text.feature of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.jar"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.bin.dist.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.log.zip"/>
-		<delete file="${feature.destination}/com.raytheon.uf.edex.text.feature_1.0.0.201206061635.src.zip"/>
-		<delete dir="${feature.temp.folder}"/>
-		<antcall target="all.children">
-			<param name="target" value="clean"/>
-		</antcall>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/var/git/COMMON/edexOsgi/com.raytheon.uf.edex.text.feature/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-		<antcall target="all.children">
-			<param name="target" value="refresh"/>
-		</antcall>
-	</target>
-	<target name="gather.sources">
-		<antcall target="children">
-			<param name="target" value="gather.sources"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/com.raytheon.uf.edex.text.feature.source_1.0.0.201206061635/src"/>
-		</antcall>
-	</target>
-
-	<target name="gather.logs" depends="init">
-		<mkdir dir="${feature.temp.folder}/plugins"/>
-		<property name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		<condition property="logExtension.param" value="logExtension" else="logExtension.param"		>
-			<isset property="logExtension"/>
-		</condition>
-		<antcall target="all.children" inheritAll="false">
-			<param name="target" value="gather.logs"/>
-			<param name="${logExtension.param}" value="${logExtension}"/>
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
-		</antcall>
-	</target>
-
-</project>
diff --git a/rpms/build/x86_64/buildEnvironment.sh b/rpms/build/x86_64/buildEnvironment.sh
index ada7c5f90c..f294d21205 100644
--- a/rpms/build/x86_64/buildEnvironment.sh
+++ b/rpms/build/x86_64/buildEnvironment.sh
@@ -4,8 +4,8 @@
 export AWIPSII_VERSION="11.9.0"
 export AWIPSII_RELEASE="20120223"
 
-export AWIPSII_TOP_DIR="/home/bkowal/rpmbuild"
-export WORKSPACE="/common/bkowal/git/thunder/baseline"
+export AWIPSII_TOP_DIR="/tmp/${USER}/rpmbuild"
+export WORKSPACE="/tmp/${USER}/baseline"
 export UFRAME_ECLIPSE="/opt/uframe-eclipse"
 export AWIPSCM_SHARE="/awipscm"
 export AWIPSII_BUILD_ROOT="/tmp/${USER}/awips-component"