Author: kkolinko
Date: Tue Nov 26 01:24:30 2013
New Revision: 1545496
URL: http://svn.apache.org/r1545496
Log:
Merged r1545480 from tomcat/trunk:
Correct typo in a message
I removed a duplicate changelog entry and split a long sentence.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1545480
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1545496&r1=1545495&r2=1545496&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Tue Nov 26 01:24:30 2013
@@ -88,7 +88,7 @@ hostConfig.context.restart=Error during
hostConfig.createDirs=Unable to create directory for deployment: {0}
hostConfig.deploy=Deploying web application directory {0}
hostConfig.deployDescriptor=Deploying configuration descriptor {0}
-hostConfig.deployDescriptor.blocked=The web application with context path
[{0}] was not deployed because it contained a deployment descriptor [{1}] which
may include configuration necessary for the secure deployment of the
application but processing of deployment descriptors is prevented by the
deloyXML setting of this host. An appropriate descriptor should be created at
[{2}] to deploy this application.
+hostConfig.deployDescriptor.blocked=The web application with context path
[{0}] was not deployed because it contained a deployment descriptor [{1}] which
may include configuration necessary for the secure deployment of the
application but processing of deployment descriptors is prevented by the
deployXML setting of this host. An appropriate descriptor should be created at
[{2}] to deploy this application.
hostConfig.deployDescriptor.error=Error deploying configuration descriptor {0}
hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread
deployment of context descriptors to complete
hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the
host appBase has been specified, and will be ignored
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=1545496&r1=1545495&r2=1545496&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 26 01:24:30 2013
@@ -160,11 +160,6 @@
control if Jasper (the JSP engine) uses a validating parser when
processing *.jspx and *.tagx files. (markt)
</add>
- <add>
- When running under a security manager, change the default value of the
- Host's <code>deployXML</code> attribute to <code>false</code>.
- (markt)
- </add>
<fix>
Correct a logic error that meant that unpackWARs was ignored and the
WAR
was always expanded if a WAR failed to deploy. (markt)
@@ -182,17 +177,18 @@
implementation to that definition. (markt)
</fix>
<add>
- When a security manager is configured change the default value of
- <code>deployXML</code> of the Host element to <code>false</code>.
- (markt)
+ When running under a security manager, change the default value of the
+ Host's <code>deployXML</code> attribute to <code>false</code>.
+ (markt)
</add>
<add>
If a Host is configured with a value of <code>false</code> for
- <code>deployXML</code>, an application has an embedded descriptor at
- <code>META-INF/context.xml</code> and no explicit descriptor has been
- defined, do not allow the application to start as the descriptor may
- contain configuration necessary for secure operation such as a
- <code>RemoteAddrValve</code>. (markt)
+ <code>deployXML</code>, a web application has an embedded
+ descriptor at <code>META-INF/context.xml</code> and no explicit
+ descriptor has been defined for this application, do not allow the
+ application to start. The reason for this is that the embedded
+ descriptor may contain configuration necessary for secure operation
+ such as a <code>RemoteAddrValve</code>. (markt)
</add>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
