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

Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.

Browse source 
Former-commit-id: cda8d04831 [formerly 06a166ef6c963585eb65da223610a21665f9545a]
Former-commit-id: a6d7822698
This commit is contained in:
Bryan Kowal 2013-10-28 14:50:00 -05:00
parent 4cd0b3fed7
commit df575b7be1
10 changed files with 55 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
edexOsgi/build.edex/deploy-common/deploy-esb.xml
View file

@ -17,12 +17,6 @@
<antcall target="deploy.esb-data" />
</then>
</if>
<if>
<equals arg1="${deploy.web}" arg2="true" />
<then>
<antcall target="deploy.esb-web" />
</then>
</if>
</target>
<target name="cleanup">
@ -96,18 +90,6 @@
includes="**/*" type="both" />
</target>
<target name="deploy.esb-web">
<deploy.war
web.project.dir="com.raytheon.edex.uengine"
war.name="uEngineWeb" />
<deploy.war
web.project.dir="gov.noaa.nws.ncep.edex.purgeutil"
war.name="purgeWeb" />
<deploy.war
web.project.dir="com.raytheon.uf.edex.registry.ebxml"
war.name="registryEbxml" />
</target>
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>

20
edexOsgi/build.edex/deploy-common/deploy-web.xml
View file

@ -10,11 +10,9 @@
<macrodef name="deploy.war">
<attribute name="web.project.dir" />
<attribute name="war.name" />
<attribute name="webapps.dir" />
<sequential>
<property name="webapps.dir"
value="${edex.root.directory}/webapps" />
<sequential>
<!-- find the web "project" -->
<var name="project.dir" value="" />
<for list="${basedirectories}" param="directory"
@ -41,13 +39,13 @@
<var name="war.file" value="@{war.name}.war" />
<!-- delete old war file -->
<delete dir="${webapps.dir}/@{war.name}" />
<delete file="${webapps.dir}/${war.file}" />
<mkdir dir="${webapps.dir}" />
<delete dir="@{webapps.dir}/@{war.name}" />
<delete file="@{webapps.dir}/${war.file}" />
<mkdir dir="@{webapps.dir}" />
<!-- build and deploy new war -->
<echo message="Building and deploying war file" />
<war destfile="${webapps.dir}/${war.file}"
<war destfile="@{webapps.dir}/${war.file}"
webxml="${project.dir}/web/WEB-INF/web.xml">
<fileset dir="${project.dir}/web"
excludes="**/WEB-INF/" />
@ -56,9 +54,9 @@
<webinf file="${project.dir}/web/WEB-INF/dwr.xml" />
</war>
<unzip src="${webapps.dir}/${war.file}"
dest="${webapps.dir}/@{war.name}" />
<delete file="${webapps.dir}/${war.file}" />
<unzip src="@{webapps.dir}/${war.file}"
dest="@{webapps.dir}/@{war.name}" />
<delete file="@{webapps.dir}/${war.file}" />
</sequential>
</macrodef>
</project>

15
edexOsgi/build.edex/deploy-common/plugin-methods.xml
View file

@ -1,4 +1,6 @@
<project>
<import file="deploy-web.xml" />
<macrodef name="processPlugins">
<attribute name="includes.file" />
<attribute name="plugin.type" />
@ -101,6 +103,19 @@
</else>
</if>
<!-- determine if the plugin is a web project -->
<if>
<available file="${plugin.base}/web.deploy" type="file" />
<then>
<var file="${plugin.base}/web.deploy" />
<deploy.war
web.project.dir="@{plugin.name}"
war.name="${war.name}"
webapps.dir="${edex.root.directory}/webapps" />
</then>
</if>
<ant antfile="${basedir}/deploy-common/external-rules.xml"
inheritAll="false">
<property name="plugin._directory"

15
edexOsgi/build.edex/edex/customAssembly.xml
View file

@ -1,4 +1,5 @@
<project name="Build specific targets and properties" default="noDefault">
<import file="${builder}/../deploy-common/deploy-web.xml" />
<!-- =====================================================================
The Following Properties are available in all targets:
@ -28,6 +29,20 @@
<property name="deployment._root"
value="${target.folder}/.." />
</ant>
<!-- determine if plugin is a web project -->
<!-- determine if the plugin is a web project -->
<if>
<available file="${projectLocation}/web.deploy" type="file" />
<then>
<var file="${projectLocation}/web.deploy" />
<basename property="plugin.name" file="${projectLocation}" />
<deploy.war
web.project.dir="${plugin.name}"
war.name="${war.name}"
webapps.dir="${target.folder}/../webapps" />
</then>
</if>
</target>
<!-- ===================================================================== -->

13
edexOsgi/build.edex/edex/customTargets.xml
View file

@ -156,6 +156,19 @@
</fileset>
</copy>
<if>
<available file="${build.output.directory}/webapps" type="dir" />
<then>
<mkdir dir="${builder}/postBuild/${edex.root.directory}" />
<copy todir="${builder}/postBuild/${edex.root.directory}"
verbose="true">
<fileset dir="${build.output.directory}">
<include name="webapps/**" />
</fileset>
</copy>
</then>
</if>
<!-- special rule for cots -->
<if>
<not>

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

@ -9,8 +9,6 @@ wa.to.deploy=
deploy.python=true
# deploy build.edex/esb/data
deploy.data=true
# deploy the web applications
deploy.web=true
# deploy GFESuite
deploy.gfesuite=true
# use esb.overwrite to overwrite files during esb deployment regardless

1
edexOsgi/build.edex/properties/edex.properties
View file

@ -4,6 +4,5 @@ esbDir=${install.dir}/../edex
feature=../com.raytheon.edex.feature.uframe/feature.xml
working.dir=edex/tmp/plugins
deploy.web=true
deploy.data=true
svcbudir=${install.dir}/../GFESuite

1
edexOsgi/com.raytheon.edex.uengine/web.deploy Normal file
View file

@ -0,0 +1 @@
war.name=uEngineWeb

1
edexOsgi/com.raytheon.uf.edex.registry.ebxml/web.deploy Normal file
View file

@ -0,0 +1 @@
war.name=registryEbxml

1
ncep/gov.noaa.nws.ncep.edex.purgeutil/web.deploy Normal file
View file

@ -0,0 +1 @@
war.name=purgeWeb