You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2003/09/03 10:31:02 UTC
cvs commit: maven/src/plugins-build/war/xdocs properties.xml
evenisse 2003/09/03 01:31:02
Modified: src/plugins-build/war plugin.properties
src/plugins-build/war/xdocs properties.xml
Log:
Fix conflict between properties define in plugin.properties and properties.xml
Revision Changes Path
1.5 +4 -4 maven/src/plugins-build/war/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 2 Sep 2003 13:37:03 -0000 1.4
+++ plugin.properties 3 Sep 2003 08:31:02 -0000 1.5
@@ -6,6 +6,10 @@
# 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
@@ -19,7 +23,3 @@
# ${maven.war.build.dir}/${pom.artifactId}
maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
maven.war.tld.dir=WEB-INF/tld
-# Files to include and exclude from ejb
-# Note: Files are relative to build.dir
-maven.war.src.includes=**
-maven.war.src.excludes=**/package.html
1.6 +1 -1 maven/src/plugins-build/war/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml 2 Sep 2003 13:37:03 -0000 1.5
+++ properties.xml 3 Sep 2003 08:31:02 -0000 1.6
@@ -36,7 +36,7 @@
<td>
Comma or space separated list of Ant path patterns specifycing
what files and directories from <code>${maven.war.src}</code>
- should be exluded from the web application. No files are excluded
+ should be excluded from the web application. No files are excluded
by default.
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org