vmassol 2004/07/15 02:28:56
Modified: war/xdocs properties.xml changes.xml
war plugin.jelly plugin.properties
Log:
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.
Revision Changes Path
1.14 +2 -1 maven-plugins/war/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/war/xdocs/properties.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- properties.xml 19 Jun 2004 08:58:52 -0000 1.13
+++ properties.xml 15 Jul 2004 09:28:56 -0000 1.14
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -21,7 +22,7 @@
<properties>
<title>War Properties</title>
- <author email="[EMAIL PROTECTED]">Vincent Massol</author>
+ <author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
1.31 +6 -0 maven-plugins/war/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/war/xdocs/changes.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- changes.xml 14 Jul 2004 08:52:20 -0000 1.30
+++ changes.xml 15 Jul 2004 09:28:56 -0000 1.31
@@ -25,6 +25,12 @@
</properties>
<body>
<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="brett" type="update">Deprecated war:load hook goal</action>
<action dev="dion" type="fix" issue="MPWAR-22">
1.45 +1 -5 maven-plugins/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/war/plugin.jelly,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- plugin.jelly 14 Jul 2004 08:52:20 -0000 1.44
+++ plugin.jelly 15 Jul 2004 09:28:56 -0000 1.45
@@ -33,14 +33,10 @@
<!--==================================================================-->
<!-- Initializations -->
<!--==================================================================-->
- <goal name="war:init"
- description="Initialize the file system and attain any necessary goals">
+ <goal name="war:init">
<ant:available property="webSourcesPresent" type="dir"
file="${maven.war.src}"/>
-
- <ant:property name="maven.war.final.name"
- value="${pom.artifactId}.war"/>
</goal>
1.12 +12 -1 maven-plugins/war/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/war/plugin.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.properties 19 Jun 2004 08:46:59 -0000 1.11
+++ plugin.properties 15 Jul 2004 09:28:56 -0000 1.12
@@ -19,27 +19,38 @@
# -------------------------------------------------------------------
# War plugin.
# -------------------------------------------------------------------
+
maven.war.index=false
+
# Location of where the webapp is located in the source tree. The
# WEB-INF directory is located right under ${maven.war.src}.
maven.war.src=${maven.src.dir}/webapp
+
# Files to include and exclude from war
# Note: Files are relative to maven.war.src
maven.war.src.includes=**
maven.war.src.excludes=
+
# Location of web.xml file
maven.war.webxml=${maven.war.src}/WEB-INF/web.xml
+
# Classes to include and exclude from WEB-INF/classes
# Note: Classes are relative to build.dir
maven.war.classes.includes=**
maven.war.classes.excludes=**/package.html
+
# Location where the war will be created. Defaults to
# ${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
# ${maven.war.build.dir}/${pom.artifactId}
maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
+
maven.war.tld.dir=WEB-INF/tld
# Location of the manifest file to be used
-maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF
\ No newline at end of file
+maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
