Refactor to allow removal of Constants class

Author: markt-asf

java/org/apache/catalina/servlets/Constants.java

@@ -18,7 +18,10 @@
 
 package org.apache.catalina.servlets;
 
-
+/**
+ * Unused. Will be removed in Tomcat 10.
+ */
+@Deprecated
 public class Constants {
 
     public static final String Package = "org.apache.catalina.servlets";

java/org/apache/catalina/servlets/DefaultServlet.java

@@ -141,7 +141,7 @@ public class DefaultServlet extends HttpServlet {
     /**
      * The string manager for this package.
      */
-    protected static final StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(DefaultServlet.class);
 
     private static final DocumentBuilderFactory factory;