Author: markt
Date: Tue Apr 3 17:30:56 2018
New Revision: 1828262
URL: http://svn.apache.org/viewvc?rev=1828262&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62172
Improve Javadoc for org.apache.catalina.startup.Constants and ensure that the
constants are correctly used.
Modified:
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1828262&r1=1828261&r2=1828262&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Tue Apr 3
17:30:56 2018
@@ -25,7 +25,6 @@ import java.io.FileInputStream;
import java.io.InputStream;
import org.apache.catalina.Globals;
-import org.apache.catalina.startup.Constants;
import org.apache.tomcat.util.descriptor.DigesterFactory;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tools.ant.BuildException;
@@ -64,7 +63,6 @@ public class ValidatorTask extends BaseR
// --------------------------------------------------------- Public Methods
-
/**
* Execute the specified command. This logic only performs the common
* attribute validation required by all subclasses; it does not perform
@@ -79,7 +77,7 @@ public class ValidatorTask extends BaseR
throw new BuildException("Must specify 'path'");
}
- File file = new File(path, Constants.ApplicationWebXml);
+ File file = new File(path, "WEB-INF/web.xml");
if (!file.canRead()) {
throw new BuildException("Cannot find web.xml");
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1828262&r1=1828261&r2=1828262&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Tue Apr 3
17:30:56 2018
@@ -18,6 +18,9 @@ package org.apache.catalina.startup;
/**
* String constants for the startup package.
+ * <br>
+ * Note that some values include a leading '/' and that some do not. This is
+ * intentional based on how the values are used.
*
* @author Craig R. McClanahan
*/
@@ -44,6 +47,5 @@ public final class Constants {
*
* @see Tomcat
*/
- public static final String NoDefaultWebXml =
- "org/apache/catalina/startup/NO_DEFAULT_XML";
+ public static final String NoDefaultWebXml =
"org/apache/catalina/startup/NO_DEFAULT_XML";
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1828262&r1=1828261&r2=1828262&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Apr 3
17:30:56 2018
@@ -830,8 +830,7 @@ public class HostConfig implements Lifec
File xml = new File(host.getAppBaseFile(),
cn.getBaseName() + "/" + Constants.ApplicationContextXml);
- File warTracker = new File(host.getAppBaseFile(),
- cn.getBaseName() + "/" + Constants.WarTracker);
+ File warTracker = new File(host.getAppBaseFile(), cn.getBaseName() +
Constants.WarTracker);
boolean xmlInWar = false;
try (JarFile jar = new JarFile(war)) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1828262&r1=1828261&r2=1828262&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 3 17:30:56 2018
@@ -71,6 +71,11 @@
<code>maxActive</code>. Patch provided by Holger Sunke. (markt)
</fix>
<fix>
+ <bug>62172</bug>: Improve Javadoc for
+ <code>org.apache.catalina.startup.Constants</code> and ensure that the
+ constants are correctly used. (markt)
+ </fix>
+ <fix>
<bug>62175</bug>: Avoid infinite recursion, when trying to validate
a session while loading it with <code>PersistentManager</code>.
(fschumacher)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
