Remove unused code.

Make spacing consistent.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1043265 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/Globals.java b/java/org/apache/catalina/Globals.java
index d0337ce..803f512 100644 (file)
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -35,6 +35,7 @@ public final class Globals {
     public static final String ALT_DD_ATTR = 
         "org.apache.catalina.deploy.alt_dd";
 
+
     /**
      * The request attribute under which we store the array of X509Certificate
      * objects representing the certificate chain presented by our client,
@@ -43,6 +44,7 @@ public final class Globals {
     public static final String CERTIFICATES_ATTR =
         "javax.servlet.request.X509Certificate";
 
+
     /**
      * The request attribute under which we store the name of the cipher suite
      * being used on an SSL connection (as an object of type
@@ -53,24 +55,19 @@ public final class Globals {
 
 
     /**
-     * The servlet context attribute under which we store the class loader
-     * used for loading servlets (as an object of type java.lang.ClassLoader).
-     */
-    public static final String CLASS_LOADER_ATTR =
-        "org.apache.catalina.classloader";
-
-    /**
      * Request dispatcher state.
      */
     public static final String DISPATCHER_TYPE_ATTR = 
         "org.apache.catalina.core.DISPATCHER_TYPE";
 
+
     /**
      * Request dispatcher path.
      */
     public static final String DISPATCHER_REQUEST_PATH_ATTR = 
         "org.apache.catalina.core.DISPATCHER_REQUEST_PATH";
 
+
     /**
      * The JNDI directory context which is associated with the context. This
      * context can be used to manipulate static files.
@@ -119,6 +116,7 @@ public final class Globals {
     public static final String ERROR_MESSAGE_ATTR =
         "javax.servlet.error.message";
 
+
     /**
      * The request attribute under which we store the key size being used for
      * this SSL connection (as an object of type java.lang.Integer).
@@ -126,6 +124,7 @@ public final class Globals {
     public static final String KEY_SIZE_ATTR =
         "javax.servlet.request.key_size";
 
+
     /**
      * The request attribute under which we store the session id being used
      * for this SSL connection (as an object of type java.lang.String).
@@ -167,12 +166,6 @@ public final class Globals {
 
 
     /**
-     * Platform specific new line sequence.
-     */
-    public static final String NEWLINE = System.getProperty("line.separator");
-    
-    
-    /**
      * The request attribute under which the request URI of the included
      * servlet is stored on an included dispatcher request.
      */
@@ -287,14 +280,6 @@ public final class Globals {
 
     
     /**
-     * The servlet context attribute under which we record the set of
-     * welcome files (as an object of type String[]) for this application.
-     */
-    public static final String WELCOME_FILES_ATTR =
-        "org.apache.catalina.WELCOME_FILES";
-
-
-    /**
      * The master flag which controls strict servlet specification 
      * compliance.
      */
@@ -320,12 +305,14 @@ public final class Globals {
      */
     public static final String DEFAULT_MBEAN_DOMAIN = "Catalina";
 
+
     /**
      * Name of the system property containing
      * the tomcat product installation path
      */
     public static final String CATALINA_HOME_PROP = "catalina.home";
 
+
     /**
      * Name of the system property containing
      * the tomcat instance installation path