Made the <code>maven.war.final.name</code> property public as it is required by several other plugins and before this change the only way is for these plugins was to call the non-public <code>war:init</code> goal.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115826 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
50c5a5c124
commit
f60288f1f3
@ -33,14 +33,10 @@
|
|||||||
<!--==================================================================-->
|
<!--==================================================================-->
|
||||||
<!-- Initializations -->
|
<!-- Initializations -->
|
||||||
<!--==================================================================-->
|
<!--==================================================================-->
|
||||||
<goal name="war:init"
|
<goal name="war:init">
|
||||||
description="Initialize the file system and attain any necessary goals">
|
|
||||||
|
|
||||||
<ant:available property="webSourcesPresent" type="dir"
|
<ant:available property="webSourcesPresent" type="dir"
|
||||||
file="${maven.war.src}"/>
|
file="${maven.war.src}"/>
|
||||||
|
|
||||||
<ant:property name="maven.war.final.name"
|
|
||||||
value="${pom.artifactId}.war"/>
|
|
||||||
|
|
||||||
</goal>
|
</goal>
|
||||||
|
|
||||||
|
|||||||
@ -19,27 +19,38 @@
|
|||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
# War plugin.
|
# War plugin.
|
||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
|
|
||||||
maven.war.index=false
|
maven.war.index=false
|
||||||
|
|
||||||
# Location of where the webapp is located in the source tree. The
|
# Location of where the webapp is located in the source tree. The
|
||||||
# WEB-INF directory is located right under ${maven.war.src}.
|
# WEB-INF directory is located right under ${maven.war.src}.
|
||||||
maven.war.src=${maven.src.dir}/webapp
|
maven.war.src=${maven.src.dir}/webapp
|
||||||
|
|
||||||
# Files to include and exclude from war
|
# Files to include and exclude from war
|
||||||
# Note: Files are relative to maven.war.src
|
# Note: Files are relative to maven.war.src
|
||||||
maven.war.src.includes=**
|
maven.war.src.includes=**
|
||||||
maven.war.src.excludes=
|
maven.war.src.excludes=
|
||||||
|
|
||||||
# Location of web.xml file
|
# Location of web.xml file
|
||||||
maven.war.webxml=${maven.war.src}/WEB-INF/web.xml
|
maven.war.webxml=${maven.war.src}/WEB-INF/web.xml
|
||||||
|
|
||||||
# Classes to include and exclude from WEB-INF/classes
|
# Classes to include and exclude from WEB-INF/classes
|
||||||
# Note: Classes are relative to build.dir
|
# Note: Classes are relative to build.dir
|
||||||
maven.war.classes.includes=**
|
maven.war.classes.includes=**
|
||||||
maven.war.classes.excludes=**/package.html
|
maven.war.classes.excludes=**/package.html
|
||||||
|
|
||||||
# Location where the war will be created. Defaults to
|
# Location where the war will be created. Defaults to
|
||||||
# ${maven.build.dir}
|
# ${maven.build.dir}
|
||||||
maven.war.build.dir = ${maven.build.dir}
|
maven.war.build.dir = ${maven.build.dir}
|
||||||
|
|
||||||
|
# Name of the generated war file (without the path).
|
||||||
|
maven.war.final.name = ${pom.artifactId}.war
|
||||||
|
|
||||||
# Location where the webapp will be created. Defaults to
|
# Location where the webapp will be created. Defaults to
|
||||||
# ${maven.war.build.dir}/${pom.artifactId}
|
# ${maven.war.build.dir}/${pom.artifactId}
|
||||||
maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
|
maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
|
||||||
|
|
||||||
maven.war.tld.dir=WEB-INF/tld
|
maven.war.tld.dir=WEB-INF/tld
|
||||||
|
|
||||||
# Location of the manifest file to be used
|
# Location of the manifest file to be used
|
||||||
maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF
|
maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF
|
||||||
|
|||||||
@ -25,6 +25,12 @@
|
|||||||
</properties>
|
</properties>
|
||||||
<body>
|
<body>
|
||||||
<release version="1.7-SNAPSHOT" date="in CVS">
|
<release version="1.7-SNAPSHOT" date="in CVS">
|
||||||
|
<action dev="vmassol" type="update">
|
||||||
|
Made the <code>maven.war.final.name</code> property public as it is
|
||||||
|
required by several other plugins and before this change the only
|
||||||
|
way is for these plugins was to call the non-public
|
||||||
|
<code>war:init</code> goal.
|
||||||
|
</action>
|
||||||
<action dev="carlos" type="update">Splitted war:webapp in war:war-resources and war:webapp.</action>
|
<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="brett" type="update">Deprecated war:load hook goal</action>
|
||||||
<action dev="dion" type="fix" issue="MPWAR-22">
|
<action dev="dion" type="fix" issue="MPWAR-22">
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
/*
|
/*
|
||||||
* Copyright 2001-2004 The Apache Software Foundation.
|
* Copyright 2001-2004 The Apache Software Foundation.
|
||||||
@ -21,7 +22,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<title>War Properties</title>
|
<title>War Properties</title>
|
||||||
<author email="vmassol@octo.com">Vincent Massol</author>
|
<author email="vmassol@apache.org">Vincent Massol</author>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user