xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edex build/deploy cleanup

Browse source
This commit is contained in:
mjames-upc 2018-08-08 10:46:27 -06:00
parent 7ccd525be0
commit 9c02939b12
4 changed files with 18 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
edexOsgi/build.edex/build.xml
View file

@ -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" />

12
edexOsgi/build.edex/deploy-common/external-rules.xml
View file

@ -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" />

82
edexOsgi/build.edex/deploy-install.xml
View file

@ -17,40 +17,16 @@
</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>
<ant antfile="${repo.dir}/edexOsgi/deploy.edex.awips2/deploy/deploy-esb-configuration.xml" />
<!-- 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>
<var name="feature" value="" />
<!--
@ -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" />

5
edexOsgi/deploy.edex.awips2/deploy/deploy-esb.xml
View file

@ -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" />