You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2013/01/30 11:54:13 UTC

svn commit: r1440343 [20/24] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomcat7/run/ common-tomcat-maven-plugin/ common-tomcat-ma...

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - 
     tomcat7:run-war</title>
@@ -193,7 +193,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>
@@ -243,7 +243,7 @@ This must always start with a forward-sl
             <td><b><a href="#warDirectory">warDirectory</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
-            <td>The path of the exploded WAR directory to run.<br /><b>Default value is</b>: <tt>${project.build.directory}/${project.build.finalName}</tt>.<br /></td>
+            <td>The path of the exploded WAR directory to run.<br /><b>Default value is</b>: <tt>${project.build.directory}/${project.build.finalName}</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.warDirectory</tt>.</td>
           </tr>
         </table>
       </div>
@@ -305,18 +305,26 @@ Name aliases</a><br /></td>
             <td>Class loader class to set.<br /></td>
           </tr>
           <tr class="b">
+            <td><b><a href="#clientAuth">clientAuth</a></b></td>
+            <td><tt>boolean</tt></td>
+            <td><tt>2.1</tt></td>
+            <td>enable client authentication for https (if configured)<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.https.clientAuth</tt>.</td>
+          </tr>
+          <tr class="a">
             <td><b><a href="#configurationDir">configurationDir</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
             <td>The directory to create the Tomcat server configuration under.<br /><b>Default value is</b>: <tt>${project.build.directory}/tomcat</tt>.<br /></td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#contextFile">contextFile</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
-            <td>The path of the Tomcat context XML file.<br /><b>Default value is</b>: <tt>${project.build.directory}/${project.build.finalName}/META-INF/context.xml</tt>.<br /></td>
+            <td><p>The path of the Tomcat context XML file.</p>
+<p>Since release 2.0, the file is filtered as a maven resource so
+you can use interpolation tokens ${ }</p><br /><b>User property is</b>: <tt>maven.tomcat.contextFile</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#contextReloadable">contextReloadable</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>2.0</tt></td>
@@ -324,20 +332,20 @@ Name aliases</a><br /></td>
 reloadable = &quot;true&quot;. The other way to use contextReloadable is to
 add attribute reloadable = &quot;true&quot; in your context file.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.contextReloadable</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#fork">fork</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>1.0</tt></td>
             <td>Set this to true to allow Maven to continue to execute after
 invoking the run goal.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.fork</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#hostName">hostName</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>configure host name<br /><b>Default value is</b>: <tt>localhost</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.hostName</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#httpsPort">httpsPort</a></b></td>
             <td><tt>int</tt></td>
             <td><tt>1.0</tt></td>
@@ -346,34 +354,34 @@ means won't be started. The https connec
 for value &gt; 0. Will be exposed as System props and
 session.executionProperties with key tomcat.maven.https.port<br /><b>Default value is</b>: <tt>0</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.httpsPort</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#ignorePackaging">ignorePackaging</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>1.0</tt></td>
             <td>If set to true ignore if packaging of project is not 'war'.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>tomcat.ignorePackaging</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#keystoreFile">keystoreFile</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>1.1</tt></td>
             <td>Override the default keystoreFile for the HTTPS connector (if
 enabled)<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#keystorePass">keystorePass</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>1.1</tt></td>
             <td>Override the default keystorePass for the HTTPS connector (if
 enabled)<br /></td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#keystoreType">keystoreType</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>Override the type of keystore file to be used for the server
 certificate. If not specified, the default value is &quot;JKS&quot;.<br /><b>Default value is</b>: <tt>JKS</tt>.<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#port">port</a></b></td>
             <td><tt>int</tt></td>
             <td><tt>2.0</tt></td>
@@ -381,76 +389,76 @@ certificate. If not specified, the defau
 props and session.executionProperties with key
 tomcat.maven.http.port<br /><b>Default value is</b>: <tt>8080</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.port</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#propertiesPortFilePath">propertiesPortFilePath</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>Will dump port in a properties file (see ports for property names).
 If empty no file generated<br /><b>User property is</b>: <tt>maven.tomcat.propertiesPortFilePath</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#protocol">protocol</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>The protocol to run the Tomcat server on. By default it's HTTP/1.1.<br /><b>Default value is</b>: <tt>HTTP/1.1</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.protocol</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#serverXml">serverXml</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>1.0-alpha-2</tt></td>
             <td>server.xml to use <b>Note if you use this you must configure in
 this file your webapp paths</b>.<br /><b>User property is</b>: <tt>maven.tomcat.serverXml</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#skip">skip</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>2.0</tt></td>
             <td>Skip execution<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.skip</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#staticContextDocbase">staticContextDocbase</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>The static context docroot base fully qualified path if
 <tt>null</tt> static context won't be added<br /><b>User property is</b>: <tt>maven.tomcat.staticContextDocbase</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#staticContextPath">staticContextPath</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>The static context<br /><b>Default value is</b>: <tt>/</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.staticContextPath</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#systemProperties">systemProperties</a></b></td>
             <td><tt>Map</tt></td>
             <td><tt>1.0-alpha-2</tt></td>
             <td>List of System properties to pass to the Tomcat Server.<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#tomcatLoggingFile">tomcatLoggingFile</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
             <td>The path of the Tomcat logging configuration.<br /><b>User property is</b>: <tt>maven.tomcat.tomcatLogging.file</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#tomcatUsers">tomcatUsers</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
             <td>The path of the Tomcat users XML file.<br /><b>User property is</b>: <tt>maven.tomcat.tomcatUsers.file</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#tomcatWebXml">tomcatWebXml</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>1.0-alpha-2</tt></td>
             <td>overriding the providing web.xml to run tomcat<br /><b>User property is</b>: <tt>maven.tomcat.webXml</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#uriEncoding">uriEncoding</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>1.0</tt></td>
             <td>The character encoding to use for decoding URIs.<br /><b>Default value is</b>: <tt>ISO-8859-1</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.uriEncoding</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#useNaming">useNaming</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>2.0</tt></td>
@@ -460,14 +468,14 @@ server.</p>
 <tt>server.xml</tt> for your Tomcat. Instead please configure
 naming in the <tt>server.xml</tt>.</p><br /><b>Default value is</b>: <tt>true</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.useNaming</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#useSeparateTomcatClassLoader">useSeparateTomcatClassLoader</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>1.0</tt></td>
             <td>if <tt>true</tt> a new classLoader separated from maven core
 will be created to start tomcat.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>tomcat.useSeparateTomcatClassLoader</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#webapps">webapps</a></b></td>
             <td><tt>List</tt></td>
             <td><tt>2.0</tt></td>
@@ -541,6 +549,14 @@ Name aliases</a></div>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Since</b>: <tt>2.0</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
+        </ul><hr /><p><b><a name="clientAuth">clientAuth</a>:</b></p>
+        <div>enable client authentication for https (if configured)</div>
+        <ul>
+          <li><b>Type</b>: <tt>boolean</tt></li>
+          <li><b>Since</b>: <tt>2.1</tt></li>
+          <li><b>Required</b>: <tt>No</tt></li>
+          <li><b>User Property</b>: <tt>maven.tomcat.https.clientAuth</tt></li>
+          <li><b>Default</b>: <tt>false</tt></li>
         </ul><hr /><p><b><a name="configurationDir">configurationDir</a>:</b></p>
         <div>The directory to create the Tomcat server configuration under.</div>
         <ul>
@@ -549,12 +565,14 @@ Name aliases</a></div>
           <li><b>Required</b>: <tt>No</tt></li>
           <li><b>Default</b>: <tt>${project.build.directory}/tomcat</tt></li>
         </ul><hr /><p><b><a name="contextFile">contextFile</a>:</b></p>
-        <div>The path of the Tomcat context XML file.</div>
+        <div><p>The path of the Tomcat context XML file.</p>
+<p>Since release 2.0, the file is filtered as a maven resource so
+you can use interpolation tokens ${ }</p></div>
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Since</b>: <tt>2.0</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Default</b>: <tt>${project.build.directory}/${project.build.finalName}/META-INF/context.xml</tt></li>
+          <li><b>User Property</b>: <tt>maven.tomcat.contextFile</tt></li>
         </ul><hr /><p><b><a name="contextReloadable">contextReloadable</a>:</b></p>
         <div>Force context scanning if you don't use a context file with
 reloadable = &quot;true&quot;. The other way to use contextReloadable is to
@@ -759,6 +777,7 @@ will be created to start tomcat.</div>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Since</b>: <tt>2.0</tt></li>
           <li><b>Required</b>: <tt>Yes</tt></li>
+          <li><b>User Property</b>: <tt>maven.tomcat.warDirectory</tt></li>
           <li><b>Default</b>: <tt>${project.build.directory}/${project.build.finalName}</tt></li>
         </ul><hr /><p><b><a name="webapps">webapps</a>:</b></p>
         <div>(no description)</div>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-only-mojo.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-only-mojo.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-only-mojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-only-mojo.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - 
     tomcat7:run-war-only</title>
@@ -193,7 +193,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>
@@ -241,7 +241,7 @@ This must always start with a forward-sl
             <td><b><a href="#warDirectory">warDirectory</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
-            <td>The path of the exploded WAR directory to run.<br /><b>Default value is</b>: <tt>${project.build.directory}/${project.build.finalName}</tt>.<br /></td>
+            <td>The path of the exploded WAR directory to run.<br /><b>Default value is</b>: <tt>${project.build.directory}/${project.build.finalName}</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.warDirectory</tt>.</td>
           </tr>
         </table>
       </div>
@@ -303,18 +303,26 @@ Name aliases</a><br /></td>
             <td>Class loader class to set.<br /></td>
           </tr>
           <tr class="b">
+            <td><b><a href="#clientAuth">clientAuth</a></b></td>
+            <td><tt>boolean</tt></td>
+            <td><tt>2.1</tt></td>
+            <td>enable client authentication for https (if configured)<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.https.clientAuth</tt>.</td>
+          </tr>
+          <tr class="a">
             <td><b><a href="#configurationDir">configurationDir</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
             <td>The directory to create the Tomcat server configuration under.<br /><b>Default value is</b>: <tt>${project.build.directory}/tomcat</tt>.<br /></td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#contextFile">contextFile</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
-            <td>The path of the Tomcat context XML file.<br /><b>Default value is</b>: <tt>${project.build.directory}/${project.build.finalName}/META-INF/context.xml</tt>.<br /></td>
+            <td><p>The path of the Tomcat context XML file.</p>
+<p>Since release 2.0, the file is filtered as a maven resource so
+you can use interpolation tokens ${ }</p><br /><b>User property is</b>: <tt>maven.tomcat.contextFile</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#contextReloadable">contextReloadable</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>2.0</tt></td>
@@ -322,20 +330,20 @@ Name aliases</a><br /></td>
 reloadable = &quot;true&quot;. The other way to use contextReloadable is to
 add attribute reloadable = &quot;true&quot; in your context file.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.contextReloadable</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#fork">fork</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>1.0</tt></td>
             <td>Set this to true to allow Maven to continue to execute after
 invoking the run goal.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.fork</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#hostName">hostName</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>configure host name<br /><b>Default value is</b>: <tt>localhost</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.hostName</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#httpsPort">httpsPort</a></b></td>
             <td><tt>int</tt></td>
             <td><tt>1.0</tt></td>
@@ -344,34 +352,34 @@ means won't be started. The https connec
 for value &gt; 0. Will be exposed as System props and
 session.executionProperties with key tomcat.maven.https.port<br /><b>Default value is</b>: <tt>0</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.httpsPort</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#ignorePackaging">ignorePackaging</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>1.0</tt></td>
             <td>If set to true ignore if packaging of project is not 'war'.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>tomcat.ignorePackaging</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#keystoreFile">keystoreFile</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>1.1</tt></td>
             <td>Override the default keystoreFile for the HTTPS connector (if
 enabled)<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#keystorePass">keystorePass</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>1.1</tt></td>
             <td>Override the default keystorePass for the HTTPS connector (if
 enabled)<br /></td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#keystoreType">keystoreType</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>Override the type of keystore file to be used for the server
 certificate. If not specified, the default value is &quot;JKS&quot;.<br /><b>Default value is</b>: <tt>JKS</tt>.<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#port">port</a></b></td>
             <td><tt>int</tt></td>
             <td><tt>2.0</tt></td>
@@ -379,76 +387,76 @@ certificate. If not specified, the defau
 props and session.executionProperties with key
 tomcat.maven.http.port<br /><b>Default value is</b>: <tt>8080</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.port</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#propertiesPortFilePath">propertiesPortFilePath</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>Will dump port in a properties file (see ports for property names).
 If empty no file generated<br /><b>User property is</b>: <tt>maven.tomcat.propertiesPortFilePath</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#protocol">protocol</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>The protocol to run the Tomcat server on. By default it's HTTP/1.1.<br /><b>Default value is</b>: <tt>HTTP/1.1</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.protocol</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#serverXml">serverXml</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>1.0-alpha-2</tt></td>
             <td>server.xml to use <b>Note if you use this you must configure in
 this file your webapp paths</b>.<br /><b>User property is</b>: <tt>maven.tomcat.serverXml</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#skip">skip</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>2.0</tt></td>
             <td>Skip execution<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.skip</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#staticContextDocbase">staticContextDocbase</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>The static context docroot base fully qualified path if
 <tt>null</tt> static context won't be added<br /><b>User property is</b>: <tt>maven.tomcat.staticContextDocbase</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#staticContextPath">staticContextPath</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>2.0</tt></td>
             <td>The static context<br /><b>Default value is</b>: <tt>/</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.staticContextPath</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#systemProperties">systemProperties</a></b></td>
             <td><tt>Map</tt></td>
             <td><tt>1.0-alpha-2</tt></td>
             <td>List of System properties to pass to the Tomcat Server.<br /></td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#tomcatLoggingFile">tomcatLoggingFile</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
             <td>The path of the Tomcat logging configuration.<br /><b>User property is</b>: <tt>maven.tomcat.tomcatLogging.file</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#tomcatUsers">tomcatUsers</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>2.0</tt></td>
             <td>The path of the Tomcat users XML file.<br /><b>User property is</b>: <tt>maven.tomcat.tomcatUsers.file</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#tomcatWebXml">tomcatWebXml</a></b></td>
             <td><tt>File</tt></td>
             <td><tt>1.0-alpha-2</tt></td>
             <td>overriding the providing web.xml to run tomcat<br /><b>User property is</b>: <tt>maven.tomcat.webXml</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#uriEncoding">uriEncoding</a></b></td>
             <td><tt>String</tt></td>
             <td><tt>1.0</tt></td>
             <td>The character encoding to use for decoding URIs.<br /><b>Default value is</b>: <tt>ISO-8859-1</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.uriEncoding</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#useNaming">useNaming</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>2.0</tt></td>
@@ -458,14 +466,14 @@ server.</p>
 <tt>server.xml</tt> for your Tomcat. Instead please configure
 naming in the <tt>server.xml</tt>.</p><br /><b>Default value is</b>: <tt>true</tt>.<br /><b>User property is</b>: <tt>maven.tomcat.useNaming</tt>.</td>
           </tr>
-          <tr class="a">
+          <tr class="b">
             <td><b><a href="#useSeparateTomcatClassLoader">useSeparateTomcatClassLoader</a></b></td>
             <td><tt>boolean</tt></td>
             <td><tt>1.0</tt></td>
             <td>if <tt>true</tt> a new classLoader separated from maven core
 will be created to start tomcat.<br /><b>Default value is</b>: <tt>false</tt>.<br /><b>User property is</b>: <tt>tomcat.useSeparateTomcatClassLoader</tt>.</td>
           </tr>
-          <tr class="b">
+          <tr class="a">
             <td><b><a href="#webapps">webapps</a></b></td>
             <td><tt>List</tt></td>
             <td><tt>2.0</tt></td>
@@ -539,6 +547,14 @@ Name aliases</a></div>
           <li><b>Type</b>: <tt>java.lang.String</tt></li>
           <li><b>Since</b>: <tt>2.0</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
+        </ul><hr /><p><b><a name="clientAuth">clientAuth</a>:</b></p>
+        <div>enable client authentication for https (if configured)</div>
+        <ul>
+          <li><b>Type</b>: <tt>boolean</tt></li>
+          <li><b>Since</b>: <tt>2.1</tt></li>
+          <li><b>Required</b>: <tt>No</tt></li>
+          <li><b>User Property</b>: <tt>maven.tomcat.https.clientAuth</tt></li>
+          <li><b>Default</b>: <tt>false</tt></li>
         </ul><hr /><p><b><a name="configurationDir">configurationDir</a>:</b></p>
         <div>The directory to create the Tomcat server configuration under.</div>
         <ul>
@@ -547,12 +563,14 @@ Name aliases</a></div>
           <li><b>Required</b>: <tt>No</tt></li>
           <li><b>Default</b>: <tt>${project.build.directory}/tomcat</tt></li>
         </ul><hr /><p><b><a name="contextFile">contextFile</a>:</b></p>
-        <div>The path of the Tomcat context XML file.</div>
+        <div><p>The path of the Tomcat context XML file.</p>
+<p>Since release 2.0, the file is filtered as a maven resource so
+you can use interpolation tokens ${ }</p></div>
         <ul>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Since</b>: <tt>2.0</tt></li>
           <li><b>Required</b>: <tt>No</tt></li>
-          <li><b>Default</b>: <tt>${project.build.directory}/${project.build.finalName}/META-INF/context.xml</tt></li>
+          <li><b>User Property</b>: <tt>maven.tomcat.contextFile</tt></li>
         </ul><hr /><p><b><a name="contextReloadable">contextReloadable</a>:</b></p>
         <div>Force context scanning if you don't use a context file with
 reloadable = &quot;true&quot;. The other way to use contextReloadable is to
@@ -757,6 +775,7 @@ will be created to start tomcat.</div>
           <li><b>Type</b>: <tt>java.io.File</tt></li>
           <li><b>Since</b>: <tt>2.0</tt></li>
           <li><b>Required</b>: <tt>Yes</tt></li>
+          <li><b>User Property</b>: <tt>maven.tomcat.warDirectory</tt></li>
           <li><b>Default</b>: <tt>${project.build.directory}/${project.build.finalName}</tt></li>
         </ul><hr /><p><b><a name="webapps">webapps</a>:</b></p>
         <div>(no description)</div>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/shutdown-mojo.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/shutdown-mojo.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/shutdown-mojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/shutdown-mojo.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - 
     tomcat7:shutdown</title>
@@ -193,7 +193,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/sonar.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/sonar.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/sonar.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/sonar.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - Sonar</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -191,7 +191,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/source-repository.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/source-repository.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/source-repository.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/source-repository.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - Source Repository</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -191,7 +191,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/standalone-war-mojo.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/standalone-war-mojo.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/standalone-war-mojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/standalone-war-mojo.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - 
     tomcat7:standalone-war</title>
@@ -193,7 +193,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/team-list.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/team-list.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/team-list.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/team-list.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - Team list</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -191,7 +191,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/undeploy-mojo.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/undeploy-mojo.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/undeploy-mojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/undeploy-mojo.html Wed Jan 30 10:54:08 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - 
     tomcat7:undeploy</title>
@@ -193,7 +193,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/usage.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/usage.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/usage.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/usage.html Wed Jan 30 10:54:08 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 9, 2013
+ | Generated by Apache Maven Doxia at Jan 30, 2013
  | Rendered using Apache Maven Fluido Skin 1.3.0
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="author" content="Olivier Lamy" />
     <meta name="Date-Creation-yyyymmdd" content="20120203" />
-    <meta name="Date-Revision-yyyymmdd" content="20130109" />
+    <meta name="Date-Revision-yyyymmdd" content="20130130" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache Tomcat Maven Plugin :: Tomcat 7.x - Usage</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -193,7 +193,7 @@
         
                 
                     
-                  <li id="publishDate" class="pull-right">Last Published: 09 January 2013</li> <li class="divider pull-right">|</li>
+                  <li id="publishDate" class="pull-right">Last Published: 30 January 2013</li> <li class="divider pull-right">|</li>
               <li id="projectVersion" class="pull-right">Version: 2.1-SNAPSHOT</li>
             
                             </ul>

Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html?rev=1440343&r1=1440342&r2=1440343&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html (original)
+++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html Wed Jan 30 10:54:08 2013
@@ -8,7 +8,7 @@
 <body>
 <div id="overview"><a href="../../../../../../../../apidocs/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.html">View Javadoc</a></div><pre>
 
-<a class="jxr_linenumber" name="1" href="#1">1</a>   <em class="jxr_comment">package org.apache.tomcat.maven.plugin.tomcat7.run;</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a>   <strong class="jxr_keyword">package</strong> org.apache.tomcat.maven.plugin.tomcat7.run;
 <a class="jxr_linenumber" name="2" href="#2">2</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="3" href="#3">3</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
 <a class="jxr_linenumber" name="4" href="#4">4</a>   <em class="jxr_comment"> * or more contributor license agreements.  See the NOTICE file</em>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org