Splitted war:webapp in war:war-resources and war:webapp
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115811 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -103,27 +103,16 @@
|
||||
</goal>
|
||||
|
||||
<!--==================================================================-->
|
||||
<!-- Builds an expanded webapp -->
|
||||
<!-- Copies webapp files to target dir -->
|
||||
<!--==================================================================-->
|
||||
<goal name="war:webapp" prereqs="war:init,test:test"
|
||||
description="Build a webapp directory">
|
||||
|
||||
<ant:echo>Assembling webapp ${pom.artifactId}</ant:echo>
|
||||
<goal name="war:war-resources" prereqs="war:init"
|
||||
description="Copy webapp resources to target directory">
|
||||
|
||||
<ant:mkdir dir="${maven.war.webapp.dir}"/>
|
||||
|
||||
<j:set var="webapp.build.webinf" value="${maven.war.webapp.dir}/WEB-INF"/>
|
||||
<ant:mkdir dir="${webapp.build.webinf}"/>
|
||||
|
||||
<j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
|
||||
<ant:mkdir dir="${webapp.build.lib}"/>
|
||||
|
||||
<j:set var="webapp.build.tlds" value="${maven.war.webapp.dir}/${maven.war.tld.dir}"/>
|
||||
<ant:mkdir dir="${webapp.build.tlds}"/>
|
||||
|
||||
<j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/>
|
||||
<ant:mkdir dir="${webapp.build.classes}"/>
|
||||
|
||||
<j:if test="${webSourcesPresent == 'true'}">
|
||||
<ant:copy todir="${maven.war.webapp.dir}" preservelastmodified="true">
|
||||
<ant:fileset dir="${maven.war.src}"
|
||||
@@ -139,6 +128,25 @@
|
||||
overwrite="true" />
|
||||
</util:available>
|
||||
|
||||
</goal>
|
||||
|
||||
<!--==================================================================-->
|
||||
<!-- Builds an expanded webapp -->
|
||||
<!--==================================================================-->
|
||||
<goal name="war:webapp" prereqs="war:war-resources,test:test"
|
||||
description="Build a webapp directory">
|
||||
|
||||
<ant:echo>Assembling webapp ${pom.artifactId}</ant:echo>
|
||||
|
||||
<j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
|
||||
<ant:mkdir dir="${webapp.build.lib}"/>
|
||||
|
||||
<j:set var="webapp.build.tlds" value="${maven.war.webapp.dir}/${maven.war.tld.dir}"/>
|
||||
<ant:mkdir dir="${webapp.build.tlds}"/>
|
||||
|
||||
<j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/>
|
||||
<ant:mkdir dir="${webapp.build.classes}"/>
|
||||
|
||||
<j:forEach var="lib" items="${pom.artifacts}">
|
||||
<j:set var="dep" value="${lib.dependency}"/>
|
||||
<j:if test="${dep.getProperty('war.bundle')=='true'}">
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
</properties>
|
||||
<body>
|
||||
<release version="1.7-SNAPSHOT" date="in CVS">
|
||||
<action dev="carlos" type="update">Splitted war:webapp in war:war-resources and war:webapp.</action>
|
||||
<action dev="brett" type="update">Deprecated war:load hook goal</action>
|
||||
<action dev="dion" type="fix" issue="MPWAR-22">
|
||||
Allow use of maven.war.manifest to specify the manifest file location.
|
||||
|
||||
@@ -48,9 +48,16 @@
|
||||
<code><postGoal name="war:webapp"></code>
|
||||
</description>
|
||||
</goal>
|
||||
<goal>
|
||||
<name>war:war-resources</name>
|
||||
<description>Copy files from maven.war.src to maven.war.webapp.dir</description>
|
||||
</goal>
|
||||
<goal>
|
||||
<name>war:webapp</name>
|
||||
<description>Build a webapp directory</description>
|
||||
<description>
|
||||
Build a webapp directory in that created by war:war-resources, copying libraries,
|
||||
classes and tlds
|
||||
</description>
|
||||
</goal>
|
||||
<goal>
|
||||
<name>war:install</name>
|
||||
|
||||
Reference in New Issue
Block a user