Author: markt
Date: Tue Nov 26 00:32:47 2013
New Revision: 1545472
URL: http://svn.apache.org/r1545472
Log:
Document new attribute
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1545471
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1545472&r1=1545471&r2=1545472&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 26 00:32:47 2013
@@ -169,6 +169,18 @@
Correct a logic error that meant that unpackWARs was ignored and the
WAR
was always expanded if a WAR failed to deploy. (markt)
</fix>
+ <add>
+ <bug>51294</bug>: Add support for unpacking WARs located outside of the
+ Host's appBase in to the appBase. (markt)
+ </add>
+ <add>
+ Add support for defining <code>copyXML</code> on a per Context basis.
+ (markt)
+ </add>
+ <fix>
+ Define the expected behaviour of the automatic deployment and align the
+ implementation to that definition. (markt)
+ </fix
</changelog>
</subsection>
<subsection name="Coyote">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1545472&r1=1545471&r2=1545472&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Tue Nov 26 00:32:47
2013
@@ -731,6 +731,22 @@
not specified, the default value of <code>false</code> will be
used.</p>
</attribute>
+ <attribute name="copyXML" required="false">
+ <p>Set to <code>true</code> if you want a context XML descriptor
+ embedded inside the application (located at
+ <code>/META-INF/context.xml</code>) to be copied to the owning
+ <a href="host.html">Host</a>'s <code>xmlBase</code> when the
application
+ is deployed. On subsequent starts, the copied context XML descriptor
+ will be used in preference to any context XML descriptor embedded
inside
+ the application even if the descriptor embedded inside the application
+ is more recent. The flag's value defaults to <code>false</code>. Note
if
+ the <strong>deployXML</strong> attribute of the owning
+ <a href="host.html">Host</a> is <code>false</code> or if the
+ <strong>copyXML</strong> attribute of the owning
+ <a href="host.html">Host</a> is <code>true</code>, this attribute will
+ have no effect.</p>
+ </attribute>
+
<attribute name="jndiExceptionOnFailedWrite" required="false">
<p>If <code>true</code>, any attempt by an application to modify the
provided JNDI context with a call to bind(), unbind(),
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
