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

Issue #1276 - v1.0 of multiple WA deployment support

Browse source 
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: cae04523db [formerly 9263a0ac57] [formerly cae04523db [formerly 9263a0ac57] [formerly 4fd43ee45c [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]]
Former-commit-id: 4fd43ee45c
Former-commit-id: d928e2f257 [formerly 2c14ea1bb7]
Former-commit-id: 2cd64bd5cc
This commit is contained in:
Bryan Kowal 2012-11-06 16:13:26 -06:00
parent 6789b4d3af
commit cf7ae375b9
3 changed files with 155 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
edexOsgi/build.edex/deploy-common/deploy-setup.xml
View file

@ -4,7 +4,7 @@
<property file="${basedir}/edex/common.properties" /> <property file="${basedir}/edex/common.properties" />
<property file="${basedir}/edex/developer.properties" /> <property file="${basedir}/edex/developer.properties" />
<condition property="wa.enabled"> <condition property="wa.enabled">
<not><equals arg1="${wa.root.directory}" arg2="" /></not> <not><equals arg1="${wa.to.deploy}" arg2="" /></not>
</condition> </condition>
<!-- Determine where we are. --> <!-- Determine where we are. -->
@ -52,20 +52,26 @@
</then> </then>
</if> </if>
<!-- add the associated wa directory if it exists. --> <!-- Loop through the WA directories, if they exist. -->
<if><isset property="wa.enabled" /> <if>
<isset property="wa.enabled" />
<then> <then>
<var name="wa.base.directory" <for list="${wa.to.deploy}" param="wa"
value="${wa.root.directory}/${variable.name}" /> delimiter="${path.separator}">
<sequential>
<var name="wa.base.directory"
value="@{wa}/${variable.name}" />
<if> <if>
<available file="${wa.base.directory}" <available file="${wa.base.directory}"
type="dir" /> type="dir" />
<then> <then>
<var name="basedirectories" <var name="basedirectories"
value="${wa.base.directory};${basedirectories}" /> value="${wa.base.directory};${basedirectories}" />
</then> </then>
</if> </if>
</sequential>
</for>
</then> </then>
</if> </if>
</sequential> </sequential>

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

@ -25,7 +25,48 @@
</then> </then>
</if> </if>
<!-- deploy edex plugins --> <!-- deploy edex plugins -->
<antcall target="deploy.feature" /> <!-- 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="" />
<!--
find the feature file: we may deploy multiple features
if multiple Work Assignment directories have been
specified.
-->
<for list="${basedirectories}" param="directory"
delimiter=";">
<sequential>
<if>
<available file="@{directory}/${feature.to.find}" />
<then>
<var name="feature"
value="@{directory}/${feature.to.find}" />
<deploy.feature
feature="${feature}" />
</then>
</if>
</sequential>
</for>
<!-- optionally: deploy raytheon python --> <!-- optionally: deploy raytheon python -->
<if> <if>
<equals arg1="${deploy.python}" arg2="true" /> <equals arg1="${deploy.python}" arg2="true" />
@ -43,98 +84,101 @@
</then> </then>
</if> </if>
<!--
Search for WA-specific Non-Spring
Web Applications to deploy.
-->
<if> <if>
<and> <isset property="wa.enabled" />
<isset property="wa.enabled" /> <then>
<!-- TODO: A way to make this pathing lookup better? --> <for list="${wa.to.deploy}" param="wa"
<available file="${wa.root.directory}/edexOsgi/build.edex/wa-build.xml" type="file" /> delimiter="${path.separator}">
</and> <sequential>
<then> <if>
<ant antfile="${wa.root.directory}/edexOsgi/build.edex/wa-build.xml" inheritall="true" inheritrefs="true"/> <available file="@{wa}/edexOsgi/build.edex/wa-build.xml"
type="file" />
<then>
<ant
antfile="@{wa}/edexOsgi/build.edex/wa-build.xml"
inheritall="true" inheritrefs="true"/>
</then>
</if>
</sequential>
</for>
</then> </then>
</if> </if>
</target> </target>
<!-- public --> <!-- public -->
<!-- Targets specific to the developer deployment. --> <!-- Targets specific to the developer deployment. -->
<target name="deploy.feature"> <macrodef name="deploy.feature">
<!-- prepare to run includegen --> <attribute name="feature" />
<var name="includes.directory" value="${basedir}/tmp/includes" />
<if>
<available file="${includes.directory}" type="dir" />
<then>
<delete verbose="true" includeemptydirs="true">
<fileset dir="${includes.directory}"
includes="*/**" />
</delete>
</then>
</if>
<mkdir dir="${includes.directory}" />
<var name="feature" value="" /> <sequential>
<!-- find the feature file --> <!-- prepare to run includegen -->
<for list="${basedirectories}" param="directory" <var name="includes.directory" value="${basedir}/tmp/includes" />
delimiter=";"> <if>
<sequential> <available file="${includes.directory}" type="dir" />
<if> <then>
<available file="@{directory}/${edex.feature}" /> <delete verbose="true" includeemptydirs="true">
<then> <fileset dir="${includes.directory}"
<var name="feature" includes="*/**" />
value="@{directory}/${edex.feature}" /> </delete>
</then> </then>
</if> </if>
</sequential> <mkdir dir="${includes.directory}" />
</for>
<!-- run includegen -->
<echo message="Generating deployment list for feature: ${edex.feature}" />
<!--
TODO: need to update the includegen ant task to recognize
plugin architecture restrictions. Plugins that should only
be deployed for a 64-bit system should not be deployed for
a 32-bit system, etc.
-->
<includegen providerfilter="${includegen.filter}"
basedirectories="${basedirectories}"
featurefile="${feature}"
cotsout="${includes.directory}/cots.includes"
plugsout="${includes.directory}/plugins.includes"
coreout="${includes.directory}/core.includes" />
<var name="destination.directory" <!-- run includegen -->
value="${edex.root.directory}/lib/plugins" /> <echo message="Generating deployment list for feature: ${feature}" />
<mkdir dir="${destination.directory}" /> <!--
<processPlugins TODO: need to update the includegen ant task to recognize
includes.file="${includes.directory}/plugins.includes" plugin architecture restrictions. Plugins that should only
plugin.type="plugins" be deployed for a 64-bit system should not be deployed for
plugin.directories="${basedirectories}" a 32-bit system, etc.
destination.directory="${destination.directory}" /> -->
<processPlugins <includegen providerfilter="${includegen.filter}"
includes.file="${includes.directory}/core.includes" basedirectories="${basedirectories}"
plugin.type="core" featurefile="${feature}"
plugin.directories="${basedirectories}" cotsout="${includes.directory}/cots.includes"
destination.directory="${destination.directory}" /> plugsout="${includes.directory}/plugins.includes"
coreout="${includes.directory}/core.includes" />
<var name="destination.directory" <var name="destination.directory"
value="${edex.root.directory}/lib/dependencies" /> value="${edex.root.directory}/lib/plugins" />
<mkdir dir="${destination.directory}" /> <mkdir dir="${destination.directory}" />
<processPlugins <processPlugins
includes.file="${includes.directory}/cots.includes" includes.file="${includes.directory}/plugins.includes"
plugin.type="cots" plugin.type="plugins"
plugin.directories="${basedirectories}" plugin.directories="${basedirectories}"
destination.directory="${destination.directory}" /> destination.directory="${destination.directory}" />
<processPlugins
includes.file="${includes.directory}/core.includes"
plugin.type="core"
plugin.directories="${basedirectories}"
destination.directory="${destination.directory}" />
<!-- cleanup the temporary directories --> <var name="destination.directory"
<if> value="${edex.root.directory}/lib/dependencies" />
<available file="${basedir}/tmp" <mkdir dir="${destination.directory}" />
type="dir" /> <processPlugins
<then> includes.file="${includes.directory}/cots.includes"
<delete includeemptydirs="true"> plugin.type="cots"
<fileset dir="${basedir}" plugin.directories="${basedirectories}"
includes="tmp/**" /> destination.directory="${destination.directory}" />
</delete>
</then> <!-- cleanup the temporary directories -->
</if> <if>
</target> <available file="${basedir}/tmp"
type="dir" />
<then>
<delete includeemptydirs="true">
<fileset dir="${basedir}"
includes="tmp/**" />
</delete>
</then>
</if>
</sequential>
</macrodef>
<target name="deploy.python"> <target name="deploy.python">
<property name="site-package.directory" <property name="site-package.directory"

17
edexOsgi/build.edex/edex/developer.properties
View file

@ -1,12 +1,9 @@
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
# developer configurable properties. # developer configurable properties.
# the root directory of the work assignment repository when one # the root directories of the work assignment(s) to deploy.
# exists. TODO: is this the only way??? # delimited by colon (:)
wa.root.directory= wa.to.deploy=
# the edex feature to deploy; when working a work assignment, this
# will occasionally become: com.raytheon.edex.wa.feature/feature.xml
edex.feature=com.raytheon.edex.feature.uframe/feature.xml
# deploy the raytheon ufpy, dynamicserialize, and pypies site-packages # deploy the raytheon ufpy, dynamicserialize, and pypies site-packages
deploy.python=true deploy.python=true
@ -32,4 +29,10 @@ gfesuite.project=com.raytheon.uf.tools.gfesuite.servicebackup
# static properties dependent on the current versions of the foss libraries # static properties dependent on the current versions of the foss libraries
# we are utilizing - should only be modified by CM. # we are utilizing - should only be modified by CM.
python.version.dir=python2.7 python.version.dir=python2.7
# the Common Baseline EDEX feature
edex.feature=com.raytheon.edex.feature.uframe/feature.xml
# the name of the Work Assignment EDEX feature -
# this feature must exist in a Work Assignment to deploy it.
wa.edex.feature=com.raytheon.edex.wa.feature/feature.xml