You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/04/23 21:24:36 UTC
svn commit: r396308 - in /maven/maven-1/plugins/trunk/war/xdocs: changes.xml index.xml

Author: snicoll
Date: Sun Apr 23 12:24:35 2006
New Revision: 396308

URL: http://svn.apache.org/viewcvs?rev=396308&view=rev
Log:
MPWAR-39: Updated wrong documentation regarding web.xml filtering.

Modified:
    maven/maven-1/plugins/trunk/war/xdocs/changes.xml
    maven/maven-1/plugins/trunk/war/xdocs/index.xml

Modified: maven/maven-1/plugins/trunk/war/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/war/xdocs/changes.xml?rev=396308&r1=396307&r2=396308&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/changes.xml Sun Apr 23 12:24:35 2006
@@ -25,8 +25,9 @@
   </properties>
   <body>
     <release version="1.6.2-SNAPSHOT" date="in SVN">
-      <action dev="snicoll" type="fix" issue="MPWAR-46">Now filtering when copying resources.</action>
-      <action dev="snicoll" type="fix" issue="MPWAR-52">Added property <code>maven.war.webxml.overwrite</code> to control if the source web.xml overwrite the one in the generated webapp directory.</action>
+      <action dev="snicoll" type="update" issue="MPWAR-39">Updated wrong documentation regarding web.xml filtering.</action>
+      <action dev="snicoll" type="update" issue="MPWAR-46">Now filtering when copying resources.</action>
+      <action dev="snicoll" type="add" issue="MPWAR-52">Added property <code>maven.war.webxml.overwrite</code> to control if the source web.xml overwrite the one in the generated webapp directory.</action>
       <action dev="snicoll" type="fix" issue="MPWAR-29">Fixed confusing documentation regarding maven.war.classes.includes and excludes properties</action>
       <action dev="snicoll" type="fix" issue="MPWAR-32">License file is now added properly to the generated war</action>
       <action dev="brett" type="fix">Remove reference to unused caller tag library to suppress warning</action>

Modified: maven/maven-1/plugins/trunk/war/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/war/xdocs/index.xml?rev=396308&r1=396307&r2=396308&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/index.xml Sun Apr 23 12:24:35 2006
@@ -64,8 +64,8 @@
         <p>
           If you need to copy the web.xml file in order to replace some
           filter tokens or simply perform some custom modification to it,
-          simply write a pre-goal to the <code>war:war</code> goal in which 
-          you perform the manipulation. Then set the
+          simply write a pre-goal to the <code>war:war-resources</code>
+          goal in which you perform the manipulation. Then set the
           <code>maven.war.webxml</code> property to point to your modified
           <code>web.xml</code>.
         </p>