diff --git a/cave/build/alertviz/customTargets.xml b/cave/build/alertviz/customTargets.xml
index dac3d6af3a..c7591efa9c 100644
--- a/cave/build/alertviz/customTargets.xml
+++ b/cave/build/alertviz/customTargets.xml
@@ -181,11 +181,6 @@
         		
         	</zip>
 
-        	<!-- Temp zip file including all the license files -->
-        	<zip destfile="/tmp/alertviz/FOSS_licenses.zip">
-        		<fileset dir="${buildDirectory}/../../../rpms/legal/FOSS_licenses"/>
-        	</zip>
-
             	<!-- Update the 64-bit (amd64) win32 CAVE zip with static files -->
             	<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
             		update="true">
@@ -194,7 +189,6 @@
             			excludes="cave/**" />
         		<zipfileset dir="${buildDirectory}/../../../rpms/legal" 
         			includes="Master_Rights_File.pdf" prefix="alertviz"/>
-        		<zipfileset dir="/tmp/alertviz" includes="FOSS_licenses.zip" prefix="alertviz"/> 
             	</zip>
         </target>
 
diff --git a/cave/build/build.properties.p2 b/cave/build/build.properties.p2
index 25b5d6b28c..8405baf7d5 100644
--- a/cave/build/build.properties.p2
+++ b/cave/build/build.properties.p2
@@ -1,5 +1,6 @@
 # This build.properties file is used exclusively by the cave pde p2 builds.
 
+topLevelElementType=feature
 buildType=I
 buildId=CAVE
 buildLabel=${buildType}.${buildId}
@@ -13,7 +14,7 @@ skipFetch=true
 skipMaps=true
 baseos=linux
 basews=gtk
-basearch=x86_64
+basearch=x86
 
 logExtension=.log
 javacDebugInfo=false
@@ -27,4 +28,4 @@ generate.p2.metadata=true
 p2.metadata.repo=file:/${buildDirectory}/repository
 p2.artifact.repo=file:/${buildDirectory}/repository
 p2.publish.artifacts=true
-generateVersionsList=true
+generateVersionsList=true
\ No newline at end of file
diff --git a/cave/build/build.sh b/cave/build/build.sh
new file mode 100755
index 0000000000..b1bf4b58b8
--- /dev/null
+++ b/cave/build/build.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+USAGE="Usage: `basename $0` [options]\nOptions:\n
+\t-eclipse=ECLIPSEPATH\tSets the full path to the eclipse directory REQUIRED\n"
+
+OPTS_FOR_ANT=""
+
+for i in $*
+do
+        case $i in
+        -D*)
+                OPTS_FOR_ANT=`echo "$OPTS_FOR_ANT $i "`
+                ;;
+        -eclipse=*)
+                ECLIPSE_HOME=`echo $i | sed 's/[-a-zA-Z0-9]*=//'`
+                ;;
+	-vvv)
+		VERBOSE=true
+		;;
+        *)
+                # unknown option
+                ;;
+        esac
+done
+
+if [ -z $ECLIPSE_HOME ]; then
+        echo -e $USAGE
+        exit 1
+fi
+
+if [ -n $VERBOSE ]; then
+	echo "AntOpts: '$OPTS_FOR_ANT'"
+fi
+
+rm -rf `pwd`/cave/tmp
+rm -rf `pwd`/alertviz/tmp
+
+export BUILDER=`pwd`/cave
+export BUILDER_ALERTVIZ=`pwd`/alertviz
+
+#get name of org.eclipse.equinox.launcher_*.jar in ECLIPSE_HOME with version label
+export LAUNCHER_JAR=`ls $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar`
+
+#get name of org.eclipse.pde.build in ECLIPSE_HOME with version label
+export PDE_BUILD=`ls -d $ECLIPSE_HOME/plugins/org.eclipse.pde.build_*`
+
+#Execute the build
+java -jar $LAUNCHER_JAR -application org.eclipse.ant.core.antRunner \
+-buildfile ${PDE_BUILD}/scripts/productBuild/productBuild.xml \
+-DbaseLocation=$ECLIPSE_HOME \
+-Dbuilder=$BUILDER \
+-DbuildDirectory=${BUILDER}/tmp \
+-Dbase=$BUILDER \
+-DproductFile=awips.product \
+$OPTS_FOR_ANT
+
+rc=$?
+if [[ $rc != 0 ]] ; then
+    exit $rc
+fi
+
+java -jar $LAUNCHER_JAR -application org.eclipse.ant.core.antRunner \
+-buildfile ${PDE_BUILD}/scripts/productBuild/productBuild.xml \
+-DbaseLocation=$ECLIPSE_HOME \
+-Dbuilder=$BUILDER_ALERTVIZ \
+-DbuildDirectory=${BUILDER_ALERTVIZ}/tmp \
+-Dbase=$BUILDER_ALERTVIZ \
+$OPTS_FOR_ANT
diff --git a/cave/build/build.xml b/cave/build/build.xml
index 8e70ba310f..b6d23c354a 100644
--- a/cave/build/build.xml
+++ b/cave/build/build.xml
@@ -6,19 +6,21 @@
 	<property name="build.ws"
 		value="gtk" />
 	<property name="build.arch"
-		value="x86_64" />
+		value="x86" />
         <property name="build.product"
                 value="awips.product" />
 	<!-- Copy the zip file that is produced to this location. -->
 	<property name="destination.dir"
-		value="" />
+		value="/awips2/jenkins/build/dump/" />
 	
 	<target name="usage">
 		<echo 
 			message="usage: ant -f ${basedir}/build.xml [alertviz] [cave]" />
 	</target>
 	
-	<target name="init">	
+	<target name="init">
+		<antcall target="clean" />
+		
 		<exec executable="/usr/bin/find"
 		outputproperty="launcher.jar">
 			<arg value="${eclipse.dir}/plugins" />
@@ -71,7 +73,7 @@
 			<arg value="-DbuildDirectory=${basedir}/cave/tmp" />
 			<arg value="-Dbase=${basedir}/cave" />
 			<arg value="-Dconfigs=${build.os},${build.ws},${build.arch}" />
-			<arg value="-Dproduct=${build.product}" />
+			<arg value="-DproductFile=${build.product}" />
 			
 			<classpath>
 				<pathelement 
diff --git a/cave/build/cave/build.properties b/cave/build/cave/build.properties
index 507ad8ddd2..2da49f18bd 100644
--- a/cave/build/cave/build.properties
+++ b/cave/build/cave/build.properties
@@ -20,13 +20,18 @@
 
 ############# PRODUCT/PACKAGING CONTROL #############
 
+# The product file is specified in the build.xml as a default and is
+#    overridable setting 'build.product' from ant. 
+product=${base}/../../com.raytheon.viz.product.awips/${productFile}
+#product=${base}/../../com.raytheon.viz.product.awips/developer.product
+
 runPackager=true
 
 #Needed for p2, comment out these lines if using developer.product
 p2.gathering=true
 generate.p2.metadata = true
-p2.metadata.repo=file:${buildDirectory}/repository
-p2.artifact.repo=file:${buildDirectory}/repository
+p2.metadata.repo=file:${buildDirectory}/repo
+p2.artifact.repo=file:${buildDirectory}/repo
 p2.flavor=tooling
 p2.publish.artifacts=true
 
@@ -44,8 +49,9 @@ collectingFolder=${archivePrefix}
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 #configs = *, *, *
-configs=linux,gtk,x86_64 & \
-	win32,win32,x86_64
+configs=linux, gtk, x86 & \
+	linux, gtk, x86_64 & \
+	win32, win32, x86
 # win32, win32, x86 & \
 #	linux, gtk, x86_64 & \
 #	linux, motif, x86 & \
diff --git a/cave/build/cave/customTargets.xml b/cave/build/cave/customTargets.xml
index b021ada9b0..f5c4477b2c 100644
--- a/cave/build/cave/customTargets.xml
+++ b/cave/build/cave/customTargets.xml
@@ -65,7 +65,63 @@
         <!-- ===================================================================== -->
         <!-- Steps to do after setup but before starting the build proper -->
         <!-- ===================================================================== -->
-        <target name="postSetup">
+        <target name="postSetup">        	
+                <echo message="${buildDirectory}"/>
+                <mkdir dir="${buildDirectory}/plugins"/>
+        		<echo message="com.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                        <fileset dir="${buildDirectory}/../../../" includes="com.*/**"/>
+                </copy>
+        		<echo message="ucar.*/**"/>
+	    		<copy todir="${buildDirectory}/plugins">
+	    	    	<fileset dir="${buildDirectory}/../../../" includes="ucar.*/**"/>
+	    	    </copy>
+        		<echo message="features.*/**"/>
+                <copy todir="${buildDirectory}/features">
+                        <fileset dir="${buildDirectory}/../../../" includes="*.feature*/**"/>
+                </copy>
+        		<echo message="ncsa.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                        <fileset dir="${buildDirectory}/../../../" includes="ncsa.*/**"/>
+                </copy>
+        		<echo message="org.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                        <fileset dir="${buildDirectory}/../../../" includes="org.*/**"/>
+                </copy>
+        		<echo message="net.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                        <fileset dir="${buildDirectory}/../../../" includes="net.*/**"/>
+                </copy>
+        		<echo message="ohd.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                    <fileset dir="${buildDirectory}/../../../" includes="ohd*/**"/>
+                </copy>
+        		<echo message="javax.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                        <fileset dir="${buildDirectory}/../../../" includes="javax.*/**"/>
+                </copy>
+                <echo message="gov.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                    <fileset dir="${buildDirectory}/../../../" includes="gov.*/**"/>
+                </copy>
+        		<echo message="edu.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                    <fileset dir="${buildDirectory}/../../../" includes="edu.*/**"/>
+                </copy>
+                <echo message="ogc.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                    <fileset dir="${buildDirectory}/../../../" includes="ogc.*/**"/>
+                </copy>
+
+            	<echo message="de.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                    <fileset dir="${buildDirectory}/../../../" includes="de.*/**"/>
+                </copy>
+
+                <echo message="ch.*/**"/>
+                <copy todir="${buildDirectory}/plugins">
+                    <fileset dir="${buildDirectory}/../../../" includes="ch.*/**"/>
+                </copy>
                 <antcall target="getBaseComponents" />
         </target>
 
@@ -116,30 +172,34 @@
         <!-- Steps to do after  running assemble. -->
         <!-- ===================================================================== -->
         <target name="postAssemble">
-        	<taskdef resource="net/sf/antcontrib/antlib.xml" 
-        		classpath="${builder}/../lib/ant/ant-contrib-1.0b3.jar" />       	
+        	<!-- Update the 32-bit linux CAVE zip with static files -->
+        	<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86.zip"
+        		update="true">
+        		
+        		<fileset dir="${buildDirectory}/../../static/linux"
+        			excludes="alertviz/**" />
+        		<fileset dir="${buildDirectory}/../../static/linux.x86" />
         	
-        	<!-- TODO: Is this still necessary? -->
-        	<if>
-        		<available file="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip" />
-        		<then>
-        			<!-- Temp zip file including all the license files -->
-        			<zip destfile="/tmp/cave/FOSS_licenses.zip">
-        				<fileset dir="${buildDirectory}/../../../rpms/legal/FOSS_licenses"/>
-        			</zip>
+        	</zip>
+        	<!-- Update the 64-bit linux CAVE zip with static files -->
+        	<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86_64.zip"
+        		update="true">
 
-        			<!-- Update the 64-bit (amd64) win32 CAVE zip with static and license files -->
-        			<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
-        				update="true">
+        		<fileset dir="${buildDirectory}/../../static/linux"
+        			excludes="alertviz/**" />
+        		<fileset dir="${buildDirectory}/../../static/linux.x86_64" />        		
+        		
+        	</zip>        	
+
+        	<!-- Update the 64-bit (amd64) win32 CAVE zip with static and license files -->
+        	<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
+        		update="true">
         	
-        				<fileset dir="${buildDirectory}/../../static/win32.amd64" 
-        					excludes="alertviz/**" />
-        				<zipfileset dir="${buildDirectory}/../../../rpms/legal" 
-        					includes="Master_Rights_File.pdf" prefix="cave"/>
-        				<zipfileset dir="/tmp/cave" includes="FOSS_licenses.zip" prefix="cave"/> 
-        			</zip>
-        		</then>
-        	</if>
+        		<fileset dir="${buildDirectory}/../../static/win32.amd64" 
+        			excludes="alertviz/**" />
+        		<zipfileset dir="${buildDirectory}/../../../rpms/legal" 
+        			includes="Master_Rights_File.pdf" prefix="cave"/>
+        	</zip>
 
         </target>
 
@@ -159,7 +219,281 @@
         <!-- Steps to do after the build is done. -->
         <!-- ===================================================================== -->
         <target name="postBuild">
+        	<taskdef resource="net/sf/antcontrib/antlib.xml" 
+        		classpath="${builder}/../lib/ant/ant-contrib-1.0b3.jar" />   
+        	
+		<taskdef name="xmltask"
+            	classname="com.oopsconsultancy.xmltask.ant.XmlTask">
+			<classpath>
+				<pathelement path="${builder}/../lib/ant/xmltask-v1.15.1.jar"/>
+				<pathelement path="${builder}/../lib/ant/xalan-2.7.2.jar"/>
+			</classpath>
+		</taskdef>
+        	
+            <!-- Generate the 32-bit CAVE ini files -->
+        	<var name="cave.arch" value="arch.x86" />
+        	<extractCAVEini
+        		zip.file="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86.zip" />
+                <!-- add the Xss jvm parameter to the 32-bit CAVE -->
+                <echo file="/tmp/cave/cave.ini" append="true" message="-Xss512k" />
+        	<antcall target="generateDynamicCAVE" />
+        	<!-- Update the 32-bit CAVE zip file -->
+        	<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86.zip" 
+         	 	 basedir="/tmp"
+        		 includes="cave/*.ini, cave/*.sh"
+        		 update="true" />
+            	
+            <!-- Generate the 64-bit CAVE ini files -->
+        	<var name="cave.arch" value="arch.x86_64" />
+        	<extractCAVEini
+        		zip.file="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86_64.zip" />
+        	<antcall target="generateDynamicCAVE" />
+        	<!-- Update the 64-bit cave.ini file -->
+        	<antcall target="update64BitINI" />
+            <!-- Update the 64-bit CAVE zip file -->
+            <zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86_64.zip" 
+             	basedir="/tmp"
+            	includes="cave/*.ini, cave/*.sh"
+            	update="true" />
         </target>
+	
+		<macrodef name="extractCAVEini">
+			<attribute name="zip.file" />
+			<sequential>
+		
+	            <unzip src="@{zip.file}"
+	            	dest="/tmp">
+	            	<patternset>
+	            		<include name="**/cave/cave.ini" />
+	            	</patternset>
+	            </unzip>				
+				
+			</sequential>
+		</macrodef>
+	
+		<macrodef name="verifyVersion">
+			<attribute name="file.version" />
+			
+			<sequential>
+				<property name="___memorySettingsVersion___"
+					value="4.0"/>
+				<if>
+					<not>
+						<equals
+							arg1="${___memorySettingsVersion___}"
+							arg2="@{file.version}" />
+					</not>
+					<then>
+						<fail 
+							message="ERROR: memorySettings.xml Version Mismatch." />
+					</then>
+				</if>
+			</sequential>
+		</macrodef>
+		
+		<target name="generateDynamicCAVE">
+			<xmlproperty file="${builder}/memorySettings.xml" 
+				collapseAttributes="true"/>
+			
+			<verifyVersion
+				file.version="${cave-memory-settings.file-version}" />
+			
+			<property name="iniLookupScript" 
+				value="/tmp/cave/iniLookup.sh" />
+			<!-- Start the iniLookup.sh script -->
+			<echo message="#!/bin/bash${line.separator}"
+				file="${iniLookupScript}" />
+			<echo message="${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="# This auto-generated script will be sourced by caveUtil.sh.${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="export ASSOCIATED_INI=${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="function retrieveAssociatedINI()${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="{${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="   # Arguments${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="   #   ${1} == one in the set: {-component, -perspective}${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="   #   ${2} == the argument that corresponds to the first argument${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="   # AUTOGENERATED IF STATEMENTS."
+				file="${iniLookupScript}" 
+				append="true" />
+			
+			<xmltask source="${builder}/memorySettings.xml">
+				<call path="//${cave.arch}/memory-setting">
+					<param name="first-arg" 
+						path="command-line-args/first-arg/text()" />
+					<param name="second-arg" 
+						path="command-line-args/second-arg/text()" />
+					
+					<!-- TODO: Explore using copy and buffers to do
+					     the following actions in a better way. -->
+					<param name="max-memory"
+						path="ini-substitutions/max-memory/value/text()" />
+					<param name="max-perm"
+						path="ini-substitutions/max-perm/value/text()" />
+						
+					<actions>												
+						<!-- Create a component-specific ini file -->
+						<copy verbose="true" 
+							file="/tmp/cave/cave.ini"
+							tofile="/tmp/cave/@{second-arg}.ini" 
+							overwrite="true" />
+
+						<!-- Update the ini file -->
+						<update.ini 
+							ini.file="@{second-arg}.ini" 
+							jvm.arg="${cave-memory-settings.default-memory-setting.default-max-memory.jvm-arg}" 
+							current.value="${cave-memory-settings.default-memory-setting.default-max-memory.value}"
+							new.value="@{max-memory}" />
+						
+						<update.ini 
+							ini.file="@{second-arg}.ini" 
+							jvm.arg="${cave-memory-settings.default-memory-setting.default-max-perm.jvm-arg}" 
+							current.value="${cave-memory-settings.default-memory-setting.default-max-perm.value}"
+							new.value="@{max-perm}" />
+						
+						<!-- Add to the ini lookup utility script -->
+						<echo message="${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+						<echo message="   if [ &quot;$${1}&quot; == &quot;@{first-arg}&quot; ] &amp;&amp;${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+						<echo message="      [ &quot;$${2}&quot; == &quot;@{second-arg}&quot; ]; then${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+						<echo message="${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+						
+						<echo message="      export ASSOCIATED_INI=&quot;@{second-arg}.ini&quot;${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+						<echo message="      return 0${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+						
+						<echo message="${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+						<echo message="   fi${line.separator}"
+							file="${iniLookupScript}" 
+							append="true" />
+					</actions>
+				</call>
+                <!-- site type specific overrides (wfo, ncep, etc) -->
+				<call path="//${cave.arch}/site-type-override">
+					<param name="site-type" 
+						path="site-type/text()" />
+
+					<param name="max-memory"
+						path="ini-substitutions/max-memory/value/text()" />
+					<param name="max-perm"
+						path="ini-substitutions/max-perm/value/text()" />
+
+					<actions>												
+						<!-- Create a site-type-specific ini file -->
+						<copy verbose="true" 
+							file="/tmp/cave/cave.ini"
+							tofile="/tmp/cave/@{site-type}.ini" 
+							overwrite="true" />
+
+						<!-- Update the ini file -->
+						<update.ini 
+							ini.file="@{site-type}.ini" 
+							jvm.arg="${cave-memory-settings.default-memory-setting.default-max-memory.jvm-arg}" 
+							current.value="${cave-memory-settings.default-memory-setting.default-max-memory.value}"
+							new.value="@{max-memory}" />
+						
+						<update.ini 
+							ini.file="@{site-type}.ini" 
+							jvm.arg="${cave-memory-settings.default-memory-setting.default-max-perm.jvm-arg}" 
+							current.value="${cave-memory-settings.default-memory-setting.default-max-perm.value}"
+							new.value="@{max-perm}" />
+                    </actions>
+                </call>    
+			</xmltask>
+			
+			<!-- Finish the iniLookup.sh script -->
+			<echo message="${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="   return 1${line.separator}"
+				file="${iniLookupScript}" 
+				append="true" />
+			<echo message="}"
+				file="${iniLookupScript}" 
+				append="true" />
+		</target>
+	
+		<!-- Used to update cave.ini for the x86_64 cave. -->
+		<target name="update64BitINI">
+			<xmlproperty file="${builder}/memorySettings.xml" 
+				collapseAttributes="true"/>
+			
+			<property name="caveXmx" value="2560M" />
+			<property name="caveMaxPermSize" value="256m" />
+			
+			<update.ini
+				ini.file="cave.ini" 
+				jvm.arg="${cave-memory-settings.default-memory-setting.default-max-memory.jvm-arg}" 
+				current.value="${cave-memory-settings.default-memory-setting.default-max-memory.value}" 
+				new.value="${caveXmx}" />
+			
+			<update.ini 
+				ini.file="cave.ini" 
+				jvm.arg="${cave-memory-settings.default-memory-setting.default-max-perm.jvm-arg}" 
+				current.value="${cave-memory-settings.default-memory-setting.default-max-perm.value}"
+				new.value="${caveMaxPermSize}" />
+		</target>
+	
+		<macrodef name="update.ini">
+			<attribute name="ini.file" />
+			<attribute name="jvm.arg" />
+			<attribute name="current.value" />
+			<attribute name="new.value" />
+			
+			<sequential>
+				<if>
+					<not>
+						<equals arg1="@{new.value}"
+							arg2="DEFAULT" />
+					</not>
+					<then>
+						<exec executable="/bin/sed"
+							output="/tmp/cave/ini.tmp">
+							<arg value="-e" />
+							<arg value="s/@{jvm.arg}@{current.value}/@{jvm.arg}@{new.value}/" />
+							<arg value="/tmp/cave/@{ini.file}" />
+						</exec>
+						
+						<move verbose="true" 
+							file="/tmp/cave/ini.tmp"
+							tofile="/tmp/cave/@{ini.file}" 
+							overwrite="true" />
+					</then>
+				</if>
+			</sequential>
+		</macrodef>
 
         <!-- ===================================================================== -->
 
diff --git a/cave/build/cave/memorySettings.xml b/cave/build/cave/memorySettings.xml
new file mode 100644
index 0000000000..76cb531301
--- /dev/null
+++ b/cave/build/cave/memorySettings.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cave-memory-settings>
+	<!-- The version should be incremented whenever
+		 the file layout changes. -->
+	<file-version>4.0</file-version>
+	
+	<!-- Example Entry ... See Below. -->
+	<!--
+	<memory-setting>
+		<command-line-args>
+			CURRENTLY, ONE OF: {-component, -perspective}
+			<first-arg>-component</first-arg>
+			THE ARGUMENT THAT CORRESPONDS TO THE FIRST ARGUMENT.
+			ALSO USED TO DETERMINE THE NAME OF THE ini FILE.
+			<second-arg>avnsetup</second-arg>
+		</command-line-args>
+		
+		<ini-substitutions>
+			<max-memory>
+				<value>1536M</value>
+			</max-memory>
+			
+			<max-perm>
+				<value>4046m</value>
+			</max-perm>
+		</ini-substitutions>	
+	</memory-setting>
+	-->
+	
+	<default-memory-setting>
+		<default-max-memory>
+			<jvm-arg>Xmx</jvm-arg>
+			<value>2048M</value>
+		</default-max-memory>
+		
+		<default-max-perm>
+			<jvm-arg>XX:MaxPermSize=</jvm-arg>
+			<value>128m</value>
+		</default-max-perm>
+	</default-memory-setting>
+
+	<arch.x86>
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-perspective</first-arg>
+				<second-arg>GFE</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>1536M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>DEFAULT</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+	
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-component</first-arg>
+				<second-arg>textws</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>128M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>64m</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+	
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-component</first-arg>
+				<second-arg>avnmenu</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>128M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>64m</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+
+                <memory-setting>
+                        <command-line-args>
+                                <first-arg>-component</first-arg>
+                                <second-arg>gfeclient</second-arg>
+                        </command-line-args>
+
+                        <ini-substitutions>
+                                <max-memory>
+                                        <value>1536M</value>
+                                </max-memory>
+
+                                <max-perm>
+                                        <value>DEFAULT</value>
+                                </max-perm>
+                        </ini-substitutions>
+                </memory-setting>
+	
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-component</first-arg>
+				<second-arg>servicebackup</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>256M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>128m</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-perspective</first-arg>
+				<second-arg>NCP</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>1536M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>DEFAULT</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+
+	</arch.x86>
+	
+	<arch.x86_64>
+		<!-- 
+			Since this may be increased for GFE in the future,
+			the following memory setting will remain even though
+			it is the same as the default.
+		 -->
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-perspective</first-arg>
+				<second-arg>GFE</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>3072M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>256m</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+	
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-component</first-arg>
+				<second-arg>textws</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>384M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>96M</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+	
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-component</first-arg>
+				<second-arg>avnmenu</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>512M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>128M</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+
+                <memory-setting>
+                        <command-line-args>
+                                <first-arg>-component</first-arg>
+                                <second-arg>gfeclient</second-arg>
+                        </command-line-args>
+
+                        <ini-substitutions>
+                                <max-memory>
+                                        <value>2048M</value>
+                                </max-memory>
+
+                                <max-perm>
+                                        <value>DEFAULT</value>
+                                </max-perm>
+                        </ini-substitutions>
+                </memory-setting>
+	
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-component</first-arg>
+				<second-arg>servicebackup</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>256M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>64M</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+
+		<memory-setting>
+			<command-line-args>
+				<first-arg>-perspective</first-arg>
+				<second-arg>NCP</second-arg>
+			</command-line-args>
+		
+			<ini-substitutions>
+				<max-memory>
+					<value>2048M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>DEFAULT</value>
+				</max-perm>
+			</ini-substitutions>
+		</memory-setting>
+		
+		<memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>activatesite</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>avnsetup</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>metar</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>windrose</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>cigvisdist</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>cigvistrend</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>hydroTimeSeries</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>hydroXdat</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+        
+        <memory-setting>
+            <command-line-args>
+                <first-arg>-component</first-arg>
+                <second-arg>autodqc</second-arg>
+            </command-line-args>
+        
+            <ini-substitutions>
+                <max-memory>
+                    <value>256M</value>
+                </max-memory>
+            
+                <max-perm>
+                    <value>64M</value>
+                </max-perm>
+            </ini-substitutions>
+        </memory-setting>
+
+        <!-- memory default overrides for a particular site type (wfo, ncep, etc) -->
+        <!-- site-type names need to be all lower case -->
+        <site-type-override>
+            <site-type>wfo</site-type>
+			<ini-substitutions>
+				<max-memory>
+					<value>2560M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>DEFAULT</value>
+				</max-perm>
+			</ini-substitutions>
+        </site-type-override>
+
+        <site-type-override>
+            <site-type>rfc</site-type>
+			<ini-substitutions>
+				<max-memory>
+					<value>2048M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>DEFAULT</value>
+				</max-perm>
+			</ini-substitutions>
+        </site-type-override>
+
+        <site-type-override>
+            <site-type>ncep</site-type>
+			<ini-substitutions>
+				<max-memory>
+					<value>3072M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>DEFAULT</value>
+				</max-perm>
+			</ini-substitutions>
+        </site-type-override>
+
+        <site-type-override>
+            <site-type>cwsu</site-type>
+			<ini-substitutions>
+				<max-memory>
+					<value>2560M</value>
+				</max-memory>
+			
+				<max-perm>
+					<value>DEFAULT</value>
+				</max-perm>
+			</ini-substitutions>
+        </site-type-override>
+
+	</arch.x86_64>
+	
+</cave-memory-settings>
diff --git a/cave/build/lib/ant/xalan-2.7.1.jar b/cave/build/lib/ant/xalan-2.7.1.jar
new file mode 100644
index 0000000000..458fa73d96
Binary files /dev/null and b/cave/build/lib/ant/xalan-2.7.1.jar differ
diff --git a/cave/build/p2-build-strict.xml b/cave/build/p2-build-strict.xml
index b2a8eb7d21..9b0f42ad65 100644
--- a/cave/build/p2-build-strict.xml
+++ b/cave/build/p2-build-strict.xml
@@ -332,4 +332,4 @@
 	
 	<taskdef resource="net/sf/antcontrib/antlib.xml" 
 		classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
-</project>	
+</project>	
\ No newline at end of file
diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 48ff3c23be..8a2fdf9a98 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -187,9 +187,6 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.kml.export.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.nwsauth.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.viz.gfe.feature" />
 		</antcall>
@@ -229,15 +226,9 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.thinclient.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.useradmin.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.registry.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.uf.viz.datadelivery.feature" />
-		</antcall>
         <antcall target="p2.build.repo">
             <param name="feature" value="com.raytheon.uf.viz.npp.feature" />
         </antcall>
diff --git a/cave/com.raytheon.uf.viz.dat.feature/feature.xml b/cave/com.raytheon.uf.viz.dat.feature/feature.xml
index 68b56387af..ac88bb6f81 100644
--- a/cave/com.raytheon.uf.viz.dat.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.dat.feature/feature.xml
@@ -93,6 +93,19 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.dataplugin.scan"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.viz.monitor.scan"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
    <plugin
          id="com.raytheon.uf.common.dataplugin.vil"
          download-size="0"
@@ -107,6 +120,44 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.monitor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.common.monitor.cpg"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.viz.monitor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.raytheon.uf.viz.monitor.fog"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.raytheon.uf.viz.monitor.safeseas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.raytheon.uf.viz.monitor.snow"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
    <plugin
          id="com.raytheon.viz.xdat"
          download-size="0"
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index 8e68036e28..b3fa80ed11 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -89,6 +89,10 @@
          id="com.raytheon.viz.satellite.feature"
          version="0.0.0"/>
 
+   <includes
+         id="com.raytheon.uf.viz.dat.feature"
+         version="0.0.0"/>
+
    <includes
          id="com.raytheon.uf.viz.ncep.core.feature"
          version="0.0.0"/>
diff --git a/rpms/awips2.cave/Installer.cave/component.spec b/rpms/awips2.cave/Installer.cave/component.spec
index ba46a1f04a..0a527d443e 100644
--- a/rpms/awips2.cave/Installer.cave/component.spec
+++ b/rpms/awips2.cave/Installer.cave/component.spec
@@ -330,8 +330,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir /awips2/cave/caveEnvironment
 /awips2/cave/caveEnvironment/*
 /awips2/cave/cave
+/awips2/cave/epl-v10.html
+/awips2/cave/notice.html
+/awips2/cave/readme/readme_eclipse.html
 /awips2/cave/*.sh
 /awips2/cave/*.so
-%dir /awips2/cave/lib%{_build_bits}
-/awips2/cave/lib%{_build_bits}/*
+%dir /awips2/cave/lib64
+/awips2/cave/lib64/*
 
diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh
index cfa661f52a..1423e49f88 100644
--- a/rpms/awips2.cave/deploy.builder/build.sh
+++ b/rpms/awips2.cave/deploy.builder/build.sh
@@ -214,7 +214,7 @@ for feature in `cat ${prepare_dir}/awipsInstall.txt`; do
     CAVE_EXE="${pde_build_dir}/I.CAVE/cave/cave"
     NOSPLASH_ARG="-nosplash"
     DIRECTOR_APP="-application org.eclipse.equinox.p2.director"
-    DESTINATION_ARG="-destination ${pde_build_dir}/I.CAVE/cave"
+    #DESTINATION_ARG="-destination ${pde_build_dir}/I.CAVE/cave"
     INSTALL_ARG="-i ${feature}.feature.group"
     UNINSTALL_ARG="-u ${feature}.feature.group"
     # Used to ensure that the awips2-java is used.
@@ -278,7 +278,7 @@ for feature in `cat ${prepare_dir}/ncepInstall.txt`; do
     CAVE_EXE="${pde_build_dir}/I.CAVE/cave/cave"
     NOSPLASH_ARG="-nosplash"
     DIRECTOR_APP="-application org.eclipse.equinox.p2.director"
-    DESTINATION_ARG="-destination ${pde_build_dir}/I.CAVE/cave"
+    #DESTINATION_ARG="-destination ${pde_build_dir}/I.CAVE/cave"
     INSTALL_ARG="-i ${feature}.feature.group"
     UNINSTALL_ARG="-u ${feature}.feature.group"
     # Used to ensure that the awips2-java is used.
diff --git a/rpms/awips2.cave/setup/scripts/prepare_dist.sh b/rpms/awips2.cave/setup/scripts/prepare_dist.sh
index d464f37e73..cd2122fb20 100644
--- a/rpms/awips2.cave/setup/scripts/prepare_dist.sh
+++ b/rpms/awips2.cave/setup/scripts/prepare_dist.sh
@@ -46,8 +46,15 @@ if [ ${RC} -ne 0 ]; then
 fi
 
 # Copy the CAVE zip file to the awips2.cave dist directory.
+CAVE_ZIP_NAME_32="CAVE-linux.gtk.x86.zip"
 CAVE_ZIP_NAME_64="CAVE-linux.gtk.x86_64.zip"
 CAVE_ZIP_LOC="cave/tmp/I.CAVE"
+CAVE_ZIP="${CAVE_ZIP_LOC}/${CAVE_ZIP_NAME_32}"
+if [ ! -f ${CAVE_ZIP} ]; then
+   echo "ERROR: ${CAVE_ZIP} does not exist."
+   exit 1
+fi
+cp -v ${CAVE_ZIP} ${CAVE_RPM_DIST_DIR}
 CAVE_ZIP="${CAVE_ZIP_LOC}/${CAVE_ZIP_NAME_64}"
 if [ ! -f ${CAVE_ZIP} ]; then
    echo "ERROR: ${CAVE_ZIP} does not exist."
@@ -66,7 +73,7 @@ fi
 time /awips2/ant/bin/ant -f p2-build.xml \
    -Declipse.dir=${UFRAME_ECLIPSE} \
    -Dbuild.version=${AWIPSII_VERSION} \
-   -Dbuild.arch=x86_64 \
+   -Dbuild.arch=${CAVE_BUILD_ARCH} \
    -Declipse.dir=${UFRAME_ECLIPSE}
 RC=$?
 
diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh
index 9ed5a4879e..1385b4296e 100644
--- a/rpms/build/common/lookupRPM.sh
+++ b/rpms/build/common/lookupRPM.sh
@@ -23,8 +23,8 @@ function lookupRPM()
 
    awips2_ade_dir="${rpms_dir}/awips2.ade"
    awips2_cave_dir="${rpms_dir}/awips2.cave"
-   awips2_edex_dir="${rpms_dir}/awips2.edex"
    awips2_core_dir="${rpms_dir}/awips2.core"
+   awips2_edex_dir="${rpms_dir}/awips2.edex"
    awips2_qpid_dir="${rpms_dir}/awips2.qpid"
    awips2_upc_dir="${rpms_dir}/awips2.upc"
    python_site__dir="${rpms_dir}/python.site-packages"
@@ -38,11 +38,11 @@ function lookupRPM()
    fi
    # foss rpms -> python rpms.
    if [ "${1}" = "awips2-maven" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/maven/"
+      export RPM_SPECIFICATION="${installer_dir}/maven-3.2.3/"
       return 0
    fi
    if [ "${1}" = "awips2-python" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/python/"
+      export RPM_SPECIFICATION="${installer_dir}/python-2.7.10/"
       return 0
    fi
    if [ "${1}" = "awips2-python-cherrypy" ]; then
@@ -50,47 +50,36 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-python-h5py" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/h5py/"
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.h5py/"
       return 0
    fi
-   if [ "${1}" = "awips2-python-setuptools" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/setuptools/"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-matplotlib" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/matplotlib/"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-dateutil" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/python-dateutil/"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-pytz" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/pytz/"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-six" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/six/"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-pyparsing" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/pyparsing/"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-nose" ]; then
-      export RPM_SPECIFICATION="${python_site__dir}/Installer.nose"
+   if [ "${1}" = "awips2-python-jimporter" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.jimporter"
       return 0
    fi
    if [ "${1}" = "awips2-python-gfe" ]; then
       export RPM_SPECIFICATION="${python_site__dir}/Installer.gfe"
       return 0
    fi
+   if [ "${1}" = "awips2-python-matplotlib" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/matplotlib"
+      return 0
+   fi
+   if [ "${1}" = "awips2-python-nose" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.nose"
+      return 0
+   fi
    if [ "${1}" = "awips2-python-numpy" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/numpy/"
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.numpy"
+
       return 0
    fi
    if [ "${1}" = "awips2-python-jep" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/jep/"
+      export RPM_SPECIFICATION="${installer_dir}/jep"
+      return 0
+   fi
+   if [ "${1}" = "awips2-python-pil" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.pil"
       return 0
    fi
    if [ "${1}" = "awips2-python-pmw" ]; then
@@ -102,19 +91,19 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-python-qpid" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/qpid-python"
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.qpid"
       return 0
    fi
    if [ "${1}" = "awips2-python-scientific" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/scientific"
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.scientific"
       return 0
    fi
    if [ "${1}" = "awips2-python-scipy" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/scipy/"
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.scipy"
       return 0
    fi
-   if [ "${1}" = "awips2-python-tables" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/tables/"
+   if [ "${1}" = "awips2-python-pyparsing" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.pyparsing"
       return 0
    fi
    if [ "${1}" = "awips2-python-basemap" ]; then
@@ -176,7 +165,7 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-python-shapely" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/shapely/"
+      export RPM_SPECIFICATION="${installer_dir}/shapely"
       return 0
    fi
 
@@ -201,10 +190,6 @@ function lookupRPM()
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.database"
       return 0
    fi
-   if [ "${1}" = "awips2-edex-configuration" ]; then
-      export RPM_SPECIFICATION="${awips2_edex_dir}/Installer.edex-configuration"
-      return 0
-   fi
    if [ "${1}" = "awips2-database-standalone-configuration" ]; then
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.database-standalone-configuration"
       return 0
@@ -262,28 +247,19 @@ function lookupRPM()
    fi
 
    # foss rpms.
-   if [ "${1}" = "awips2-qpid-java" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/qpid-java"
-      return 0
-   fi
-   if [ "${1}" = "awips2-qpid-lib" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/qpid-lib"
-      return 0
-   fi
-   if [ "${1}" = "awips2-qpid-java-broker" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/qpid-java-broker"
+   if [ "${1}" = "-qpid" ]; then
       return 0
    fi
    if [ "${1}" = "awips2-ant" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/ant"
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ant"
       return 0
    fi
    if [ "${1}" = "awips2-httpd-pypies" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/httpd-pypies"
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.httpd-pypies"
       return 0
    fi
    if [ "${1}" = "awips2-java" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/java"
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.java"
       return 0
    fi
    if [ "${1}" = "awips2-groovy" ]; then
@@ -294,14 +270,14 @@ function lookupRPM()
       export RPM_SPECIFICATION="${awips2_upc_dir}/Installer.ldm"
       return 0
    fi
-   if [ "${1}" = "awips2-postgresql" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/postgresql"
-      return 0
-   fi
    if [ "${1}" = "awips2-edex-upc" ]; then
       export RPM_SPECIFICATION="${awips2_upc_dir}/Installer.edex-upc"
       return 0
    fi
+   if [ "${1}" = "awips2-postgres" ]; then
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.postgres"
+      return 0
+   fi
    if [ "${1}" = "awips2-pgadmin3" ]; then
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.pgadmin"
       return 0
@@ -311,11 +287,19 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-eclipse" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/eclipse"
+      export RPM_SPECIFICATION="${awips2_ade_dir}/Installer.eclipse"
+      return 0
+   fi
+   if [ "${1}" = "awips2-openfire" ]; then
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.xmpp"
+      return 0
+   fi
+   if [ "${1}" = "awips2-collab-dataserver" ]; then
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.collab-dataserver"
       return 0
    fi
    if [ "${1}" = "awips2-yajsw" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/yajsw"
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.yajsw"
       return 0
    fi
 
diff --git a/rpms/build/common/rpms.sh b/rpms/build/common/rpms.sh
index f0ead998fc..fff4b82145 100644
--- a/rpms/build/common/rpms.sh
+++ b/rpms/build/common/rpms.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -vf
+#!/bin/bash
 
 function buildOpenfire()
 {
@@ -12,7 +12,7 @@ function buildOpenfire()
       --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
       --define '_baseline_workspace %(echo ${WORKSPACE})' \
       --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-      --define '_static_files %(echo ${AWIPSII_STATIC_FILES})' \
+      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
       --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
       --define '_component_version %(echo ${AWIPSII_VERSION})' \
       --define '_component_release %(echo ${AWIPSII_RELEASE})' \
diff --git a/rpms/build/common/usage.sh b/rpms/build/common/usage.sh
new file mode 100644
index 0000000000..dc73a2f1fd
--- /dev/null
+++ b/rpms/build/common/usage.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This script will just display the usage information.
+function usage()
+{
+   echo "Usage: $0 OPTION [-nobinlightning]"
+   echo "   -delta    perform a build of only the rpms that are likely to change."
+   echo "   -java     build Java rpm."
+   echo "   -local    build localization rpms."
+   echo "   -full     perform a full build of all the rpms."
+   echo "   -ade      build all rpms that are packaged in the ade."
+   echo "   -viz      only build the Viz rpms (CAVE & AlertViz)."
+   echo "   -edex     only build the EDEX rpms."
+   echo "   -shp      only build the EDEX shapefile rpm."
+   echo "   -python   build Python rpms."
+   echo "   -pydev    build additional Python rpms."
+   echo "   -qpid     build only the QPID rpms."
+   echo "   -ldm      build the awips2-ldm rpm; requires root privileges."
+   echo "   -upc      build the awips2-edex-upc rpm."
+   echo "   -dev      call functions directly"
+   echo "   -package  create a yum repository tar file with the rpms that were just built."
+   echo "   --help    display this message and exit."
+
+   return 0
+}
diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh
index 6ab42fe114..c04174db9a 100644
--- a/rpms/build/i386/build.sh
+++ b/rpms/build/i386/build.sh
@@ -10,13 +10,12 @@ function buildRPM()
       exit 1
    fi
 
-   /usr/bin/rpmbuild -bb \
+   /usr/bin/rpmbuild -ba \
       --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
       --define '_baseline_workspace %(echo ${WORKSPACE})' \
       --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-      --define '_static_files %(echo ${AWIPSII_STATIC_FILES})' \
+      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
       --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
-      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
       --define '_component_version %(echo ${AWIPSII_VERSION})' \
       --define '_component_release %(echo ${AWIPSII_RELEASE})' \
       --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
@@ -56,6 +55,16 @@ if [ $? -ne 0 ]; then
    echo "ERROR: Unable to source the common functions."
    exit 1
 fi
+source ${common_dir}/usage.sh
+if [ $? -ne 0 ]; then
+   echo "ERROR: Unable to source the common functions."
+   exit 1
+fi
+source ${common_dir}/rpms.sh
+if [ $? -ne 0 ]; then
+   echo "ERROR: Unable to source the common functions."
+   exit 1
+fi
 source ${common_dir}/systemInfo.sh
 if [ $? -ne 0 ]; then
    echo "ERROR: Unable to retrieve the system information."
@@ -69,26 +78,52 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-if [ "${1}" = "-full" ]; then
-   buildRPM "awips2-qpid-lib"
-   buildRPM "awips2-qpid-java"
-   buildRPM "awips2-qpid-java-broker"
-   buildRPM "awips2-java"
-   buildRPM "awips2-notification"
-
-   exit 0
+export LIGHTNING=true
+# Determine if the optional '-nobinlightning' argument has been specified.
+if [ "${2}" = "-nobinlightning" ]; then
+   LIGHTNING=false
 fi
 
-if [ "${1}" = "-qpid" ]; then
-   buildRPM "awips2-qpid-lib"
-   buildRPM "awips2-qpid-java"
-   buildRPM "awips2-qpid-java-broker"
+if [ "${1}" = "-python-qpid" ]; then
+#   buildRPM "awips2"
+#   buildRPM "awips2-python-qpid"
+#   buildRPM "awips2-python"
+#   buildRPM "awips2-python-cherrypy"
+   buildRPM "awips2-python-awips"
+#   buildRPM "awips2-python-nose"
+#   buildRPM "awips2-python-numpy"
+#   buildRPM "awips2-python-h5py"
+#   buildRPM "awips2-python-jimporter"
+#   buildRPM "awips2-python-matplotlib"
+#   buildRPM "awips2-python-pil"
+#   buildRPM "awips2-python-pmw"
+#   buildRPM "awips2-python-pupynere"
+#   buildRPM "awips2-python-scientific"
+#   buildRPM "awips2-python-scipy"
+#   buildRPM "awips2-python-tables"
+#   buildRPM "awips2-python-tpg"
+#   buildRPM "awips2-python-werkzeug"
+#   buildRPM "awips2-python-pygtk"
+#   buildRPM "awips2-python-pycairo"
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
 
-   exit 0
-fi
+   buildQPID
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
 
-if [ "${1}" = "-java" ]; then
-   buildRPM "awips2-java"
+   #buildRPM "awips2-ant"
+   #unpackHttpdPypies
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+   #buildRPM "awips2-httpd-pypies"
+   #buildRPM "awips2-java"
+   #buildRPM "awips2-ldm"
+   #buildRPM "awips2-tools"
+   buildRPM "awips2-python-shapely"
 
    exit 0
 fi
@@ -99,11 +134,303 @@ if [ "${1}" = "-notification" ]; then
    exit 0
 fi
 
-echo "Usage: $0 OPTION"
-echo "   -full          perform a full build of all the rpms."
-echo "   -qpid          build only the QPID rpms."
-echo "   -java          build only the Java rpm."
-echo "   -notification  build only the notification rpm."
-echo "   --help         display this message and exit."
 
+if [ "${1}" = "-postgres" ]; then
+   buildRPM "awips2-postgres"
+   buildRPM "awips2-database-standalone-configuration"
+   buildRPM "awips2-database"
+   buildRPM "awips2-maps-database"
+   buildRPM "awips2-pgadmin3"
+   buildRPM "awips2-data.hdf5-topo"
+   buildRPM "awips2-notification"
+   buildRPM "awips2-tools"
+
+   exit 0
+fi
+
+if [ "${1}" = "-delta" ]; then
+   buildRPM "awips2"
+   buildRPM "awips2-common-base"
+   buildCAVE
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+   buildRPM "awips2-alertviz"
+   buildEDEX
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   buildRPM "awips2"
+   buildRPM "awips2-ncep-database"
+   buildRPM "awips2-gfesuite-client"
+   buildRPM "awips2-gfesuite-server"
+   buildRPM "awips2-python-awips"
+
+   buildRPM "awips2-adapt-native"
+   buildRPM "awips2-aviation-shared"
+   buildRPM "awips2-cli"
+   buildRPM "awips2-database"
+   buildRPM "awips2-database-standalone-configuration"
+   buildRPM "awips2-hydroapps-shared"
+   buildRPM "awips2-localapps-environment"
+   buildRPM "awips2-maps-database"
+   buildRPM "awips2-notification"
+   buildRPM "awips2-pypies"
+   buildRPM "awips2-data.hdf5-topo"
+   buildRPM "awips2-data.gfe"
+   buildRPM "awips2-rcm"
+   buildRPM "awips2-edex-environment"
+   buildLocalizationRPMs
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   exit 0
+fi
+
+if [ "${1}" = "-full" ]; then
+   buildRPM "awips2-common-base"
+   buildCAVE
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+   buildRPM "awips2-alertviz"
+   buildEDEX
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+   buildRPM "awips2-python"
+   buildRPM "awips2-python-cherrypy"
+   buildRPM "awips2-python-awips"
+   buildRPM "awips2-python-h5py"
+   buildRPM "awips2-python-jimporter"
+   buildRPM "awips2-python-matplotlib"
+   buildRPM "awips2-python-nose"
+   buildRPM "awips2-python-numpy"
+   buildRPM "awips2-python-pil"
+   buildRPM "awips2-python-pmw"
+   buildRPM "awips2-python-pupynere"
+   buildRPM "awips2-python-qpid"
+   buildRPM "awips2-python-scientific"
+   buildRPM "awips2-python-scipy"
+   buildRPM "awips2-python-tables"
+   buildRPM "awips2-python-tpg"
+   buildRPM "awips2-python-werkzeug"
+   buildRPM "awips2-python-pygtk"
+   buildRPM "awips2-python-pycairo"
+
+   buildRPM "awips2"
+   buildRPM "awips2-adapt-native"
+   buildRPM "awips2-aviation-shared"
+   buildRPM "awips2-cli"
+   buildRPM "awips2-database"
+   buildRPM "awips2-database-standalone-configuration"
+   buildRPM "awips2-data.gfe"
+   buildRPM "awips2-gfesuite-client"
+   buildRPM "awips2-gfesuite-server"
+   buildRPM "awips2-hydroapps-shared"
+   buildRPM "awips2-localapps-environment"
+   buildRPM "awips2-ncep-database"
+   buildRPM "awips2-maps-database"
+   buildRPM "awips2-notification"
+   buildRPM "awips2-pypies"
+   buildRPM "awips2-data.hdf5-topo"
+   buildRPM "awips2-rcm"
+   buildLocalizationRPMs
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   buildQPID
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   buildRPM "awips2-ant"
+   unpackHttpdPypies
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+   buildRPM "awips2-httpd-pypies"
+   buildJava
+   buildRPM "awips2-groovy"
+   buildRPM "awips2-ldm"
+   buildRPM "awips2-postgres"
+   buildRPM "awips2-pgadmin3"
+   buildRPM "awips2-tools"
+   buildRPM "awips2-edex-environment"
+   buildRPM "awips2-openfire"
+   buildRPM "awips2-collab-dataserver"
+   buildRPM "awips2-python-shapely"
+
+   exit 0
+fi
+
+if [ "${1}" = "-ade" ]; then
+   buildRPM "awips2-eclipse"
+   buildJava
+   buildRPM "awips2-ant"
+   buildRPM "awips2-python"
+   buildRPM "awips2-python-cherrypy"
+   buildRPM "awips2-python-awips"
+   buildRPM "awips2-python-h5py"
+   buildRPM "awips2-python-jimporter"
+   buildRPM "awips2-python-matplotlib"
+   buildRPM "awips2-python-nose"
+   buildRPM "awips2-python-numpy"
+   buildRPM "awips2-python-pil"
+   buildRPM "awips2-python-pmw"
+   buildRPM "awips2-python-pupynere"
+   buildRPM "awips2-python-qpid"
+   buildRPM "awips2-python-scientific"
+   buildRPM "awips2-python-scipy"
+   buildRPM "awips2-python-tables"
+   buildRPM "awips2-python-tpg"
+   buildRPM "awips2-python-werkzeug"
+   buildRPM "awips2-python-pygtk"
+   buildRPM "awips2-python-pycairo"
+   buildRPM "awips2-python-shapely"
+   buildQPID -ade
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   # Package the ade.
+   # Create the containing directory.
+   ade_directory="awips2-ade-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
+   if [ -d ${WORKSPACE}/${ade_directory} ]; then
+      rm -rf ${WORKSPACE}/${ade_directory}
+      if [ $? -ne 0 ]; then
+         exit 1
+      fi
+   fi
+   mkdir -p ${WORKSPACE}/${ade_directory}
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   # Copy the rpms to the directory.
+   cp -v ${AWIPSII_TOP_DIR}/RPMS/i386/* \
+      ${AWIPSII_TOP_DIR}/RPMS/noarch/* \
+      ${WORKSPACE}/${ade_directory}
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   awips2_ade_directory="${WORKSPACE}/rpms/awips2.ade"
+   # Copy the install and uninstall script to the directory.
+   cp -v ${awips2_ade_directory}/tar.ade/scripts/*.sh \
+      ${WORKSPACE}/${ade_directory}
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+    # Build the source jar file
+    ade_work_dir="/home/dmsys/Dim12/build/AWIPS2/AWIPS2-ADE-OB13.5.1-CM"
+    cd $ade_work_dir
+    ./build_source_jar.sh
+    cp -v /tmp/awips-component/tmp/awips2-ade-baseline-SOURCES.jar ${WORKSPACE}/${ade_directory}
+
+   # Tar the directory.
+   pushd . > /dev/null 2>&1
+   cd ${WORKSPACE}
+   tar -cvf ${ade_directory}.tar ${ade_directory}
+   popd > /dev/null 2>&1
+   RC=$?
+   if [ ${RC} -ne 0 ]; then
+      exit 1
+   fi
+
+   exit 0
+fi
+
+if [ "${1}" = "-viz" ]; then
+   buildRPM "awips2"
+   buildRPM "awips2-common-base"
+  # buildRPM "awips2-rcm"
+  # buildRPM "awips2-hydroapps-shared"
+  # buildRPM "awips2-notification"
+   buildCAVE
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+   buildRPM "awips2-alertviz"
+
+   exit 0
+fi
+
+if [ "${1}" = "-edex" ]; then
+   #buildRPM "awips2"
+   #buildRPM "awips2-common-base"
+ #  buildRPM "awips2-adapt-native"
+   #buildRPM "awips2-python-qpid"
+ # buildRPM "awips2-cli"
+   buildRPM "awips2-gfesuite-client"
+   buildRPM "awips2-gfesuite-server"
+ # buildRPM "awips2-ncep-database"
+ # buildRPM "awips2-python-awips"
+   buildEDEX
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   exit 0
+fi
+
+if [ "${1}" = "-qpid" ]; then
+   buildQPID
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   exit 0
+fi
+
+if [ "${1}" = "-ldm" ]; then
+   buildRPM "awips2-ldm"
+
+   exit 0
+fi
+
+if [ "${1}" = "-package" ]; then
+   repository_directory="awips2-repository-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
+   if [ -d ${WORKSPACE}/${repository_directory} ]; then
+      rm -rf ${WORKSPACE}/${repository_directory}
+      if [ $? -ne 0 ]; then
+         exit 1
+      fi
+   fi
+   mkdir -p ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   cp -r ${AWIPSII_TOP_DIR}/RPMS/* \
+      ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   rpms_directory="${WORKSPACE}/rpms"
+   comps_xml="${rpms_directory}/common/yum/arch.x86/comps.xml"
+   cp -v ${comps_xml} ${WORKSPACE}/${repository_directory}
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+
+   pushd . > /dev/null
+   cd ${WORKSPACE}
+   tar -cvf ${repository_directory}.tar ${repository_directory}
+   RC=$?
+   popd > /dev/null
+   if [ ${RC} -ne 0 ]; then
+      exit 1
+   fi
+
+   exit 0
+fi
+
+
+usage
 exit 0
diff --git a/rpms/build/i386/buildEnvironment.sh b/rpms/build/i386/buildEnvironment.sh
index eb4fe8ef5d..97b341d088 100644
--- a/rpms/build/i386/buildEnvironment.sh
+++ b/rpms/build/i386/buildEnvironment.sh
@@ -1,11 +1,30 @@
 #!/bin/bash
 
 # User-configurable environment parameters that are used during the build.
-export AWIPSII_VERSION="11.9.0"
-export AWIPSII_RELEASE="20120223"
+# The baseline parameter is specific to non-Jenkins / non-Hudson builds
+export BUILD_DIR=/awips2/jenkins/buildspace
+export BUILD_WORKSPACE=${BUILD_DIR}/workspace
+export AWIPSII_VERSION="15.1.1"
+export AWIPSII_RELEASE="1n${BUILD_NUMBER}"
+
+export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"
+#export WORKSPACE="${BUILD_WORKSPACE}/AWIPS2-NCEP_build/baseline"
+export WORKSPACE="/awips2/repo/awips2-builds"
+export BASELINE="/awips2/repo/awips2-builds"
 
-export AWIPSII_TOP_DIR="/tmp/${USER}/rpmbuild"
-export WORKSPACE="/tmp/${USER}/baseline"
 export UFRAME_ECLIPSE="/awips2/eclipse"
-export AWIPSII_BUILD_ROOT="/tmp/${USER}/awips-component"
+
+export AWIPSCM_SHARE="${BUILD_WORKSPACE}/awipscm"
+export AWIPSII_BUILD_ROOT="${BUILD_WORKSPACE}/tmp/${USER}/awips-component"
+
+echo "BUILD_DIR = $BUILD_DIR"
+echo "BUILD_WORKSPACE = $BUILD_WORKSPACE"
+echo "BASELINE = $BASELINE"
+echo "AWIPSII_VERSION = $AWIPSII_VERSION"
+echo "AWIPSII_RELEASE = $AWIPSII_RELEASE"
+echo "AWIPSII_TOP_DIR = $AWIPSII_TOP_DIR"
+echo "WORKSPACE = $WORKSPACE"
+echo "UFRAME_ECLIPSE = $UFRAME_ECLIPSE"
+echo "AWIPSCM_SHARE = $AWIPSCM_SHARE"
+echo "AWIPSII_BUILD_ROOT = $AWIPSII_BUILD_ROOT"
 
diff --git a/rpms/build/x86_64/WA_rpm_build.sh b/rpms/build/x86_64/WA_rpm_build.sh
index 65712971ae..65d1f42c5f 100644
--- a/rpms/build/x86_64/WA_rpm_build.sh
+++ b/rpms/build/x86_64/WA_rpm_build.sh
@@ -39,6 +39,6 @@ function WA_rpm_build()
 			buildRPMExec "${RPM_SPECIFICATION}"
 		done
 		
+		return 0 
 	done
-	return 0 
-}
+}
\ No newline at end of file
diff --git a/rpms/build/x86_64/buildEnvironment.sh b/rpms/build/x86_64/buildEnvironment.sh
index 8031beed3d..bd648a9678 100644
--- a/rpms/build/x86_64/buildEnvironment.sh
+++ b/rpms/build/x86_64/buildEnvironment.sh
@@ -16,7 +16,7 @@ export BASELINE="/awips2/repo/awips2-builds"
 
 export UFRAME_ECLIPSE="/awips2/eclipse"
 
-export AWIPSII_STATIC_FILES="${BUILD_WORKSPACE}/awipscm"
+export AWIPSCM_SHARE="${BUILD_WORKSPACE}/awipscm"
 export AWIPSII_BUILD_ROOT="${BUILD_WORKSPACE}/tmp/${USER}/awips-component"
 
 echo "BUILD_DIR = $BUILD_DIR"
@@ -27,5 +27,5 @@ echo "AWIPSII_RELEASE = $AWIPSII_RELEASE"
 echo "AWIPSII_TOP_DIR = $AWIPSII_TOP_DIR"
 echo "WORKSPACE = $WORKSPACE"
 echo "UFRAME_ECLIPSE = $UFRAME_ECLIPSE"
-echo "AWIPSII_STATIC_FILES = $AWIPSII_STATIC_FILES"
+echo "AWIPSCM_SHARE = $AWIPSCM_SHARE"
 echo "AWIPSII_BUILD_ROOT = $AWIPSII_BUILD_ROOT"
diff --git a/rpms/common/environment/awips2-cave/profile.d/awips2Cave.csh b/rpms/common/environment/awips2-cave/profile.d/awips2Cave.csh
deleted file mode 100644
index ac34fc8983..0000000000
--- a/rpms/common/environment/awips2-cave/profile.d/awips2Cave.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/csh
-
-# Determine where cave has been installed.
-set CAVE_INSTALL="/awips2/cave"
-setenv TMCP_HOME "${CAVE_INSTALL}/caveEnvironment"
-setenv FXA_HOME "${CAVE_INSTALL}/caveEnvironment"
diff --git a/rpms/common/environment/awips2-cave/profile.d/awips2Cave.sh b/rpms/common/environment/awips2-cave/profile.d/awips2Cave.sh
deleted file mode 100644
index 30770d871b..0000000000
--- a/rpms/common/environment/awips2-cave/profile.d/awips2Cave.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Determine where cave has been installed.
-CAVE_INSTALL="/awips2/cave"
-export TMCP_HOME=${CAVE_INSTALL}/caveEnvironment
-export FXA_HOME=${CAVE_INSTALL}/caveEnvironment