From 4b5400a8a53a811b29ad26b39d1a4aba182a323d Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 3 Sep 2003 08:31:02 +0000
Subject: [PATCH] Fix conflict between properties define in plugin.properties
 and properties.xml

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113944 13f79535-47bb-0310-9956-ffa450edef68
---
 war/plugin.properties    | 8 ++++----
 war/xdocs/properties.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/war/plugin.properties b/war/plugin.properties
index a5c5d3b5..d6dc9d11 100644
--- a/war/plugin.properties
+++ b/war/plugin.properties
@@ -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 = ${maven.build.dir}
 # ${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
diff --git a/war/xdocs/properties.xml b/war/xdocs/properties.xml
index fcd63289..ee76f42e 100644
--- a/war/xdocs/properties.xml
+++ b/war/xdocs/properties.xml
@@ -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>