From 9c02939b12f34e715d21dc7abd0f7f33bef37703 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Wed, 8 Aug 2018 10:46:27 -0600
Subject: [PATCH] edex build/deploy cleanup

---
 edexOsgi/build.edex/build.xml                 | 26 +++---
 .../deploy-common/external-rules.xml          | 12 ---
 edexOsgi/build.edex/deploy-install.xml        | 88 ++-----------------
 .../deploy.edex.awips2/deploy/deploy-esb.xml  |  5 --
 4 files changed, 18 insertions(+), 113 deletions(-)

diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index 199b2f46c0..f990407503 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -61,19 +61,6 @@
 			<param name="feature"
 				value="com.raytheon.uf.edex.dataplugins.feature" />
 		</antcall>
-		<antcall target="build">
-			<param name="feature"
-				value="com.raytheon.uf.edex.gfe.feature" />
-		</antcall>
-                <antcall target="build">
-                        <param name="feature"
-                                value="com.raytheon.uf.edex.dat.feature" />
-                </antcall>
-<!--
-		<antcall target="build">
-			<param name="feature"
-				value="edu.ucar.unidata.uf.edex.unidata.feature" />
-		</antcall>
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.ogc.feature" />
@@ -82,15 +69,26 @@
 			<param name="feature"
 				value="com.raytheon.uf.edex.datadelivery.feature" />
 		</antcall>
+                <antcall target="build">
+                        <param name="feature"
+                                value="com.raytheon.uf.edex.dat.feature" />
+                </antcall>
 		<antcall target="build">
 			<param name="feature"
 				value="gov.noaa.nws.ncep.uf.edex.swpc.feature" />
 		</antcall>
+		<antcall target="build">
+			<param name="feature"
+				value="com.raytheon.uf.edex.gfe.feature" />
+		</antcall>
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.hazards.feature" />
 		</antcall>
--->
+		<antcall target="build">
+			<param name="feature"
+				value="edu.ucar.unidata.uf.edex.unidata.feature" />
+		</antcall>
 	</target>
 
     <target name="main" depends="clean, init, main-build" />
diff --git a/edexOsgi/build.edex/deploy-common/external-rules.xml b/edexOsgi/build.edex/deploy-common/external-rules.xml
index 04ca33d600..4afeefd553 100644
--- a/edexOsgi/build.edex/deploy-common/external-rules.xml
+++ b/edexOsgi/build.edex/deploy-common/external-rules.xml
@@ -4,7 +4,6 @@
         TODO: if necessary, these could be read from a properties file.
         1) utility -> /awips2/edex/data/utility
         2) resources -> /awips2/edex/conf/resources
-        3) modes -> /awips2/edex/conf/modes
     -->
     <target name="enact.external-rules">
         <!-- parameters -->
@@ -34,17 +33,6 @@
                 </copy>
             </then>
         </if>
-
-        <mkdir dir="${deployment._root}/conf/modes" />
-        <if>
-            <available file="${plugin._directory}/modes" type="dir" />
-            <then>
-                <copy todir="${deployment._root}/conf/modes" overwrite="true" verbose="true">
-                    <fileset dir="${plugin._directory}/modes" />
-                </copy>
-            </then>
-        </if>
-
         <mkdir dir="${deployment._root}/etc/" />
         <if>
             <available file="${plugin._directory}/esb/etc" type="dir" />
diff --git a/edexOsgi/build.edex/deploy-install.xml b/edexOsgi/build.edex/deploy-install.xml
index 9e6862ec90..e985802050 100644
--- a/edexOsgi/build.edex/deploy-install.xml
+++ b/edexOsgi/build.edex/deploy-install.xml
@@ -17,41 +17,17 @@
     </path>
 
     <target name="main" depends="init, setup">
-        <property name="esb.directory" value="${repo.dir}/build/deploy.edex.awips2/esb" />
+        <property name="esb.directory" value="${repo.dir}/edexOsgi/deploy.edex.awips2/esb" />
         <property name="site-package.directory" value="${python.root.directory}/lib/${python.version.dir}/site-packages" />
 
         <!-- deploy esb {optionally: data, web} -->
-        <ant antfile="${repo.dir}/build/deploy.edex.awips2/deploy/deploy-esb.xml" />
+        <ant antfile="${repo.dir}/edexOsgi/deploy.edex.awips2/deploy/deploy-esb.xml" />
         <!-- deploy esb configuration -->
-        <ant antfile="${repo.dir}/build/deploy.edex.awips2/deploy/deploy-esb-configuration.xml" />
-        <!-- optionally: deploy gfesuite -->
-        <if>
-            <equals arg1="${deploy.gfesuite}" arg2="true" />
-            <then>
-                <ant antfile="${basedir}/deploy-common/deploy-gfesuite.xml" />
-            </then>
-        </if>
-
-        <!-- deploy edex plugins -->
-        <!-- which feature do we want to deploy? -->
-        <if>
-            <isset property="wa.enabled" />
-            <then>
-                <!--
-                    Find the feature associated with
-                    Work Assignments.
-                -->
-                <var name="feature.to.find" value="${wa.edex.feature}" />
-            </then>
-            <else>
-                <!--
-                    Find the standard AWIPS II
-                    Baseline feature.
-                -->
-                <var name="feature.to.find" value="${edex.feature}" />
-            </else>
-        </if>
+        <ant antfile="${repo.dir}/edexOsgi/deploy.edex.awips2/deploy/deploy-esb-configuration.xml" />
 
+        <!-- deploy edex plugins -->   
+        <var name="feature.to.find" value="${edex.feature}" />
+ 
         <var name="feature" value="" />
         <!-- 
             find the feature file: we may deploy multiple features
@@ -70,32 +46,6 @@
             </sequential>
         </for>
 
-        <!-- optionally: deploy site localization -->
-        <if>
-            <not>
-                <equals arg1="${localization.sites}" arg2="" />
-            </not>
-            <then>
-                <antcall target="deploy.localization" />
-            </then>
-        </if>
-
-        <!-- 
-            Search for WA-specific Non-Spring
-            Web Applications to deploy.
-        -->
-        <for list="${wa.specific.deploy}" param="wa" delimiter="${path.separator}">
-            <sequential>
-                <basename property="wa.name" file="@{wa}" />
-                <if>
-                    <available file="${git.directory}/@{wa}/edex/deploy-${wa.name}/wa-deploy.xml" type="file" />
-                    <then>
-                        <ant antfile="${git.directory}/@{wa}/edex/deploy-${wa.name}/wa-deploy.xml" inheritall="true" inheritrefs="true" useNativeBasedir="true" />
-                    </then>
-                </if>
-            </sequential>
-        </for>
-
         <tstamp>
             <format property="TIMESTAMP_COMPLETE" pattern="d-MMM-yyyy h:mm:ss a" locale="en,US" />
         </tstamp>
@@ -176,32 +126,6 @@
         </sequential>
     </macrodef>
 
-    <target name="deploy.localization">
-        <for list="${localization.sites}" param="site" delimiter="${path.separator}">
-            <sequential>
-                <echo message="Deploying localization for site: @{site}" />
-
-                <!-- determine which directory the localization
-                     project should be in. -->
-                <var name="localization.path" value="" />
-                <if>
-                    <available file="${awips.baseline.directory}/localization.@{site}" type="dir" />
-                    <then>
-                        <var name="localization.path" value="${awips.baseline.directory}/localization.@{site}" />
-                    </then>
-                    <else>
-                        <var name="localization.path" value="${awips.baseline.directory}/${localization.directory}/localization.@{site}" />
-                    </else>
-                </if>
-
-                <!-- copy the localization files. -->
-                <copy todir="${edex.root.directory}/data/utility" overwrite="true">
-                    <fileset dir="${localization.path}/utility" includes="*/**" />
-                </copy>
-            </sequential>
-        </for>
-    </target>
-
     <!-- static -->
     <taskdef name="includegen" classname="com.raytheon.uf.anttasks.includesgen.GenerateIncludesFromFeature" classpathref="ant.classpath" />
     <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="ant.contrib.path" /> 
diff --git a/edexOsgi/deploy.edex.awips2/deploy/deploy-esb.xml b/edexOsgi/deploy.edex.awips2/deploy/deploy-esb.xml
index c27bc8bdb8..51f8ee3c77 100644
--- a/edexOsgi/deploy.edex.awips2/deploy/deploy-esb.xml
+++ b/edexOsgi/deploy.edex.awips2/deploy/deploy-esb.xml
@@ -10,11 +10,6 @@
 		
 		<antcall target="cleanup" />
 		
-		<!-- Determine if any Work Assignments have been specified. -->
-		<condition property="wa.enabled">
-			<not><equals arg1="${wa.to.deploy}" arg2="" /></not>
-		</condition>
-		
 		<antcall target="deploy.esb" />
 		<if>
 			<equals arg1="${deploy.data}" arg2="true" />