diff --git a/RadarServer/com.raytheon.rcm.lib/component-deploy.xml b/RadarServer/com.raytheon.rcm.lib/component-deploy.xml
index 7c365ff733..16bfb5a74f 100644
--- a/RadarServer/com.raytheon.rcm.lib/component-deploy.xml
+++ b/RadarServer/com.raytheon.rcm.lib/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="com.raytheon.rcm.lib">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/RadarServer/com.raytheon.rcm.product/.classpath b/RadarServer/com.raytheon.rcm.product/.classpath
index 1fa3e6803d..acad1c227c 100644
--- a/RadarServer/com.raytheon.rcm.product/.classpath
+++ b/RadarServer/com.raytheon.rcm.product/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cave/com.raytheon.uf.viz.pypies/.classpath b/cave/com.raytheon.uf.viz.pypies/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/cave/com.raytheon.uf.viz.pypies/.classpath
+++ b/cave/com.raytheon.uf.viz.pypies/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cave/com.raytheon.uf.viz.python.swt/.classpath b/cave/com.raytheon.uf.viz.python.swt/.classpath
index b8c7d40403..1fa3e6803d 100644
--- a/cave/com.raytheon.uf.viz.python.swt/.classpath
+++ b/cave/com.raytheon.uf.viz.python.swt/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" output="bin-tests" path="tests"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/javax.media.opengl.linux32/.classpath b/cots/javax.media.opengl.linux32/.classpath
index 1fa3e6803d..acad1c227c 100644
--- a/cots/javax.media.opengl.linux32/.classpath
+++ b/cots/javax.media.opengl.linux32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/javax.media.opengl.linux64/.classpath b/cots/javax.media.opengl.linux64/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/cots/javax.media.opengl.linux64/.classpath
+++ b/cots/javax.media.opengl.linux64/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/javax.media.opengl.win32/.classpath b/cots/javax.media.opengl.win32/.classpath
index 1fa3e6803d..acad1c227c 100644
--- a/cots/javax.media.opengl.win32/.classpath
+++ b/cots/javax.media.opengl.win32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/ncsa.hdf5.linux32/.classpath b/cots/ncsa.hdf5.linux32/.classpath
index 1fa3e6803d..acad1c227c 100644
--- a/cots/ncsa.hdf5.linux32/.classpath
+++ b/cots/ncsa.hdf5.linux32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/ncsa.hdf5.win32/.classpath b/cots/ncsa.hdf5.win32/.classpath
index 1fa3e6803d..acad1c227c 100644
--- a/cots/ncsa.hdf5.win32/.classpath
+++ b/cots/ncsa.hdf5.win32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/org.jep.linux32/.classpath b/cots/org.jep.linux32/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/cots/org.jep.linux32/.classpath
+++ b/cots/org.jep.linux32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/org.jep.linux64/.classpath b/cots/org.jep.linux64/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/cots/org.jep.linux64/.classpath
+++ b/cots/org.jep.linux64/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/org.jep.win32/.classpath b/cots/org.jep.win32/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/cots/org.jep.win32/.classpath
+++ b/cots/org.jep.win32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/org.postgres/.classpath b/cots/org.postgres/.classpath
index 71c9593f01..58d4f8d0bd 100644
--- a/cots/org.postgres/.classpath
+++ b/cots/org.postgres/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="postgresql-8.3-603.jdbc3.jar" sourcepath="org.postgressrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="postgis.jar" sourcepath="org.postgressrc.zip"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edexOsgi/build.edex/basebuilds/component_deploy_base.xml b/edexOsgi/build.edex/basebuilds/component_deploy_base.xml
index aaa59bed7e..f3c63463fb 100644
--- a/edexOsgi/build.edex/basebuilds/component_deploy_base.xml
+++ b/edexOsgi/build.edex/basebuilds/component_deploy_base.xml
@@ -34,11 +34,6 @@
 		<echo message="this is a base for other ant files, do not call directly" />
 	</target>
 
-	<uptodate property="bin.uptodate">
-		<srcfiles dir="${basedir}/${SRC.DIR}" includes="**/*.java" />
-		<mapper type="glob" from="**/*.java" to="${basedir}/${BIN.DIR}/**/*.class" />
-	</uptodate>
-
 	<target name="deploy" depends="util.deploy" >
                 <echo message="Basedir: ${basedir}"/>
                 <echo message="bin dir: ${BIN.DIR}"/>
@@ -49,7 +44,6 @@
 		<basename property="component.name" file="${basedir}"/>
 
 		<fail message="'dest.dir' property not set" unless="dest.dir" />
-		<fail message="Class files out of date, please build ${component.name}" unless="bin.uptodate" />
 
 		<echo message="Jarring ${component.name}" />
 		<echo message="Destination: ${dest.dir}" />
@@ -58,12 +52,24 @@
 		<antcall target="update.manifest"/>
 		
 		<mkdir dir="${dest.dir}" />
-		      <jar destfile="${dest.dir}/${component.name}.jar" manifest="${basedir}/META-INF/MANIFEST.MF">
-			     <fileset dir="${basedir}/${BIN.DIR}" includes="**/*.class" />
-			     <fileset dir="${basedir}" includes="${RES.DIR}/**/*" />
-			     <fileset dir="${basedir}" includes="META-INF/**/*" />
-			     <fileset dir="${basedir}" includes="*.py" />
-		      </jar>
+		<if>
+			<available file="${basedir}/${BIN.DIR}" type="dir" />
+			<then>
+				<jar destfile="${dest.dir}/${component.name}.jar" manifest="${basedir}/META-INF/MANIFEST.MF">
+					<fileset dir="${basedir}/${BIN.DIR}" includes="**/*.class" />
+					<fileset dir="${basedir}" includes="${RES.DIR}/**/*" />
+					<fileset dir="${basedir}" includes="META-INF/**/*" />
+					<fileset dir="${basedir}" includes="*.py" />
+				</jar>
+			</then>
+			<else>
+				<jar destfile="${dest.dir}/${component.name}.jar" manifest="${basedir}/META-INF/MANIFEST.MF">
+					<fileset dir="${basedir}" includes="${RES.DIR}/**/*" />
+					<fileset dir="${basedir}" includes="META-INF/**/*" />
+					<fileset dir="${basedir}" includes="*.py" />
+				</jar>
+			</else>
+		</if>
 		   	
 	</target>
 	
diff --git a/edexOsgi/build.edex/deploy-install.xml b/edexOsgi/build.edex/deploy-install.xml
index 3b0b1a442f..7b33d2be22 100644
--- a/edexOsgi/build.edex/deploy-install.xml
+++ b/edexOsgi/build.edex/deploy-install.xml
@@ -1,725 +1,782 @@
-<!DOCTYPE project [
-<!ENTITY substitute-targets             SYSTEM "substitute.xml">
-]>
-
-<project default="deploy.all" basedir=".">	
-	<property environment="user" />
-	<property name="component.to.deploy" value="" />
-	<property name="update.python" value="true" />
-	<property name="localization.sites" value="" />
-	<property name="python.version.dir" value="python2.7" />
-	
-	<property name="native.target" value="i386-pc-linux-gnu" />
-	<property name="props.dir" location="${basedir}/properties" />
-	<property name="component-includes.dir" 
-		location="rpm/component/edex/includes" />
-
-
-	<available file="${basedir}/tmp" property="tmp.ready" />
-
-	<condition property="pde.not.ready">
-		<and>
-			<isset property="pde.build" />
-			<not>
-				<isset property="tmp.ready" />
-			</not>
-		</and>
-	</condition>
-
-	<property name="lib.dir" value="${basedir}/lib" />
-	
-	<!-- deploys everything -->
-	<target name="deploy.all" depends="define">
-		<tstamp>
-			<format property="build.date"
-				pattern="MM/dd/yyyy" />
-			<format property="build.time"
-				pattern="HH:mm:ss.S z" />
-		</tstamp>
-		<exec executable="hostname" 
-			outputproperty="build.system"/>
-			
-		<echo message="BUILD DATE   = ${build.date}" />
-		<echo message="BUILD TIME   = ${build.time}" />
-		<echo message="BUILD SYSTEM = ${build.system}" />
-		<var name="projects.dir" value="../" />
-
-		<for param="propFile">
-			<path id="propertyset">
-				<fileset dir="${props.dir}">
-					<include name="**/*.properties" />
-				</fileset>
-			</path>
-
-			<sequential>
-				<var file="@{propFile}" />
-				<!-- directory in which projects are located -->
-				<if>
-					<equals arg1="${local.build}" arg2="true" />
-					<then>
-						<var name="projects.dir" value="${basedir}/.." />
-					</then>
-					<else>
-						<if>
-							<equals arg1="${installer}" arg2="true" />
-							<then>
-								<var name="projects.dir" value="${working.dir}" />
-							</then>
-							<else>
-								<var name="projects.dir" value="${basedir}/.." />
-							</else>
-						</if>
-					</else>
-				</if>
-				<echo message="working dir: ${working.dir}" />
-				<echo message="projects.dir: ${projects.dir}" />
-
-				<property name="includes.dir" location="${basedir}/tmp/includes" />
-				<mkdir dir="${includes.dir}" />
-				<!-- directories in EDEX -->
-				<property name="dataDir" location="${esbDir}/data" />
-				<property name="utilDir" location="${dataDir}/utility" />
-
-				<fail message="cannot run pde deploy if pde build has not run" if="pde.not.ready" />
-				<antcall target="cleanup" />
-				
-				<if>
-					<equals arg1="${installer}" arg2="true" />
-					<then>
-						<antcall target="deploy.for.installer" />
-					</then>
-					<else>
-						<antcall target="deploy.for.developer" />						
-					</else>
-				</if>
-			</sequential>
-		</for>
-	</target>
-	
-	<target name="cleanup">
-		<if>
-			<equals arg1="${installer}" arg2="true" />
-			<then>
-				<echo message="Cleaning target directory: ${esbDir}" />
-				<echo message="       Removing directory: ${esbDir}/../GFESuite" />
-				<delete quiet="true" includeemptydirs="true">
-					<fileset dir="${esbDir}" includes="**/*" />
-				</delete>
-				
-				<available file="${esbDir}/../GFESuite" type="dir" 
-					property="gfe.dir.exists" />
-				<if>
-					<equals arg1="${gfe.dir.exists}" arg2="true" />
-					<then>
-						<delete quiet="true" includeemptydirs="true">
-							<fileset dir="${esbDir}/../GFESuite" />
-						</delete>
-					</then>
-				</if>
-			</then>
-			<else>
-				<echo message="Cleaning target directory: ${esbDir}/lib/" />
-
-				<!-- delete all files under ${esbDir}/lib/ -->
-				<delete quiet="true">
-					<fileset dir="${esbDir}/lib/">
-						<include name="**" />
-						<exclude name="native/**" />
-						<exclude name="lib64/**" />
-					</fileset>
-				</delete>
-		
-				<!-- delete the shell scripts from ${esbDir}/bin/ -->
-				<echo message="Cleaning target directory: ${esbDir}/bin/" />
-				<delete quiet="true">
-					<fileset dir="${esbDir}/bin/">
-						<include name="*.sh"/>
-					</fileset>
-				</delete>
-
-				<echo message="Cleaning target directory: ${esbDir}/conf" />
-				<delete quiet="true">
-					<fileset dir="${esbDir}/conf">
-						<include name="**" />
-					</fileset>
-				</delete>
-			</else>
-		</if>
-	</target>
-	
-	<!-- =================================================================== -->
-	<!-- Developer Deployment Targets                                        -->
-	<!-- =================================================================== -->
-	<target name="deploy.for.developer">
-		<echo message="Generating deployment list for feature: ${feature}" />
-		<includegen providerfilter="raytheon|noaa\.nws" basedirectory="${projects.dir}" featurefile="${feature}" cotsout="${includes.dir}/cots.includes" plugsout="${includes.dir}/plugins.includes" coreout="${includes.dir}/core.includes" />
-		
-		<if>
-			<equals arg1="${update.python}" arg2="true" />
-			<then>
-				<antcall target="deploy.python" />
-			</then>
-		</if>
-		<antcall target="deploy.esb" />
-		<antcall target="deploy.esb.configuration" />
-		<antcall target="deploy.cots" />
-		<antcall target="deploy.plugins" />
-		<antcall target="deploy.core" />
-		<if>
-			<equals arg1="${localization.sites}" arg2="" />
-			<then>
-				<echo 
-					message="WARNING: The localization files will not be deployed. No site(s) have been specified." />
-			</then>
-			<else>
-				<antcall target="deploy.localization" />
-			</else>
-		</if>
-	</target>
-	
-	<!-- deploys core components to ${esbDir}/lib/plugins -->
-	<target name="deploy.core">
-		<subant failonerror="true" inheritAll="false" inheritRefs="false">
-			<fileset dir="${projects.dir}" includesfile="${includes.dir}/core.includes" excludes="com.raytheon.edex.plugin.*/component-deploy.xml" />
-			<target name="deploy" />
-			<property name="dest.dir" value="${esbDir}/lib/plugins" />
-			<!-- This following propetry turns on individual component utility deployment -->
-			<property name="util.dest.dir" location="${utilDir}" />
-		</subant>
-	</target>
-	
-	<!-- deploy third party jars to ${esbDir}/lib/dependencies -->
-	<target name="deploy.cots">
-
-		<!-- OSGi cots that have their own projects -->
-		<copy todir="${esbDir}/lib/dependencies" flatten="false">
-			<fileset dir="${projects.dir}">
-				<includesfile name="${includes.dir}/cots.includes" />
-			</fileset>
-		</copy>
-	</target>
-		
-	<!-- deploys plugins to ${esbDir}/lib/plugins -->
-	<target name="deploy.plugins">
-		<subant failonerror="true" inheritAll="false" inheritRefs="false">
-			<fileset dir="${projects.dir}" includesfile="${includes.dir}/plugins.includes" />
-			<target name="deploy" />
-			<property name="dest.dir" value="${esbDir}/lib/plugins" />
-			<!-- This following propetry turns on individual component utility deployment -->
-			<property name="util.dest.dir" location="${utilDir}" />
-		</subant>
-	</target>
-	
-	<!-- deploy ufpy and dynamicserialize to awips2-python -->
-	<target name="deploy.python">
-		<!-- Ensure That The pythonPackages Project Is In The Workspace. -->
-		<if>
-			<available file="${basedir}/../pythonPackages/ufpy" type="dir" />
-			<then>
-				<!-- Continue -->
-			</then>
-			<else>
-				<fail message="pythonPackages/ufpy Does Not Exist In The Worskpace." />
-			</else>
-		</if>
-		
-		<if>
-			<available file="${basedir}/../pythonPackages/dynamicserialize" 
-				type="dir" />
-			<then>
-				<!-- Continue -->
-			</then>
-			<else>
-				<fail message="pythonPackages/dynamicserialize Does Not Exist In The Worskpace." />
-			</else>
-		</if>
-		
-		<if>
-			<available file="${basedir}/../pythonPackages/pypies"
-				type="dir" />
-			<then>
-				<!-- Continue -->
-			</then>
-			<else>
-				<fail message="pythonPackages/pypies Does Not Exist In The Worskpace." />
-			</else>
-		</if>
-		
-		<property name="python.installation.root"
-			value="/awips2/python" />
-		<echo message="python.installation.root=${python.installation.root}" />
-		<!-- Ensure That The Python Site-Packages Directory Exists. -->
-		<if>
-			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages" 
-				type="dir" />
-			<then>
-				<!-- Continue -->
-			</then>
-			<else>
-				<fail message="The Python site-packages Directory Was Not Found
-					Under ${python.installation.root}." />
-			</else>
-		</if>
-		
-		<!-- Clear The Current ufpy, dynamicserialize, and pypies Directories -->
-		<if>
-			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages/ufpy"
-				type="dir" />
-			<then>
-				<delete includeemptydirs="true">
-					<fileset 
-						dir="${python.installation.root}/lib/${python.version.dir}/site-packages/ufpy" />
-				</delete>
-			</then>
-		</if>
-		
-		<if>
-			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages/dynamicserialize"
-				type="dir" />
-			<then>
-				<delete includeemptydirs="true">
-					<fileset 
-						dir="${python.installation.root}/lib/${python.version.dir}/site-packages/dynamicserialize" />
-				</delete>
-			</then>
-		</if>
-		
-		<if>
-			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages/pypies"
-				type="dir" />
-			<then>
-				<delete includeemptydirs="true">
-					<fileset
-						dir="${python.installation.root}/lib/${python.version.dir}/site-packages/pypies" />
-				</delete>
-			</then>
-		</if>
-		
-		<!-- Update ufpy, dynamicserialize, and pypies -->
-		<copy todir="${python.installation.root}/lib/${python.version.dir}/site-packages/ufpy" 
-			flatten="false">
-			<fileset dir="${basedir}/../pythonPackages/ufpy" />
-		</copy>		
-		
-		<copy todir="${python.installation.root}/lib/${python.version.dir}/site-packages/dynamicserialize" 
-			flatten="false">
-			<fileset dir="${basedir}/../pythonPackages/dynamicserialize" />
-		</copy>
-		
-		<copy todir="${python.installation.root}/lib/${python.version.dir}/site-packages/pypies"
-			flatten="false">
-			<fileset dir="${basedir}/../pythonPackages/pypies/pypies" />
-		</copy>
-	</target>
-	
-	<target name="deploy.localization">
-		<echo message="INFO: Purging existing site localization files." />
-		<!-- Delete existing site localization files in cave_static -->
-		<if>
-			<available file="${install.dir}/data/utility/cave_static/site"
-			type="dir" />
-			<then>
-				<trycatch>
-					<try>
-						<delete includeemptydirs="true" verbose="true">
-							<fileset
-								dir="${install.dir}/data/utility/cave_static/site" />
-						</delete>						
-					</try>
-					
-					<catch>
-						<fail
-							message="ERROR: Unable to delete the cave_static site localization files. Verify directory permissions." />
-					</catch>
-				</trycatch>
-			</then>
-		</if>
-		<!-- Delete existing site localization files in common_static -->
-		<if>
-			<available file="${install.dir}/data/utility/common_static/site"
-			type="dir" />
-			<then>
-				<trycatch>
-					<try>
-						<delete includeemptydirs="true" verbose="true">
-							<fileset
-								dir="${install.dir}/data/utility/common_static/site" />
-						</delete>						
-					</try>
-					
-					<catch>
-						<fail
-							message="ERROR: Unable to delete the common_static site localization files. Verify directory permissions." />
-					</catch>
-				</trycatch>
-			</then>
-		</if>
-		<!-- Delete existing site localization files in edex_static -->
-		<if>
-			<available file="${install.dir}/data/utility/edex_static/site"
-				type="dir" />
-			<then>
-				<trycatch>
-					<try>
-						<delete includeemptydirs="true" verbose="true">
-							<fileset
-								dir="${install.dir}/data/utility/edex_static/site" />
-						</delete>						
-					</try>
-					
-					<catch>
-						<fail
-							message="ERROR: Unable to delete the edex_static site localization files. Verify directory permissions." />
-					</catch>
-				</trycatch>
-			</then>
-		</if>
-				
-		<echo message="INFO: Deploying Localization ..." />
-		<foreach param="site"
-			target="deploy.localization.site"
-			list="${localization.sites}"
-			delimiter=" " />
-	</target>
-	
-	<target name="deploy.localization.site">
-		<!-- Ensure that the localization directory for the specified site exists
-		in the localization project. -->
-		<if>
-			<not>
-				<available file="${basedir}/../localization.${site}"
-					type="dir" />
-			</not>
-			<then>
-				<fail
-					message="ERROR: The localization files for site ${site} could not be found in the baseline." />
-			</then>
-		</if>
-		
-		<echo message="INFO: Deploying Localization for Site: ${site}." />
-		<trycatch>
-			<try>
-				<copy todir="${install.dir}/data/utility"
-				flatten="false" verbose="true">
-					<fileset dir="${basedir}/../localization.${site}/utility" />
-				</copy>
-			</try>
-			
-			<catch>
-				<fail
-					message="ERROR: Unable to copy the localization files for site ${site} to ${install.dir}/data/utility. Verify directory permissions." />
-			</catch>
-		</trycatch>
-	</target>
-	
-	<!-- =================================================================== -->
-	<!-- Installer Deployment Targets                                        -->
-	<!-- =================================================================== -->	
-	<target name="deploy.for.installer">
-		<if>
-			<equals arg1="${component.to.deploy}" arg2="" />
-			<then>
-				<antcall target="deploy.esb" />
-				<antcall target="deploy.esb.configuration" />
-				<antcall target="deploy.edex-cots" /> 
-				<for param="dir">
-					<path>
-						<dirset dir="${component-includes.dir}" 
-							includes="**/*" />
-					</path>
-					<sequential>
-						<echo message="DIR = @{dir}" />
-						<var name="current.component.dir" 
-							value="@{dir}" />
-						<antcall target="process.manifest" />
-						
-						<deploy.component
-							file.includes="${component-includes.dir}/component.includes" />
-						<delete 
-							file="${component-includes.dir}/component.includes" />
-					</sequential>
-				</for>
-			</then>
-			<else>
-				<antcall target="deploy.single" />
-			</else>
-		</if>
-	</target>
-	
-	<target name="deploy.single">
-		<if>
-			<equals arg1="${component.to.deploy}" arg2="edex-base" />
-			<then>
-				<antcall target="deploy.esb" />
-			</then>
-			<else>
-				<if>
-					<equals arg1="${component.to.deploy}" arg2="edex-configuration" />
-					<then>
-						<antcall target="deploy.esb.configuration" />
-					</then>
-					<else>
-						<if>
-							<equals arg1="${component.to.deploy}" arg2="edex-cots" />
-							<then>
-								<antcall target="deploy.edex-cots" />
-							</then>
-							<else>						
-								<echo message="DIR = ${component-includes.dir}/${component.to.deploy}"/>
-								<var name="current.component.dir" 
-									value="${component-includes.dir}/${component.to.deploy}" />
-								<antcall target="process.manifest" />
-								<deploy.component
-									file.includes="${component-includes.dir}/component.includes" />
-								<delete 
-									file="${component-includes.dir}/component.includes" />
-							</else>
-						</if>
-					</else>
-				</if>
-			</else>
-		</if>
-	</target>
-
-	<target name="process.manifest">
-		<java jar="${basedir}/rpm/util/ProcessManifest.jar"
-			fork="true"
-			failonerror="true"
-			output="${component-includes.dir}/component.includes">
-			<arg 
-				value="${current.component.dir}/MANIFEST.MF" />
-		</java>
-	</target>
-	
-	<macrodef name="deploy.component">
-		<attribute name="file.includes" />
-		
-		<sequential>
-			<copy file="@{file.includes}"
-				tofile="${includes.dir}/plugins.includes">
-				<filterchain>
-					<tokenfilter>
-						<replaceregex pattern="$" 
-							replace="/component-deploy.xml" />
-					</tokenfilter>
-				</filterchain>
-			</copy>
-			
-			<antcall target="deploy.plugins" />
-			<delete file="${includes.dir}/plugins.includes" />
-		</sequential>
-	</macrodef>
-
-	<target name="deploy.edex-cots">
-		<echo message="projects.dir=${projects.dir}" />
-		
-		<includegen providerfilter="raytheon|noaa\.nws" 
-			basedirectory="${projects.dir}" 
-			featurefile="${feature}" 
-			cotsout="${includes.dir}/cots.includes" />
-
-		<antcall target="deploy.cots" />
-		<delete file="${includes.dir}/cots.includes" />
-	</target>
-	
-	<!-- =================================================================== -->
-	<!-- ESB Deployment Targets                                              -->
-	<!-- =================================================================== -->
-	<!-- deploys contents of esb directory to various locations in EDEX -->
-	<target name="deploy.esb">		
-		<echo>Staging esb files.</echo>
-		<if>
-			<equals arg1="${deploy.data}" arg2="true" />
-			<then>
-				<copy todir="${esbDir}" verbose="true">
-					<fileset dir="${basedir}/esb">					
-						<exclude name="svcBackup/**" />
-						<exclude name="**/bin/setup.env" />
-					</fileset>
-				</copy>
-			</then>
-			<else>
-				<copy todir="${esbDir}" verbose="true">
-					<fileset dir="${basedir}/esb">
-						<exclude name="data/**" />
-						<exclude name="svcBackup/**" />
-						<exclude name="**/bin/setup.env" />
-					</fileset>
-				</copy>
-			</else>
-		</if>
-
-		<!-- Change permissions on the Linux start file -->
-		<chmod file="${esbDir}/bin/start.sh" perm="ugo+rx" />
-		<chmod file="${esbDir}/bin/linux-x86-32/wrapper" perm="ugo+rx" />
-		<chmod dir="${esbDir}/data" perm="775" 
-			includes="**/*" verbose="true" type="both" />
-		
-		<if>
-			<equals arg1="${deploy.web}" arg2="true" />
-			<then>
-				<!-- Deploy uEngineWeb -->
-				<deploy.war
-					web.project.dir="com.raytheon.edex.uengine"
-					war.name="uEngineWeb"
-					application.name="uengine"
-					component.list="
-						com.raytheon.edex.uengine/component-deploy.xml, 
-						com.raytheon.edex.common/component-deploy.xml, 
-						com.raytheon.uf.common.serialization/component-deploy.xml" 
-					/>
-				
-				<!-- Deploy purgeWeb -->
-				<deploy.war
-					web.project.dir="gov.noaa.nws.ncep.edex.purgeutil"
-					war.name="purgeWeb"
-					application.name="purge"
-					component.list="
-						gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml, 
-						com.raytheon.edex.common/component-deploy.xml, 
-						com.raytheon.uf.common.serialization/component-deploy.xml"
-				/>
-			</then>
-			<else>
-				<echo 
-					message="Not deploying web applications to this target" />
-			</else>
-		</if>
-		
-		<exec executable="/bin/bash"
-			outputproperty="build.system.padded">
-			<arg value="${basedir}/rpm/util/PadString.sh" />
-			<arg value="${build.system}" />
-			<arg value="32" />
-		</exec>
-		
-		<!-- update the deployed banner file -->
-		<copy file="${esbDir}/conf/banner.txt"
-			tofile="${esbDir}/conf/banner.txt.update">
-			<filterchain>
-				<tokenfilter>
-					<replaceregex pattern="MM-DD-YYYY" 
-						replace="${build.date}" />
-					<replaceregex pattern="HH:MM:SS.SSS ZZZ" 
-						replace="${build.time}" />
-					<replaceregex 
-						pattern="BUILD.SYSTEMXXXXXXXXXXXXXXXXXXXXX*" 
-						replace="${build.system.padded}" />
-				</tokenfilter>
-			</filterchain>
-		</copy>
-		<delete>
-			<fileset file="${esbDir}/conf/banner.txt" />
-		</delete>
-		<move
-			file="${esbDir}/conf/banner.txt.update"
-			tofile="${esbDir}/conf/banner.txt" />
-	</target>
-	
-	<target name="deploy.esb.configuration">
-		<echo>Deploying esb configuration files.</echo>
-		<!-- Deploy: setup.env -->
-		<copy todir="${esbDir}/bin">
-			<fileset file="${basedir}/esb/bin/setup.env" />
-		</copy>
-	</target>
-	
-	<!-- =================================================================== -->
-	<!-- Generic task to build and deploy any web application.               -->
-	<!-- =================================================================== -->
-	<macrodef name="deploy.war">
-		<attribute name="web.project.dir" />
-		<attribute name="war.name" />
-		<attribute name="application.name" />
-		<attribute name="component.list" />
-		
-		<sequential>
-			<var name="esbDir" value="${install.dir}" />
-			
-			<if>
-				<equals arg1="${installer}" arg2="true" />
-				<then>
-					<var name="bin.dir" value="@dot" />
-					<var name="projects.dir" 
-						value="edex/tmp/plugins" />
-				</then>
-				<else>
-					<var name="bin.dir" value="bin" />
-					<var name="projects.dir"
-						value="${basedir}/../" />
-				</else>
-			</if>
-			
-			<property name="webapps.dir" 
-				value="${esbDir}/webapps" />
-			<property name="project.dir" 
-				value="${projects.dir}/@{web.project.dir}" />
-						
-			<property name="project.tmp.dir" 
-				location="${basedir}/tmp/@{application.name}" />
-			<delete dir="${project.tmp.dir}" quiet="true"/>
-			<mkdir dir="${project.tmp.dir}" />
-			
-			<uptodate property="project.uptodate">
-				<srcfiles dir="${project.dir}/src" 
-					includes="**/*.java" />
-				<mapper type="glob" from="**/*.java" 
-					to="${project.dir}/${bin.dir}/**/*.class" />
-			</uptodate>
-					
-			<fail message="Class files out of date, please build @{application.name}" 
-				unless="project.uptodate" />
-			
-			
-			<subant failonerror="true" inheritAll="false" inheritRefs="false">
-				<fileset dir="${projects.dir}" 
-					includes="@{component.list}"/>
-				<target name="deploy" />
-				<property name="dest.dir" value="${project.tmp.dir}" />
-			</subant>
-			
-			<var name="war.file" value="@{war.name}.war" />
-			
-			<!-- delete old war file -->
-			<delete dir="${webapps.dir}/@{war.name}" 
-				quiet="true" />
-			<delete file="${webapps.dir}/${war.file}" 
-				quiet="true" />
-			<mkdir dir="${webapps.dir}" />
-			
-			<!-- build and deploy new war -->
-			<echo message="Building and deploying war file" />
-			<war destfile="${webapps.dir}/${war.file}" 
-			webxml="${project.dir}/web/WEB-INF/web.xml">
-				<fileset dir="${project.dir}/web" 
-					excludes="**/WEB-INF/" />
-				<classes dir="${project.dir}/web/WEB-INF/classes" />
-				<!-- general -->
-				<webinf file="${project.dir}/web/WEB-INF/dwr.xml" />
-			</war>
-			
-			<unzip src="${webapps.dir}/${war.file}" 
-				dest="${webapps.dir}/@{war.name}" />
-			<delete file="${webapps.dir}/${war.file}" />
-		</sequential>
-	</macrodef>
-
-	<path id="ant.classpath">
-		<fileset dir="${basedir}/lib/ant">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${ant.library.dir}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-
-	<target name="define">
-		<taskdef name="includegen" classname="com.raytheon.uf.anttasks.includesgen.GenerateIncludesFromFeature" classpathref="ant.classpath" />
-	</target>
-
-	<taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
-
-	&substitute-targets;
-	
+<!DOCTYPE project [
+<!ENTITY substitute-targets             SYSTEM "substitute.xml">
+]>
+
+<project default="deploy.all" basedir=".">	
+	<property environment="user" />
+	<property name="git.working.dir" value="" />
+	<property name="component.to.deploy" value="" />
+	<property name="update.python" value="true" />
+	<property name="localization.sites" value="" />
+	<property name="python.version.dir" value="python2.7" />
+	
+	<property name="native.target" value="i386-pc-linux-gnu" />
+	<property name="props.dir" location="${basedir}/properties" />
+	<property name="component-includes.dir" 
+		location="rpm/component/edex/includes" />
+
+	<available file="${basedir}/tmp" property="tmp.ready" />
+
+	<condition property="pde.not.ready">
+		<and>
+			<isset property="pde.build" />
+			<not>
+				<isset property="tmp.ready" />
+			</not>
+		</and>
+	</condition>
+
+	<property name="lib.dir" value="${basedir}/lib" />
+	
+	<!-- deploys everything -->
+	<target name="deploy.all" depends="define">
+		<tstamp>
+			<format property="build.date"
+				pattern="MM/dd/yyyy" />
+			<format property="build.time"
+				pattern="HH:mm:ss.S z" />
+		</tstamp>
+		<exec executable="hostname" 
+			outputproperty="build.system"/>
+			
+		<echo message="BUILD DATE   = ${build.date}" />
+		<echo message="BUILD TIME   = ${build.time}" />
+		<echo message="BUILD SYSTEM = ${build.system}" />
+
+		<!-- Ensure the git working directory has been set. -->
+		<if>
+			<equals arg1="${git.working.dir}" arg2="" />
+			<then>
+				<fail 
+					message="The git working directory has not been specified: use -Dgit.working.dir=" />
+			</then>
+		</if>
+		<!-- Ensure that the specified git working directory exists. -->
+		<if>
+			<available file="${git.working.dir}" 
+				type="dir" />
+			<then>
+				<!-- Continue -->
+			</then>
+			<else>
+				<fail message="The specified git working directory does not exist." />
+			</else>
+		</if>		
+		
+		<var name="projects.dirs" 
+			value="${git.working.dir}/cots;${git.working.dir}/edexOsgi;${git.working.dir}/ncep;${git.working.dir}/RadarServer" />
+
+		<for param="propFile">
+			<path id="propertyset">
+				<fileset dir="${props.dir}">
+					<include name="**/*.properties" />
+				</fileset>
+			</path>
+
+			<sequential>
+				<var file="@{propFile}" />
+				<echo message="working dir: ${working.dir}" />
+				<echo message="projects.dirs: ${projects.dirs}" />
+
+				<property name="includes.dir" location="${basedir}/tmp/includes" />
+				<mkdir dir="${includes.dir}" />
+				<!-- directories in EDEX -->
+				<property name="dataDir" location="${esbDir}/data" />
+				<property name="utilDir" location="${dataDir}/utility" />
+
+				<fail message="cannot run pde deploy if pde build has not run" if="pde.not.ready" />
+				<antcall target="cleanup" />
+				
+				<if>
+					<equals arg1="${installer}" arg2="true" />
+					<then>
+						<antcall target="deploy.for.installer" />
+					</then>
+					<else>
+						<antcall target="deploy.for.developer" />						
+					</else>
+				</if>
+			</sequential>
+		</for>
+	</target>
+	
+	<target name="cleanup">
+		<if>
+			<equals arg1="${installer}" arg2="true" />
+			<then>
+				<echo message="Cleaning target directory: ${esbDir}" />
+				<echo message="       Removing directory: ${esbDir}/../GFESuite" />
+				<delete quiet="true" includeemptydirs="true">
+					<fileset dir="${esbDir}" includes="**/*" />
+				</delete>
+				
+				<available file="${esbDir}/../GFESuite" type="dir" 
+					property="gfe.dir.exists" />
+				<if>
+					<equals arg1="${gfe.dir.exists}" arg2="true" />
+					<then>
+						<delete quiet="true" includeemptydirs="true">
+							<fileset dir="${esbDir}/../GFESuite" />
+						</delete>
+					</then>
+				</if>
+			</then>
+			<else>
+				<echo message="Cleaning target directory: ${esbDir}/lib/" />
+
+				<!-- delete all files under ${esbDir}/lib/ -->
+				<delete quiet="true">
+					<fileset dir="${esbDir}/lib/">
+						<include name="**" />
+						<exclude name="native/**" />
+						<exclude name="lib64/**" />
+					</fileset>
+				</delete>
+		
+				<!-- delete the shell scripts from ${esbDir}/bin/ -->
+				<echo message="Cleaning target directory: ${esbDir}/bin/" />
+				<delete quiet="true">
+					<fileset dir="${esbDir}/bin/">
+						<include name="*.sh"/>
+					</fileset>
+				</delete>
+
+				<echo message="Cleaning target directory: ${esbDir}/conf" />
+				<delete quiet="true">
+					<fileset dir="${esbDir}/conf">
+						<include name="**" />
+					</fileset>
+				</delete>
+			</else>
+		</if>
+	</target>
+	
+	<!-- =================================================================== -->
+	<!-- Developer Deployment Targets                                        -->
+	<!-- =================================================================== -->
+	<target name="deploy.for.developer">
+		<echo message="Generating deployment list for feature: ${feature}" />
+		<includegen providerfilter="raytheon|noaa\.nws" 
+			basedirectories="${projects.dirs}" 
+			featurefile="${feature}" 
+			cotsout="${includes.dir}/cots.includes" 
+			plugsout="${includes.dir}/plugins.includes" 
+			coreout="${includes.dir}/core.includes" />
+		
+		<if>
+			<equals arg1="${update.python}" arg2="true" />
+			<then>
+				<antcall target="deploy.python" />
+			</then>
+		</if>
+		<antcall target="deploy.esb" />
+		<antcall target="deploy.esb.configuration" />
+		<antcall target="deploy.cots.developer" />
+		<antcall target="deploy.plugins.developer" />
+		<antcall target="deploy.core.developer" />
+		<if>
+			<equals arg1="${localization.sites}" arg2="" />
+			<then>
+				<echo 
+					message="WARNING: The localization files will not be deployed. No site(s) have been specified." />
+			</then>
+			<else>
+				<antcall target="deploy.localization" />
+			</else>
+		</if>
+	</target>
+	
+	<!-- deploys core components to ${esbDir}/lib/plugins -->
+	<target name="deploy.core.developer">
+		<subant failonerror="true" inheritAll="false" inheritRefs="false">
+			<fileset dir="${git.working.dir}/edexOsgi" includesfile="${includes.dir}/core.includes" excludes="com.raytheon.edex.plugin.*/component-deploy.xml" />
+			<target name="deploy" />
+			<property name="dest.dir" value="${esbDir}/lib/plugins" />
+			<!-- This following propetry turns on individual component utility deployment -->
+			<property name="util.dest.dir" location="${utilDir}" />
+		</subant>
+		<subant failonerror="true" inheritAll="false" inheritRefs="false">
+			<fileset dir="${git.working.dir}/ncep" includesfile="${includes.dir}/core.includes" excludes="com.raytheon.edex.plugin.*/component-deploy.xml" />
+			<target name="deploy" />
+			<property name="dest.dir" value="${esbDir}/lib/plugins" />
+			<!-- This following propetry turns on individual component utility deployment -->
+			<property name="util.dest.dir" location="${utilDir}" />
+		</subant>
+		<subant failonerror="true" inheritAll="false" inheritRefs="false">
+			<fileset dir="${git.working.dir}/RadarServer" includesfile="${includes.dir}/core.includes" excludes="com.raytheon.edex.plugin.*/component-deploy.xml" />
+			<target name="deploy" />
+			<property name="dest.dir" value="${esbDir}/lib/plugins" />
+			<!-- This following propetry turns on individual component utility deployment -->
+			<property name="util.dest.dir" location="${utilDir}" />
+		</subant>
+	</target>
+	
+	<!-- deploy third party jars to ${esbDir}/lib/dependencies -->
+	<target name="deploy.cots.developer">
+
+		<!-- OSGi cots that have their own projects -->
+		<copy todir="${esbDir}/lib/dependencies" flatten="false">
+			<fileset dir="${git.working.dir}/cots">
+				<includesfile name="${includes.dir}/cots.includes" />
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="deploy.cots.installer">
+		
+		<!-- OSGi cots that have their own projects -->
+		<copy todir="${esbDir}/lib/dependencies" flatten="false">
+			<fileset dir="${working.dir}">
+				<includesfile name="${includes.dir}/cots.includes" />
+			</fileset>
+		</copy>
+	</target>
+		
+	<!-- deploys plugins to ${esbDir}/lib/plugins -->
+	<target name="deploy.plugins.developer">
+		<subant failonerror="true" inheritAll="false" inheritRefs="false">
+			<fileset dir="${git.working.dir}/edexOsgi" includesfile="${includes.dir}/plugins.includes" />
+			<target name="deploy" />
+			<property name="dest.dir" value="${esbDir}/lib/plugins" />
+			<!-- This following propetry turns on individual component utility deployment -->
+			<property name="util.dest.dir" location="${utilDir}" />
+		</subant>
+		<subant failonerror="true" inheritAll="false" inheritRefs="false">
+			<fileset dir="${git.working.dir}/ncep" includesfile="${includes.dir}/plugins.includes" />
+			<target name="deploy" />
+			<property name="dest.dir" value="${esbDir}/lib/plugins" />
+			<!-- This following propetry turns on individual component utility deployment -->
+			<property name="util.dest.dir" location="${utilDir}" />
+		</subant>
+		<subant failonerror="true" inheritAll="false" inheritRefs="false">
+			<fileset dir="${git.working.dir}/RadarServer" includesfile="${includes.dir}/plugins.includes" />
+			<target name="deploy" />
+			<property name="dest.dir" value="${esbDir}/lib/plugins" />
+			<!-- This following propetry turns on individual component utility deployment -->
+			<property name="util.dest.dir" location="${utilDir}" />
+		</subant>
+	</target>
+	
+	<target name="deploy.plugins.installer">
+		<subant failonerror="true" inheritAll="false" inheritRefs="false">
+			<fileset dir="${working.dir}" includesfile="${includes.dir}/plugins.includes" />
+			<target name="deploy" />
+			<property name="dest.dir" value="${esbDir}/lib/plugins" />
+			<!-- This following propetry turns on individual component utility deployment -->
+			<property name="util.dest.dir" location="${utilDir}" />
+		</subant>
+	</target>
+	
+	<!-- deploy ufpy and dynamicserialize to awips2-python -->
+	<target name="deploy.python">
+		<!-- Ensure That The pythonPackages Project Is In The Workspace. -->
+		<if>
+			<available file="${git.working.dir}/pythonPackages/ufpy" type="dir" />
+			<then>
+				<!-- Continue -->
+			</then>
+			<else>
+				<fail message="pythonPackages/ufpy Does Not Exist In The Worskpace." />
+			</else>
+		</if>
+		
+		<if>
+			<available file="${git.working.dir}/pythonPackages/dynamicserialize" 
+				type="dir" />
+			<then>
+				<!-- Continue -->
+			</then>
+			<else>
+				<fail message="pythonPackages/dynamicserialize Does Not Exist In The Worskpace." />
+			</else>
+		</if>
+		
+		<if>
+			<available file="${git.working.dir}/pythonPackages/pypies"
+				type="dir" />
+			<then>
+				<!-- Continue -->
+			</then>
+			<else>
+				<fail message="pythonPackages/pypies Does Not Exist In The Worskpace." />
+			</else>
+		</if>
+		
+		<property name="python.installation.root"
+			value="/awips2/python" />
+		<echo message="python.installation.root=${python.installation.root}" />
+		<!-- Ensure That The Python Site-Packages Directory Exists. -->
+		<if>
+			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages" 
+				type="dir" />
+			<then>
+				<!-- Continue -->
+			</then>
+			<else>
+				<fail message="The Python site-packages Directory Was Not Found
+					Under ${python.installation.root}." />
+			</else>
+		</if>
+		
+		<!-- Clear The Current ufpy, dynamicserialize, and pypies Directories -->
+		<if>
+			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages/ufpy"
+				type="dir" />
+			<then>
+				<delete includeemptydirs="true">
+					<fileset 
+						dir="${python.installation.root}/lib/${python.version.dir}/site-packages/ufpy" />
+				</delete>
+			</then>
+		</if>
+		
+		<if>
+			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages/dynamicserialize"
+				type="dir" />
+			<then>
+				<delete includeemptydirs="true">
+					<fileset 
+						dir="${python.installation.root}/lib/${python.version.dir}/site-packages/dynamicserialize" />
+				</delete>
+			</then>
+		</if>
+		
+		<if>
+			<available file="${python.installation.root}/lib/${python.version.dir}/site-packages/pypies"
+				type="dir" />
+			<then>
+				<delete includeemptydirs="true">
+					<fileset
+						dir="${python.installation.root}/lib/${python.version.dir}/site-packages/pypies" />
+				</delete>
+			</then>
+		</if>
+		
+		<!-- Update ufpy, dynamicserialize, and pypies -->
+		<copy todir="${python.installation.root}/lib/${python.version.dir}/site-packages/ufpy" 
+			flatten="false">
+			<fileset dir="${git.working.dir}/pythonPackages/ufpy" />
+		</copy>		
+		
+		<copy todir="${python.installation.root}/lib/${python.version.dir}/site-packages/dynamicserialize" 
+			flatten="false">
+			<fileset dir="${git.working.dir}/pythonPackages/dynamicserialize" />
+		</copy>
+		
+		<copy todir="${python.installation.root}/lib/${python.version.dir}/site-packages/pypies"
+			flatten="false">
+			<fileset dir="${git.working.dir}/pythonPackages/pypies/pypies" />
+		</copy>
+	</target>
+	
+	<target name="deploy.localization">
+		<echo message="INFO: Purging existing site localization files." />
+		<!-- Delete existing site localization files in cave_static -->
+		<if>
+			<available file="${install.dir}/data/utility/cave_static/site"
+			type="dir" />
+			<then>
+				<trycatch>
+					<try>
+						<delete includeemptydirs="true" verbose="true">
+							<fileset
+								dir="${install.dir}/data/utility/cave_static/site" />
+						</delete>						
+					</try>
+					
+					<catch>
+						<fail
+							message="ERROR: Unable to delete the cave_static site localization files. Verify directory permissions." />
+					</catch>
+				</trycatch>
+			</then>
+		</if>
+		<!-- Delete existing site localization files in common_static -->
+		<if>
+			<available file="${install.dir}/data/utility/common_static/site"
+			type="dir" />
+			<then>
+				<trycatch>
+					<try>
+						<delete includeemptydirs="true" verbose="true">
+							<fileset
+								dir="${install.dir}/data/utility/common_static/site" />
+						</delete>						
+					</try>
+					
+					<catch>
+						<fail
+							message="ERROR: Unable to delete the common_static site localization files. Verify directory permissions." />
+					</catch>
+				</trycatch>
+			</then>
+		</if>
+		<!-- Delete existing site localization files in edex_static -->
+		<if>
+			<available file="${install.dir}/data/utility/edex_static/site"
+				type="dir" />
+			<then>
+				<trycatch>
+					<try>
+						<delete includeemptydirs="true" verbose="true">
+							<fileset
+								dir="${install.dir}/data/utility/edex_static/site" />
+						</delete>						
+					</try>
+					
+					<catch>
+						<fail
+							message="ERROR: Unable to delete the edex_static site localization files. Verify directory permissions." />
+					</catch>
+				</trycatch>
+			</then>
+		</if>
+				
+		<echo message="INFO: Deploying Localization ..." />
+		<foreach param="site"
+			target="deploy.localization.site"
+			list="${localization.sites}"
+			delimiter=" " />
+	</target>
+	
+	<target name="deploy.localization.site">
+		<!-- Ensure that the localization directory for the specified site exists
+		in the localization project. -->
+		<if>
+			<not>
+				<available file="${git.working.dir}/localization/localization.${site}"
+					type="dir" />
+			</not>
+			<then>
+				<fail
+					message="ERROR: The localization files for site ${site} could not be found in the baseline." />
+			</then>
+		</if>
+		
+		<echo message="INFO: Deploying Localization for Site: ${site}." />
+		<trycatch>
+			<try>
+				<copy todir="${install.dir}/data/utility"
+				flatten="false" verbose="true">
+					<fileset dir="${git.working.dir}/localization/localization.${site}/utility" />
+				</copy>
+			</try>
+			
+			<catch>
+				<fail
+					message="ERROR: Unable to copy the localization files for site ${site} to ${install.dir}/data/utility. Verify directory permissions." />
+			</catch>
+		</trycatch>
+	</target>
+	
+	<!-- =================================================================== -->
+	<!-- Installer Deployment Targets                                        -->
+	<!-- =================================================================== -->	
+	<target name="deploy.for.installer">
+		<if>
+			<equals arg1="${component.to.deploy}" arg2="" />
+			<then>
+				<antcall target="deploy.esb" />
+				<antcall target="deploy.esb.configuration" />
+				<antcall target="deploy.edex-cots" /> 
+				<for param="dir">
+					<path>
+						<dirset dir="${component-includes.dir}" 
+							includes="**/*" />
+					</path>
+					<sequential>
+						<echo message="DIR = @{dir}" />
+						<var name="current.component.dir" 
+							value="@{dir}" />
+						<antcall target="process.manifest" />
+						
+						<deploy.component
+							file.includes="${component-includes.dir}/component.includes" />
+						<delete 
+							file="${component-includes.dir}/component.includes" />
+					</sequential>
+				</for>
+			</then>
+			<else>
+				<antcall target="deploy.single" />
+			</else>
+		</if>
+	</target>
+	
+	<target name="deploy.single">
+		<if>
+			<equals arg1="${component.to.deploy}" arg2="edex-base" />
+			<then>
+				<antcall target="deploy.esb" />
+			</then>
+			<else>
+				<if>
+					<equals arg1="${component.to.deploy}" arg2="edex-configuration" />
+					<then>
+						<antcall target="deploy.esb.configuration" />
+					</then>
+					<else>
+						<if>
+							<equals arg1="${component.to.deploy}" arg2="edex-cots" />
+							<then>
+								<antcall target="deploy.edex-cots" />
+							</then>
+							<else>						
+								<echo message="DIR = ${component-includes.dir}/${component.to.deploy}"/>
+								<var name="current.component.dir" 
+									value="${component-includes.dir}/${component.to.deploy}" />
+								<antcall target="process.manifest" />
+								<deploy.component
+									file.includes="${component-includes.dir}/component.includes" />
+								<delete 
+									file="${component-includes.dir}/component.includes" />
+							</else>
+						</if>
+					</else>
+				</if>
+			</else>
+		</if>
+	</target>
+
+	<target name="process.manifest">
+		<java jar="${basedir}/rpm/util/ProcessManifest.jar"
+			fork="true"
+			failonerror="true"
+			output="${component-includes.dir}/component.includes">
+			<arg 
+				value="${current.component.dir}/MANIFEST.MF" />
+		</java>
+	</target>
+	
+	<macrodef name="deploy.component">
+		<attribute name="file.includes" />
+		
+		<sequential>
+			<copy file="@{file.includes}"
+				tofile="${includes.dir}/plugins.includes">
+				<filterchain>
+					<tokenfilter>
+						<replaceregex pattern="$" 
+							replace="/component-deploy.xml" />
+					</tokenfilter>
+				</filterchain>
+			</copy>
+			
+			<antcall target="deploy.plugins.installer" />
+			<delete file="${includes.dir}/plugins.includes" />
+		</sequential>
+	</macrodef>
+
+	<target name="deploy.edex-cots">
+		<echo message="working.dir=${working.dir}" />
+		
+		<includegen providerfilter="raytheon|noaa\.nws" 
+			basedirectories="${working.dir}" 
+			featurefile="${feature}" 
+			cotsout="${includes.dir}/cots.includes" />
+
+		<antcall target="deploy.cots.installer" />
+		<delete file="${includes.dir}/cots.includes" />
+	</target>
+	
+	<!-- =================================================================== -->
+	<!-- ESB Deployment Targets                                              -->
+	<!-- =================================================================== -->
+	<!-- deploys contents of esb directory to various locations in EDEX -->
+	<target name="deploy.esb">		
+		<echo>Staging esb files.</echo>
+		<if>
+			<equals arg1="${deploy.data}" arg2="true" />
+			<then>
+				<copy todir="${esbDir}" verbose="true">
+					<fileset dir="${basedir}/esb">					
+						<exclude name="svcBackup/**" />
+						<exclude name="**/bin/setup.env" />
+					</fileset>
+				</copy>
+			</then>
+			<else>
+				<copy todir="${esbDir}" verbose="true">
+					<fileset dir="${basedir}/esb">
+						<exclude name="data/**" />
+						<exclude name="svcBackup/**" />
+						<exclude name="**/bin/setup.env" />
+					</fileset>
+				</copy>
+			</else>
+		</if>
+
+		<!-- Change permissions on the Linux start file -->
+		<chmod file="${esbDir}/bin/start.sh" perm="ugo+rx" />
+		<chmod file="${esbDir}/bin/linux-x86-32/wrapper" perm="ugo+rx" />
+		<chmod dir="${esbDir}/data" perm="775" 
+			includes="**/*" verbose="true" type="both" />
+		
+		<if>
+			<equals arg1="${deploy.web}" arg2="true" />
+			<then>
+				<!-- Deploy uEngineWeb -->
+				<deploy.war
+					web.project.dir="com.raytheon.edex.uengine"
+					war.name="uEngineWeb"
+					application.name="uengine"
+					component.list="
+						com.raytheon.edex.uengine/component-deploy.xml, 
+						com.raytheon.edex.common/component-deploy.xml, 
+						com.raytheon.uf.common.serialization/component-deploy.xml" 
+					/>
+				
+				<!-- Deploy purgeWeb -->
+				<deploy.war
+					web.project.dir="gov.noaa.nws.ncep.edex.purgeutil"
+					war.name="purgeWeb"
+					application.name="purge"
+					component.list="
+						gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml, 
+						com.raytheon.edex.common/component-deploy.xml, 
+						com.raytheon.uf.common.serialization/component-deploy.xml"
+				/>
+			</then>
+			<else>
+				<echo 
+					message="Not deploying web applications to this target" />
+			</else>
+		</if>
+		
+		<exec executable="/bin/bash"
+			outputproperty="build.system.padded">
+			<arg value="${basedir}/rpm/util/PadString.sh" />
+			<arg value="${build.system}" />
+			<arg value="32" />
+		</exec>
+		
+		<!-- update the deployed banner file -->
+		<copy file="${esbDir}/conf/banner.txt"
+			tofile="${esbDir}/conf/banner.txt.update">
+			<filterchain>
+				<tokenfilter>
+					<replaceregex pattern="MM-DD-YYYY" 
+						replace="${build.date}" />
+					<replaceregex pattern="HH:MM:SS.SSS ZZZ" 
+						replace="${build.time}" />
+					<replaceregex 
+						pattern="BUILD.SYSTEMXXXXXXXXXXXXXXXXXXXXX*" 
+						replace="${build.system.padded}" />
+				</tokenfilter>
+			</filterchain>
+		</copy>
+		<delete>
+			<fileset file="${esbDir}/conf/banner.txt" />
+		</delete>
+		<move
+			file="${esbDir}/conf/banner.txt.update"
+			tofile="${esbDir}/conf/banner.txt" />
+	</target>
+	
+	<target name="deploy.esb.configuration">
+		<echo>Deploying esb configuration files.</echo>
+		<!-- Deploy: setup.env -->
+		<copy todir="${esbDir}/bin">
+			<fileset file="${basedir}/esb/bin/setup.env" />
+		</copy>
+	</target>
+	
+	<!-- =================================================================== -->
+	<!-- Generic task to build and deploy any web application.               -->
+	<!-- =================================================================== -->
+	<macrodef name="deploy.war">
+		<attribute name="web.project.dir" />
+		<attribute name="war.name" />
+		<attribute name="application.name" />
+		<attribute name="component.list" />
+		
+		<sequential>
+			<var name="esbDir" value="${install.dir}" />
+			
+			<if>
+				<equals arg1="${installer}" arg2="true" />
+				<then>
+					<var name="bin.dir" value="@dot" />
+					<var name="projects.dir" 
+						value="edex/tmp/plugins" />
+				</then>
+				<else>
+					<var name="bin.dir" value="bin" />
+					<var name="projects.dir"
+						value="${basedir}/../" />
+				</else>
+			</if>
+			
+			<property name="webapps.dir" 
+				value="${esbDir}/webapps" />
+			<property name="project.dir" 
+				value="${projects.dir}/@{web.project.dir}" />
+						
+			<property name="project.tmp.dir" 
+				location="${basedir}/tmp/@{application.name}" />
+			<delete dir="${project.tmp.dir}" quiet="true"/>
+			<mkdir dir="${project.tmp.dir}" />
+			
+			<uptodate property="project.uptodate">
+				<srcfiles dir="${project.dir}/src" 
+					includes="**/*.java" />
+				<mapper type="glob" from="**/*.java" 
+					to="${project.dir}/${bin.dir}/**/*.class" />
+			</uptodate>
+					
+			<fail message="Class files out of date, please build @{application.name}" 
+				unless="project.uptodate" />
+			
+			
+			<subant failonerror="true" inheritAll="false" inheritRefs="false">
+				<fileset dir="${projects.dir}" 
+					includes="@{component.list}"/>
+				<target name="deploy" />
+				<property name="dest.dir" value="${project.tmp.dir}" />
+			</subant>
+			
+			<var name="war.file" value="@{war.name}.war" />
+			
+			<!-- delete old war file -->
+			<delete dir="${webapps.dir}/@{war.name}" 
+				quiet="true" />
+			<delete file="${webapps.dir}/${war.file}" 
+				quiet="true" />
+			<mkdir dir="${webapps.dir}" />
+			
+			<!-- build and deploy new war -->
+			<echo message="Building and deploying war file" />
+			<war destfile="${webapps.dir}/${war.file}" 
+			webxml="${project.dir}/web/WEB-INF/web.xml">
+				<fileset dir="${project.dir}/web" 
+					excludes="**/WEB-INF/" />
+				<classes dir="${project.dir}/web/WEB-INF/classes" />
+				<!-- general -->
+				<webinf file="${project.dir}/web/WEB-INF/dwr.xml" />
+			</war>
+			
+			<unzip src="${webapps.dir}/${war.file}" 
+				dest="${webapps.dir}/@{war.name}" />
+			<delete file="${webapps.dir}/${war.file}" />
+		</sequential>
+	</macrodef>
+
+	<path id="ant.classpath">
+		<fileset dir="${basedir}/lib/ant">
+			<include name="*.jar" />
+		</fileset>
+		<fileset dir="${ant.library.dir}">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+
+
+	<target name="define">
+		<taskdef name="includegen" classname="com.raytheon.uf.anttasks.includesgen.GenerateIncludesFromFeature" classpathref="ant.classpath" />
+	</target>
+
+	<taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
+
+	&substitute-targets;
+	
 </project>
\ No newline at end of file
diff --git a/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar b/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar
index b3864f07b7..e0d5c5c376 100644
Binary files a/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar and b/edexOsgi/build.edex/lib/ant/FeatureExplorer.jar differ
diff --git a/edexOsgi/build.edex/lib/ant/IncludesGen.jar b/edexOsgi/build.edex/lib/ant/IncludesGen.jar
index 49cec59023..f9b9d34f33 100644
Binary files a/edexOsgi/build.edex/lib/ant/IncludesGen.jar and b/edexOsgi/build.edex/lib/ant/IncludesGen.jar differ
diff --git a/edexOsgi/build.edex/tmp/includes/core.includes b/edexOsgi/build.edex/tmp/includes/core.includes
new file mode 100644
index 0000000000..b229dc770a
--- /dev/null
+++ b/edexOsgi/build.edex/tmp/includes/core.includes
@@ -0,0 +1,87 @@
+## Core includes file generated on 2012-01-20 17:08:45 GMT
+com.raytheon.edex.rpgenvdata/component-deploy.xml
+com.raytheon.uf.common.jms/component-deploy.xml
+com.raytheon.uf.edex.database/component-deploy.xml
+com.raytheon.uf.common.cache/component-deploy.xml
+com.raytheon.uf.edex.pointdata/component-deploy.xml
+com.raytheon.uf.edex.esb.camel.launcher/component-deploy.xml
+com.raytheon.uf.common.dissemination/component-deploy.xml
+com.raytheon.uf.edex.bufrtools/component-deploy.xml
+com.raytheon.edex.uengine/component-deploy.xml
+com.raytheon.uf.common.pointdata/component-deploy.xml
+com.raytheon.uf.common.serialization/component-deploy.xml
+com.raytheon.uf.common.datastorage.remote/component-deploy.xml
+com.raytheon.uf.common.awipstools/component-deploy.xml
+com.raytheon.edex.ingestsrv/component-deploy.xml
+com.raytheon.uf.common.alertviz/component-deploy.xml
+com.raytheon.uf.common.serialization.comm/component-deploy.xml
+com.raytheon.uf.tools.gfesuite.servicebackup/component-deploy.xml
+com.raytheon.uf.common.auth/component-deploy.xml
+com.raytheon.uf.common.menus/component-deploy.xml
+com.raytheon.uf.edex.distribution/component-deploy.xml
+com.raytheon.uf.common.hydro/component-deploy.xml
+com.raytheon.uf.edex.core/component-deploy.xml
+com.raytheon.edex.common/component-deploy.xml
+com.raytheon.uf.edex.management/component-deploy.xml
+com.raytheon.uf.common.datastorage.hdf5/component-deploy.xml
+com.raytheon.uf.edex.cpgsrv/component-deploy.xml
+com.raytheon.uf.edex.python.decoder/component-deploy.xml
+gov.noaa.nws.ncep.edex.uengine/component-deploy.xml
+com.raytheon.uf.common.status/component-deploy.xml
+com.raytheon.uf.common.sounding/component-deploy.xml
+com.raytheon.edex.autobldsrv/component-deploy.xml
+gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml
+com.raytheon.uf.common.climo/component-deploy.xml
+com.raytheon.uf.common.localization/component-deploy.xml
+gov.noaa.nws.ncep.common/component-deploy.xml
+com.raytheon.uf.common.message/component-deploy.xml
+com.raytheon.rcm.lib/component-deploy.xml
+com.raytheon.uf.common.datastorage/component-deploy.xml
+com.raytheon.uf.common.topo/component-deploy.xml
+com.raytheon.edex.notifysrv/component-deploy.xml
+gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml
+com.raytheon.edex.utilitysrv/component-deploy.xml
+com.raytheon.uf.common.geospatial/component-deploy.xml
+com.raytheon.uf.common.python/component-deploy.xml
+gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml
+com.raytheon.uf.edex.metartohmdbsrv/component-deploy.xml
+com.raytheon.uf.common.time/component-deploy.xml
+com.raytheon.uf.common.pypies/component-deploy.xml
+com.raytheon.uf.common.monitor/component-deploy.xml
+com.raytheon.uf.common.comm/component-deploy.xml
+com.raytheon.edex.productsrv/component-deploy.xml
+com.raytheon.uf.common.mpe/component-deploy.xml
+com.raytheon.edex.adaptersrv/component-deploy.xml
+com.raytheon.uf.edex.textdbsrv/component-deploy.xml
+com.raytheon.uf.common.util/component-deploy.xml
+com.raytheon.uf.edex.dat.utils/component-deploy.xml
+com.raytheon.uf.common.ohd/component-deploy.xml
+com.raytheon.uf.common.site/component-deploy.xml
+gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml
+gov.noaa.nws.ncep.edex.common/component-deploy.xml
+com.raytheon.uf.edex.log/component-deploy.xml
+com.raytheon.uf.edex.ohd/component-deploy.xml
+com.raytheon.uf.edex.awipstools/component-deploy.xml
+com.raytheon.uf.edex.esb.camel/component-deploy.xml
+com.raytheon.uf.common.dataquery/component-deploy.xml
+com.raytheon.uf.edex.decodertools/component-deploy.xml
+com.raytheon.uf.edex.topo/component-deploy.xml
+com.raytheon.uf.common.alertmonitor/component-deploy.xml
+com.raytheon.uf.common.activetable/component-deploy.xml
+com.raytheon.uf.edex.alertviz/component-deploy.xml
+com.raytheon.uf.common.management/component-deploy.xml
+com.raytheon.uf.common.derivparam/component-deploy.xml
+com.raytheon.uf.edex.dissemination/component-deploy.xml
+com.raytheon.edex.kml/component-deploy.xml
+com.raytheon.messaging.mhs/component-deploy.xml
+com.raytheon.uf.common.colormap/component-deploy.xml
+com.raytheon.uf.common.monitor.cpg/component-deploy.xml
+gov.noaa.nws.ncep.common.log/component-deploy.xml
+com.raytheon.edex.monitorsrv/component-deploy.xml
+com.raytheon.edex.textdb/component-deploy.xml
+com.raytheon.uf.edex.purgesrv/component-deploy.xml
+com.raytheon.uf.edex.auth/component-deploy.xml
+com.raytheon.uf.edex.site/component-deploy.xml
+com.raytheon.uf.edex.maintenance/component-deploy.xml
+com.raytheon.uf.edex.activetable/component-deploy.xml
+com.raytheon.uf.common.hlstopo/component-deploy.xml
diff --git a/edexOsgi/build.edex/tmp/includes/cots.includes b/edexOsgi/build.edex/tmp/includes/cots.includes
new file mode 100644
index 0000000000..1fc912c95c
--- /dev/null
+++ b/edexOsgi/build.edex/tmp/includes/cots.includes
@@ -0,0 +1,51 @@
+## Cots includes file generated on 2012-01-20 17:08:45 GMT
+com.sun.jndi.nis/*.jar
+net.sf.ehcache/*.jar
+javax.persistence/*.jar
+org.eclipse.jetty/*.jar
+net.sf.cglib/*.jar
+org.apache.commons.logging/*.jar
+org.apache.commons.codec/*.jar
+org.apache.commons.lang/*.jar
+org.apache.commons.digester/*.jar
+org.dom4j/*.jar
+org.apache.tools.bzip2/*.jar
+org.slf4j/*.jar
+org.springframework/*.jar
+uk.ltd.getahead/*.jar
+org.objectweb/*.jar
+org.apache.activemq/*.jar
+org.apache.mina/*.jar
+org.postgres/postgis.jar
+org.postgres/postgresql-8.3-603.jdbc3.jar
+javax.vecmath/*.jar
+javax.mail/*.jar
+org.apache.commons.configuration/*.jar
+org.apache.commons.beanutils/*.jar
+com.facebook.thrift/*.jar
+org.apache.camel/*.jar
+org.apache.commons.pool/*.jar
+org.apache.log4j/*.jar
+org.jep/*.jar
+ncsa.hdf5/jhdf5.jar
+com.sun.jna/*.jar
+edu.wisc.ssec.mcidas/*.jar
+org.apache.commons.management/*.jar
+com.opensymphony.ognl/*.jar
+javax.jms/*.jar
+org.apache.commons.collections/*.jar
+org.jboss.cache/*.jar
+javax.measure/*.jar
+org.apache.http/*.jar
+org.apache.commons.cli/*.jar
+ucar.nc2/*.jar
+org.apache.tomcat.nativ/*.jar
+org.hibernate/*.jar
+org.apache.velocity/velocity-1.5.jar
+org.apache.velocity/velocity-tools-generic-1.3.jar
+org.apache.commons.validator/*.jar
+com.mchange/*.jar
+org.apache.qpid/*.jar
+org.geotools/*.jar
+javax.media.opengl/gluegen-rt.jar
+javax.activation/*.jar
diff --git a/edexOsgi/build.edex/tmp/includes/plugins.includes b/edexOsgi/build.edex/tmp/includes/plugins.includes
new file mode 100644
index 0000000000..a38b6972d2
--- /dev/null
+++ b/edexOsgi/build.edex/tmp/includes/plugins.includes
@@ -0,0 +1,154 @@
+## Plug-in includes file generated on 2012-01-20 17:08:45 GMT
+com.raytheon.uf.edex.plugin.satellite.mcidas/component-deploy.xml
+com.raytheon.edex.plugin.ldadhydro/component-deploy.xml
+com.raytheon.uf.edex.plugin.loctables/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml
+com.raytheon.uf.edex.plugin.acars/component-deploy.xml
+com.raytheon.uf.edex.plugin.npp.viirs/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml
+com.raytheon.edex.plugin.ldadprofiler/component-deploy.xml
+com.raytheon.edex.plugin.binlightning/component-deploy.xml
+com.raytheon.edex.plugin.textlightning/component-deploy.xml
+com.raytheon.uf.edex.plugin.svrwx/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.bufrsgwh/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.scd/component-deploy.xml
+com.raytheon.edex.plugin.shef/component-deploy.xml
+com.raytheon.uf.common.dataplugin.cwa/component-deploy.xml
+com.raytheon.uf.common.dataplugin.level/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml
+com.raytheon.uf.edex.plugin.mesowest/component-deploy.xml
+com.raytheon.uf.common.dataplugin.ldadmesonet/component-deploy.xml
+com.raytheon.uf.common.dataplugin.gfe/component-deploy.xml
+com.raytheon.edex.plugin.radar/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.pafm/component-deploy.xml
+com.raytheon.uf.edex.plugin.tcs/component-deploy.xml
+com.raytheon.uf.common.dataplugin.binlightning/component-deploy.xml
+com.raytheon.edex.plugin.airep/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrquikscat/component-deploy.xml
+com.raytheon.uf.common.dataplugin.preciprate/component-deploy.xml
+com.raytheon.uf.edex.plugin.level.handler/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrsigwx/component-deploy.xml
+com.raytheon.uf.common.dataplugin.ffmp/component-deploy.xml
+com.raytheon.uf.common.dataplugin.cwat/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml
+com.raytheon.edex.plugin.ldad/component-deploy.xml
+com.raytheon.uf.edex.plugin.manualIngest/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.bufrsgwhv/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml
+com.raytheon.uf.common.dataplugin.radar/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml
+com.raytheon.uf.edex.plugin.cwa/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml
+com.raytheon.edex.plugin.grib/component-deploy.xml
+com.raytheon.edex.plugin.warning/component-deploy.xml
+com.raytheon.edex.plugin.profiler/component-deploy.xml
+com.raytheon.uf.common.dataplugin.scan/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml
+com.raytheon.edex.plugin.pirep/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrua/component-deploy.xml
+com.raytheon.uf.common.dataplugin.obs/component-deploy.xml
+com.raytheon.uf.common.dataplugin.goessounding/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrssmi/component-deploy.xml
+com.raytheon.edex.plugin.bufrua/component-deploy.xml
+com.raytheon.uf.common.plugin.nwsauth/component-deploy.xml
+com.raytheon.edex.plugin.goessounding/component-deploy.xml
+com.raytheon.uf.common.dataplugin.fog/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml
+com.raytheon.edex.plugin.sfcobs/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.bufrsgwh/component-deploy.xml
+com.raytheon.edex.plugin.poessounding/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml
+com.raytheon.uf.common.dataplugin.warning/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml
+com.raytheon.uf.edex.plugin.bufrhdw/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrascat/component-deploy.xml
+com.raytheon.uf.common.dataplugin.shef/component-deploy.xml
+com.raytheon.edex.plugin.ccfp/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.bufrssha/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml
+com.raytheon.uf.common.dataplugin.vil/component-deploy.xml
+com.raytheon.edex.plugin.ldadmanual/component-deploy.xml
+com.raytheon.uf.edex.plugin.bufrquikscat/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml
+com.raytheon.uf.edex.plugin.vil/component-deploy.xml
+com.raytheon.uf.common.dataplugin.tcg/component-deploy.xml
+com.raytheon.uf.common.dataplugin.lsr/component-deploy.xml
+com.raytheon.edex.plugin.redbook/component-deploy.xml
+com.raytheon.edex.plugin.obs/component-deploy.xml
+com.raytheon.uf.edex.plugin.nwsauth/component-deploy.xml
+com.raytheon.uf.common.dataplugin.sfcobs/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.h5scd/component-deploy.xml
+com.raytheon.uf.common.dataplugin.tcs/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml
+com.raytheon.edex.plugin.bufrmos/component-deploy.xml
+com.raytheon.uf.edex.plugin.ffmp/component-deploy.xml
+com.raytheon.uf.edex.plugin.scan.common/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml
+com.raytheon.uf.common.dataplugin/component-deploy.xml
+com.raytheon.uf.edex.plugin.fssobs/component-deploy.xml
+com.raytheon.uf.common.dataplugin.profiler/component-deploy.xml
+com.raytheon.uf.common.dataplugin.text/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml
+com.raytheon.uf.common.dataplugin.satellite/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml
+com.raytheon.uf.edex.plugin.lsr/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.uair/component-deploy.xml
+com.raytheon.uf.edex.plugin.cwat/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml
+com.raytheon.uf.common.dataplugin.ldadhydro/component-deploy.xml
+com.raytheon.uf.common.dataplugin.grib/component-deploy.xml
+com.raytheon.uf.common.dataplugin.acars/component-deploy.xml
+com.raytheon.uf.edex.plugin.scan/component-deploy.xml
+com.raytheon.uf.edex.plugin.bufrncwf/component-deploy.xml
+com.raytheon.uf.common.dataplugin.pirep/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml
+com.raytheon.uf.edex.plugin.fog/component-deploy.xml
+com.raytheon.uf.common.dataplugin.airep/component-deploy.xml
+com.raytheon.edex.plugin.modelsounding/component-deploy.xml
+com.raytheon.edex.plugin.taf/component-deploy.xml
+com.raytheon.uf.edex.plugin.preciprate/component-deploy.xml
+com.raytheon.uf.common.dataplugin.npp.viirs/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml
+com.raytheon.uf.edex.plugin.bufrascat/component-deploy.xml
+com.raytheon.uf.common.dataplugin.vaa/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.uair/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml
+com.raytheon.uf.common.dataplugin.svrwx/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.pafm/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.h5uair/component-deploy.xml
+com.raytheon.uf.common.dataplugin.qc/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml
+com.raytheon.uf.common.dataplugin.qpf/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrhdw/component-deploy.xml
+com.raytheon.edex.plugin.gfe/component-deploy.xml
+com.raytheon.uf.edex.plugin.qc/component-deploy.xml
+com.raytheon.uf.common.dataplugin.fssobs/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrncwf/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml
+com.raytheon.uf.edex.plugin.level/component-deploy.xml
+com.raytheon.uf.edex.plugin.bufrmthdw/component-deploy.xml
+com.raytheon.uf.common.dataplugin.acarssounding/component-deploy.xml
+com.raytheon.edex.plugin.text/component-deploy.xml
+com.raytheon.uf.edex.plugin.tcg/component-deploy.xml
+com.raytheon.uf.edex.plugin.qpf/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.bufrsgwhv/component-deploy.xml
+com.raytheon.uf.edex.plugin.bufrsigwx/component-deploy.xml
+com.raytheon.uf.edex.plugin.ldadmesonet/component-deploy.xml
+com.raytheon.uf.common.dataplugin.bufrmthdw/component-deploy.xml
+com.raytheon.uf.edex.plugin.acarssounding/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml
+com.raytheon.edex.plugin.satellite/component-deploy.xml
+com.raytheon.edex.plugin.recco/component-deploy.xml
+com.raytheon.uf.edex.plugin.vaa/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.h5scd/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.scd/component-deploy.xml
+gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml
+com.raytheon.uf.common.dataplugin.poessounding/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.bufrssha/component-deploy.xml
+com.raytheon.uf.edex.plugin.bufrssmi/component-deploy.xml
+gov.noaa.nws.ncep.common.dataplugin.h5uair/component-deploy.xml
diff --git a/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar b/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar
new file mode 100644
index 0000000000..128f3525a9
Binary files /dev/null and b/edexOsgi/build.edex/tmp/uengine/com.raytheon.edex.common.jar differ
diff --git a/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar b/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar
new file mode 100644
index 0000000000..343c4c9e7c
Binary files /dev/null and b/edexOsgi/build.edex/tmp/uengine/com.raytheon.uf.common.serialization.jar differ
diff --git a/edexOsgi/com.raytheon.edex.msgutility/.classpath b/edexOsgi/com.raytheon.edex.msgutility/.classpath
index 751c8f2e50..acad1c227c 100644
--- a/edexOsgi/com.raytheon.edex.msgutility/.classpath
+++ b/edexOsgi/com.raytheon.edex.msgutility/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edexOsgi/com.raytheon.edex.product.uframe/.classpath b/edexOsgi/com.raytheon.edex.product.uframe/.classpath
index 1fa3e6803d..acad1c227c 100644
--- a/edexOsgi/com.raytheon.edex.product.uframe/.classpath
+++ b/edexOsgi/com.raytheon.edex.product.uframe/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/edexOsgi/meteolib.jni.linux32/.classpath b/edexOsgi/meteolib.jni.linux32/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/edexOsgi/meteolib.jni.linux32/.classpath
+++ b/edexOsgi/meteolib.jni.linux32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/edexOsgi/meteolib.jni.linux64/.classpath b/edexOsgi/meteolib.jni.linux64/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/edexOsgi/meteolib.jni.linux64/.classpath
+++ b/edexOsgi/meteolib.jni.linux64/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/edexOsgi/meteolib.jni.win32/.classpath b/edexOsgi/meteolib.jni.win32/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/edexOsgi/meteolib.jni.win32/.classpath
+++ b/edexOsgi/meteolib.jni.win32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ncep/edu.wisc.ssec.mcidas/component-deploy.xml b/ncep/edu.wisc.ssec.mcidas/component-deploy.xml
index 4a97eae816..88efa08c7a 100644
--- a/ncep/edu.wisc.ssec.mcidas/component-deploy.xml
+++ b/ncep/edu.wisc.ssec.mcidas/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="edu.wisc.ssec.mcidas">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml
index 1736bd9aff..c3412a6be6 100755
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.airmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml
index 0673b4342d..f3c931e65e 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.atcf">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml
index bcb3297531..3812f979b6 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.aww">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwh/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwh/component-deploy.xml
index ba5afa0bb9..d8bb957419 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwh/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwh/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.bufrsgwh">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 	
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwhv/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwhv/component-deploy.xml
index 458acdd293..b6f8428ba9 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwhv/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrsgwhv/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.bufrsgwhv">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrssha/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrssha/component-deploy.xml
index 3280818816..073394f1d1 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrssha/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.bufrssha/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.bufrssha">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 	
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml
index ba134e3ea9..be412e1f79 100755
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.convsigmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml
index 9e3b020c63..b2c5c9b902 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.ffg">
-	<!-- property name="component.name" value="plugin-ffg" /-->
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/component-deploy.xml
index c005308d00..a3a5e3551d 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.h5scd">
-	<!-- property name="component.name" value="plugin-h5scd" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>	
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
+	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/component-deploy.xml
index 8979cb561f..8e6027600a 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.h5uair">
-	<!--property name="component.name" value="plugin-h5uair" /-->
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml
index b16f8f9c75..ff7d39f18e 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.idft">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml
index 5df634e387..f7b7d81d0c 100755
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.intlsigmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml
index d31c582841..a7eca9a40c 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.mcidas">
-	<!-- property name="component.name" value="plugin-mcidas" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml
index 5a4431877b..8a8bc35063 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/component-deploy.xml
@@ -1,10 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.ncccfp">
-	<!--
-	<property name="component.name" value="plugin-ncccfp" />
-	-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml
index acd0a67839..f07db9f2de 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.ncgrib">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml
index 2042b653f3..30469198f1 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.ncscat">
-
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml
index bb1e42c62b..861a4f99bb 100755
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.pafm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.pafm/component-deploy.xml
index e05e26a82a..efaa84cac8 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.pafm/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.pafm/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.pafm">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.scd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.scd/component-deploy.xml
index cd2cf817d8..ac5c21979b 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.scd/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.scd/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.scd">
-	<!-- property name="component.name" value="plugin-scd" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>	
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
+	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml
index 1798238be5..88c53d6d0c 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.tcm">
-	<!-- property name="component.name" value="plugin-tcm" /-->
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.uair/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.uair/component-deploy.xml
index 36e243a180..46320935be 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.uair/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.uair/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.uair">
-	<!--property name="component.name" value="plugin-uair" /-->
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml
index 4495eeca63..05d3e61917 100644
--- a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common.dataplugin.wcp">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common.log/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common.log/component-deploy.xml
index d7ee64ae7f..54a2ee4ef6 100644
--- a/ncep/gov.noaa.nws.ncep.common.log/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common.log/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.commom.log">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.common/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common/component-deploy.xml
index d83bc7cb2a..1d3c8e5bb0 100755
--- a/ncep/gov.noaa.nws.ncep.common/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.common/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.common/component-deploy.xml
index b4efb03c7c..c4ce27a1c8 100644
--- a/ncep/gov.noaa.nws.ncep.edex.common/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.common/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.common">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
     
     <import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-    
 </project>
diff --git a/ncep/gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml
index 94f5045b55..44df28375f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.gempak.jna/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.gempak.jna">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml
index fb1c43db63..c3598b995d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.ingest.grib.util">
-	<!--property name="component.name" value="plugin-nctext" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml
index 8d51753ef0..09801d8934 100644
--- a/ncep/gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.ingest.util/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.ingest.util">
-	<!--property name="component.name" value="plugin-nctext" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml
index 3ad41a6fbe..e0a87287f5 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.airmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml
index beb1bb2240..64294475b3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.atcf">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml
index 7859107606..f3269fd9e5 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.aww">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwh/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwh/component-deploy.xml
index dea29ae739..a07adb54c4 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwh/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwh/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.bufrsgwh">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwhv/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwhv/component-deploy.xml
index 9032bb8543..769b467012 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwhv/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.bufrsgwhv/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.bufrsgwhv">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.bufrssha/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.bufrssha/component-deploy.xml
index 192b6be98b..9eb7039488 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.bufrssha/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.bufrssha/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.bufrssha">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml
index ba134e3ea9..d2b77ce8d9 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.convsigmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml
index e4c9c2fbf5..5c9780191c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.ffg">
-	<!--property name="component.name" value="plugin-ffg_ep" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.h5scd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.h5scd/component-deploy.xml
index 3b33f92949..a3a5e3551d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.h5scd/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.h5scd/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.h5scd">
-	<!-- property name="component.name" value="plugin-h5scd_ep" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.h5uair/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.h5uair/component-deploy.xml
index f17f0b3a13..2d25e4c2e0 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.h5uair/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.h5uair/component-deploy.xml
@@ -1,9 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.h5uair">
-
-	<!--property name="component.name" value="plugin-h5uair_ep" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml
index 6afefb4e3c..fde43408f0 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.idft">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml
index f281305d80..63c677d45d 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.intlsigmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml
index 70460b4c5e..798fc4fd44 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.mcidas">
-	<!-- property name="component.name" value="plugin-mcidas_ep" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml
index e88aa871f4..c307947f59 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/component-deploy.xml
@@ -1,9 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.mosaic">
-
-	<!-- property name="component.name" value="plugin-mosaic" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
+	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml
index e9187d5653..fe17cba4e4 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/component-deploy.xml
@@ -1,10 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.ncccfp">
-	<!--
-	<property name="component.name" value="plugin-ncccfp_ep" />
-	-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml
index 716459972f..9b2a74680d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.ncgrib">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml
index 2042b653f3..30469198f1 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.ncscat">
-
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml
index 4d9fb5cb4f..47c631d655 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.nctext">
-	<!--property name="component.name" value="plugin-nctext" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml
index db8e9b5fbb..3e961a1a28 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.nonconvsigmet">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.pafm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.pafm/component-deploy.xml
index e05e26a82a..efaa84cac8 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.pafm/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.pafm/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.pafm">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.scd/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.scd/component-deploy.xml
index 45d7636180..ac5c21979b 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.scd/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.scd/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.scd">
-	<!-- property name="component.name" value="plugin-scd_ep" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml
index 3d25848c16..d03d3fd333 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.tcm">
-	<!-- property name="component.name" value="plugin-tcm_ep" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.uair/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.uair/component-deploy.xml
index dbfaa89e23..a2c2c43d30 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.uair/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.uair/component-deploy.xml
@@ -1,9 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.uair">
-
-	<!--property name="component.name" value="plugin-uair_ep" /-->
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml
index a9dee42040..860c8714c5 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.plugin.wcp">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml
index 7b6fb841a4..3551db84ac 100644
--- a/ncep/gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.purgeutil/component-deploy.xml
@@ -1,8 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.purgeutil">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>
-
+</project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.edex.uengine/component-deploy.xml b/ncep/gov.noaa.nws.ncep.edex.uengine/component-deploy.xml
index 728789edc1..9fc7f0246b 100644
--- a/ncep/gov.noaa.nws.ncep.edex.uengine/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.uengine/component-deploy.xml
@@ -1,7 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.edex.uengine">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 	
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
 </project>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp.linux32/.classpath b/ncep/gov.noaa.nws.ncep.ui.nsharp.linux32/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp.linux32/.classpath
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp.linux32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp.linux64/.classpath b/ncep/gov.noaa.nws.ncep.ui.nsharp.linux64/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp.linux64/.classpath
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp.linux64/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp.win32/.classpath b/ncep/gov.noaa.nws.ncep.ui.nsharp.win32/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp.win32/.classpath
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp.win32/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>