Author: fschumacher
Date: Sun Sep 23 11:14:20 2018
New Revision: 1841746
URL: http://svn.apache.org/viewvc?rev=1841746&view=rev
Log:
Add documentation about the files context.xml.default and web.xml.default
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/host.xml
tomcat/trunk/webapps/docs/virtual-hosting-howto.xml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1841746&r1=1841745&r2=1841746&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Sep 23 11:14:20 2018
@@ -81,6 +81,11 @@
Call <code>setAddDefaultWebXmlToWebapp(false)</code> to prevent the
automatic config. (isapir)
</add>
+ <fix>
+ Add documentation about the files <code>context.xml.default</code> and
+ <code>web.xml.default</code> that can be used to customize
<code>conf/context.xml</code>
+ and <code>conf/web.xml</code> on a per host basis. (fschumacher)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
Modified: tomcat/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1841746&r1=1841745&r2=1841746&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/trunk/webapps/docs/config/host.xml Sun Sep 23 11:14:20 2018
@@ -653,6 +653,13 @@
</subsection>
+ <subsection name="Custom context.xml and web.xml">
+ <p>You can override the default values found in
<code>conf/context.xml</code> and
+ <code>conf/web.xml</code> files from <code>$CATALINA_BASE</code> for each
virtual host.
+ Tomcat will look for files named <code>context.xml.default</code> and
<code>web.xml.default</code>
+ in the directory specified by <code>xmlBase</code> and merge the files into
+ those found in the default ones.</p>
+ </subsection>
</section>
Modified: tomcat/trunk/webapps/docs/virtual-hosting-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/virtual-hosting-howto.xml?rev=1841746&r1=1841745&r2=1841746&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/virtual-hosting-howto.xml (original)
+++ tomcat/trunk/webapps/docs/virtual-hosting-howto.xml Sun Sep 23 11:14:20 2018
@@ -122,6 +122,18 @@ $CATALINA_HOME/conf/Catalina/stimpy/ROOT
cp localhost/manager.xml ren/
cp localhost/manager.xml stimpy/</source>
</subsection>
+ <subsection name="Defaults per host">
+ <p>
+ You can override the default values found in
<code>conf/context.xml</code>
+ and <code>conf/web.xml</code> by specifying the new values in files
+ named <code>context.xml.default</code> and <code>web.xml.default</code>
+ from the host specific xml directory.</p>
+ <p>Following our previous example, you could use
+ <code>$CATALINA_HOME/conf/Catalina/ren/web.xml.default</code>
+ to customize the defaults for all webapps that are deployed in the
virtual
+ host named <code>ren</code>.
+ </p>
+ </subsection>
<subsection name="Further Information">
<p>
Consult the configuration documentation for other attributes of the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
