This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0be987f895defa7857f8aa1fbe4a5ed3011ee747
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Feb 4 16:07:44 2024 +0000
Format clean-ups
---
java/org/apache/catalina/startup/ContextConfig.java | 8 +++++++-
java/org/apache/catalina/startup/ContextRuleSet.java | 4 ++--
java/org/apache/catalina/startup/CopyParentClassLoaderRule.java | 4 ++--
java/org/apache/catalina/startup/CredentialHandlerRuleSet.java | 4 ++--
java/org/apache/catalina/startup/EngineRuleSet.java | 4 ++--
java/org/apache/catalina/startup/HostRuleSet.java | 4 ++--
java/org/apache/catalina/startup/NamingRuleSet.java | 4 ++--
java/org/apache/catalina/startup/RealmRuleSet.java | 4 ++--
java/org/apache/catalina/startup/SetNextNamingRule.java | 9 ++++-----
java/org/apache/catalina/startup/Tool.java | 8 ++++----
10 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index 2dd8e064e5..b0ad48594b 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1233,9 +1233,11 @@ public class ContextConfig implements LifecycleListener {
protected void webConfig() {
/*
* Anything and everything can override the global and host defaults.
- * This is implemented in two parts
+ * This is implemented in two parts:
+ *
* - Handle as a web fragment that gets added after everything else so
* everything else takes priority
+ *
* - Mark Servlets as overridable so SCI configuration can replace
* configuration from the defaults
*/
@@ -1243,15 +1245,19 @@ public class ContextConfig implements LifecycleListener
{
/*
* The rules for annotation scanning are not as clear-cut as one might
* think. Tomcat implements the following process:
+ *
* - As per SRV.1.6.2, Tomcat will scan for annotations regardless of
* which Servlet spec version is declared in web.xml. The EG has
* confirmed this is the expected behaviour.
+ *
* - As per http://java.net/jira/browse/SERVLET_SPEC-36, if the main
* web.xml is marked as metadata-complete, JARs are still processed
* for SCIs.
+ *
* - If metadata-complete=true and an absolute ordering is specified,
* JARs excluded from the ordering are also excluded from the SCI
* processing.
+ *
* - If an SCI has a @HandlesType annotation then all classes (except
* those in JARs excluded from an absolute ordering) need to be
* scanned to check if they match.
diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java
b/java/org/apache/catalina/startup/ContextRuleSet.java
index 5864a104c2..2c69b8175a 100644
--- a/java/org/apache/catalina/startup/ContextRuleSet.java
+++ b/java/org/apache/catalina/startup/ContextRuleSet.java
@@ -20,8 +20,8 @@ import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
/**
- * <p><strong>RuleSet</strong> for processing the contents of a
- * Context definition element.</p>
+ * <strong>RuleSet</strong> for processing the contents of a
+ * Context definition element.
*
* @author Craig R. McClanahan
*/
diff --git a/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
b/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
index cefc579aaf..a7f4998ef2 100644
--- a/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
+++ b/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
@@ -25,10 +25,10 @@ import org.xml.sax.Attributes;
/**
- * <p>Rule that copies the <code>parentClassLoader</code> property from the
+ * Rule that copies the <code>parentClassLoader</code> property from the
* next-to-top item on the stack (which must be a <code>Container</code>)
* to the top item on the stack (which must also be a
- * <code>Container</code>).</p>
+ * <code>Container</code>).
*
* @author Craig R. McClanahan
*/
diff --git a/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
b/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
index 5742178ea2..68404e718c 100644
--- a/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
+++ b/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
@@ -20,10 +20,10 @@ import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
/**
- * <p><strong>RuleSet</strong> for processing the contents of a
+ * <strong>RuleSet</strong> for processing the contents of a
* CredentialHandler definition element. This <code>RuleSet</code> supports
* CredentialHandler such as the <code>NestedCredentialHandler</code> that used
- * nested CredentialHandlers.</p>
+ * nested CredentialHandlers.
*/
public class CredentialHandlerRuleSet implements RuleSet {
diff --git a/java/org/apache/catalina/startup/EngineRuleSet.java
b/java/org/apache/catalina/startup/EngineRuleSet.java
index 153d364854..77805d1d4d 100644
--- a/java/org/apache/catalina/startup/EngineRuleSet.java
+++ b/java/org/apache/catalina/startup/EngineRuleSet.java
@@ -20,10 +20,10 @@ import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
/**
- * <p><strong>RuleSet</strong> for processing the contents of a
+ * <strong>RuleSet</strong> for processing the contents of a
* Engine definition element. This <code>RuleSet</code> does NOT include
* any rules for nested Host elements, which should be added via instances of
- * <code>HostRuleSet</code>.</p>
+ * <code>HostRuleSet</code>.
*
* @author Craig R. McClanahan
*/
diff --git a/java/org/apache/catalina/startup/HostRuleSet.java
b/java/org/apache/catalina/startup/HostRuleSet.java
index 135ceb06c4..d8bb36fb0f 100644
--- a/java/org/apache/catalina/startup/HostRuleSet.java
+++ b/java/org/apache/catalina/startup/HostRuleSet.java
@@ -20,10 +20,10 @@ import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
/**
- * <p><strong>RuleSet</strong> for processing the contents of a
+ * <strong>RuleSet</strong> for processing the contents of a
* Host definition element. This <code>RuleSet</code> does NOT include
* any rules for nested Context which should be added via instances of
- * <code>ContextRuleSet</code>.</p>
+ * <code>ContextRuleSet</code>.
*
* @author Craig R. McClanahan
*/
diff --git a/java/org/apache/catalina/startup/NamingRuleSet.java
b/java/org/apache/catalina/startup/NamingRuleSet.java
index b2a3baa570..3125d886cb 100644
--- a/java/org/apache/catalina/startup/NamingRuleSet.java
+++ b/java/org/apache/catalina/startup/NamingRuleSet.java
@@ -20,8 +20,8 @@ import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
/**
- * <p><strong>RuleSet</strong> for processing the JNDI Enterprise Naming
- * Context resource declaration elements.</p>
+ * <strong>RuleSet</strong> for processing the JNDI Enterprise Naming
+ * Context resource declaration elements.
*
* @author Craig R. McClanahan
* @author Remy Maucherat
diff --git a/java/org/apache/catalina/startup/RealmRuleSet.java
b/java/org/apache/catalina/startup/RealmRuleSet.java
index eb6cfa6521..9ff7457d79 100644
--- a/java/org/apache/catalina/startup/RealmRuleSet.java
+++ b/java/org/apache/catalina/startup/RealmRuleSet.java
@@ -20,9 +20,9 @@ import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
/**
- * <p><strong>RuleSet</strong> for processing the contents of a Realm
definition
+ * <strong>RuleSet</strong> for processing the contents of a Realm definition
* element. This <code>RuleSet</code> supports Realms such as the
- * <code>CombinedRealm</code> that used nested Realms.</p>
+ * <code>CombinedRealm</code> that used nested Realms.
*/
public class RealmRuleSet implements RuleSet {
diff --git a/java/org/apache/catalina/startup/SetNextNamingRule.java
b/java/org/apache/catalina/startup/SetNextNamingRule.java
index 3b51a2940f..33d1a6b57a 100644
--- a/java/org/apache/catalina/startup/SetNextNamingRule.java
+++ b/java/org/apache/catalina/startup/SetNextNamingRule.java
@@ -23,14 +23,13 @@ import org.apache.tomcat.util.digester.Rule;
/**
- * <p>Rule implementation that calls a method on the (top-1) (parent)
+ * Rule implementation that calls a method on the (top-1) (parent)
* object, passing the top object (child) as an argument. It is
- * commonly used to establish parent-child relationships.</p>
- *
- * <p>This rule now supports more flexible method matching by default.
+ * commonly used to establish parent-child relationships.
+ * <p>
+ * This rule now supports more flexible method matching by default.
* It is possible that this may break (some) code
* written against release 1.1.1 or earlier.
- * </p>
*/
public class SetNextNamingRule extends Rule {
diff --git a/java/org/apache/catalina/startup/Tool.java
b/java/org/apache/catalina/startup/Tool.java
index cd9fdd6e4c..3dd2e75aa3 100644
--- a/java/org/apache/catalina/startup/Tool.java
+++ b/java/org/apache/catalina/startup/Tool.java
@@ -27,18 +27,18 @@ import org.apache.juli.logging.LogFactory;
/**
- * <p>General purpose wrapper for command line tools that should execute in an
+ * General purpose wrapper for command line tools that should execute in an
* environment with the common class loader environment set up by Catalina.
* This should be executed from a command line script that conforms to
- * the following requirements:</p>
+ * the following requirements:
* <ul>
* <li>Passes the <code>catalina.home</code> system property configured with
* the pathname of the Tomcat installation directory.</li>
* <li>Sets the system classpath to include <code>bootstrap.jar</code> and
* <code>$JAVA_HOME/lib/tools.jar</code>.</li>
* </ul>
- *
- * <p>The command line to execute the tool looks like:</p>
+ * <p>
+ * The command line to execute the tool looks like:
* <pre>
* java -classpath $CLASSPATH org.apache.catalina.startup.Tool \
* ${options} ${classname} ${arguments}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
