Author: markt
Date: Mon Nov 25 19:43:06 2013
New Revision: 1545377
URL: http://svn.apache.org/r1545377
Log:
Update unit tests and documentation now that deployment fails if deployXML is
true and the application has an embedded context.xml
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
tomcat/trunk/webapps/docs/config/automatic-deployment.xml
tomcat/trunk/webapps/docs/config/host.xml
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1545377&r1=1545376&r2=1545377&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Mon Nov 25 19:43:06 2013
@@ -335,28 +335,28 @@ public class TestHostConfigAutomaticDepl
public void testDeploymentWarXmlFFF() throws Exception {
createWar(WAR_XML_SOURCE, true);
doTestDeployment(false, false, false,
- LifecycleState.STARTED, null, false, true, false);
+ LifecycleState.FAILED, null, false, true, false);
}
@Test
public void testDeploymentWarXmlFFT() throws Exception {
createWar(WAR_XML_SOURCE, true);
doTestDeployment(false, false, true,
- LifecycleState.STARTED, null, false, true, true);
+ LifecycleState.FAILED, null, false, true, true);
}
@Test
public void testDeploymentWarXmlFTF() throws Exception {
createWar(WAR_XML_SOURCE, true);
doTestDeployment(false, true, false,
- LifecycleState.STARTED, null, false, true, false);
+ LifecycleState.FAILED, null, false, true, false);
}
@Test
public void testDeploymentWarXmlFTT() throws Exception {
createWar(WAR_XML_SOURCE, true);
doTestDeployment(false, true, true,
- LifecycleState.STARTED, null, false, true, true);
+ LifecycleState.FAILED, null, false, true, true);
}
@Test
@@ -462,28 +462,28 @@ public class TestHostConfigAutomaticDepl
public void testDeploymentDirXmlFFF() throws Exception {
createDirInAppbase(true);
doTestDeployment(false, false, false,
- LifecycleState.STARTED, null, false, false, true);
+ LifecycleState.FAILED, null, false, false, true);
}
@Test
public void testDeploymentDirXmlFFT() throws Exception {
createDirInAppbase(true);
doTestDeployment(false, false, true,
- LifecycleState.STARTED, null, false, false, true);
+ LifecycleState.FAILED, null, false, false, true);
}
@Test
public void testDeploymentDirXmlFTF() throws Exception {
createDirInAppbase(true);
doTestDeployment(false, true, false,
- LifecycleState.STARTED, null, false, false, true);
+ LifecycleState.FAILED, null, false, false, true);
}
@Test
public void testDeploymentDirXmlFTT() throws Exception {
createDirInAppbase(true);
doTestDeployment(false, true, true,
- LifecycleState.STARTED, null, false, false, true);
+ LifecycleState.FAILED, null, false, false, true);
}
@Test
Modified: tomcat/trunk/webapps/docs/config/automatic-deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/automatic-deployment.xml?rev=1545377&r1=1545376&r2=1545377&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/automatic-deployment.xml (original)
+++ tomcat/trunk/webapps/docs/config/automatic-deployment.xml Mon Nov 25
19:43:06 2013
@@ -527,8 +527,9 @@
<li><em>unpackWARs</em> is ignored since there is no WAR file.</li>
<li>The context will fail to start because there is no content in the
expected <em>docBase</em>.</li>
- <li>The embedded META-INF/context.xml is ignored because <em>deployXML</em>
- is <code>false</code>.</li>
+ <li>The web application fails to deploy because it contains an embedded
+ META-INF/context.xml, <em>deployXML</em> is <code>false</code> and an
+ XML has not been provided in the <em>configBase</em>.</li>
<li>The XML file is only deleted if <em>copyXML</em> is <code>true</code>
and <em>deployXML</em> is <code>true</code>.</li>
<li>Although the external resource is still present, the web application is
Modified: tomcat/trunk/webapps/docs/config/host.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1545377&r1=1545376&r2=1545377&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/trunk/webapps/docs/config/host.xml Mon Nov 25 19:43:06 2013
@@ -241,9 +241,13 @@
interacting with the container's configuration. The administrator will
then be responsible for providing an external context configuration
file, and putting it in the location defined by the
- <strong>xmlBase</strong> attribute. The flag's value defaults to
- <code>true</code> unless a security manager is enabled when the default
- is <code>false</code>.</p>
+ <strong>xmlBase</strong> attribute. If this flag is <code>false</code>,
+ a descriptor is located at <code>/META-INF/context.xml</code> and no
+ descriptor is present in <strong>xmlBase</strong> then the context will
+ fail to start in case the descriptor contains necessary configuration
+ for secure deployment (such as a RemoteAddrValve) which should not be
+ ignored. The flag's value defaults to <code>true</code> unless a
+ security manager is enabled when the default is <code>false</code>.</p>
</attribute>
<attribute name="errorReportValveClass" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
