From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 8 Dec 2010 01:31:51 +0000 (+0000)
Subject: Remove unused code
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=98285e83b8db256bce9cf6f8fc4b3539853f0f75;p=tomcat7.0

Remove unused code

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

diff --git a/java/org/apache/catalina/LifecycleEvent.java b/java/org/apache/catalina/LifecycleEvent.java
index d94653741..e720d9d84 100644
--- a/java/org/apache/catalina/LifecycleEvent.java
+++ b/java/org/apache/catalina/LifecycleEvent.java
@@ -39,20 +39,6 @@ public final class LifecycleEvent extends EventObject {
 
     // ----------------------------------------------------------- Constructors
 
-
-    /**
-     * Construct a new LifecycleEvent with the specified parameters.
-     *
-     * @param lifecycle Component on which this event occurred
-     * @param type Event type (required)
-     */
-    public LifecycleEvent(Lifecycle lifecycle, String type) {
-
-        this(lifecycle, type, null);
-
-    }
-
-
     /**
      * Construct a new LifecycleEvent with the specified parameters.
      *
diff --git a/java/org/apache/catalina/authenticator/Constants.java b/java/org/apache/catalina/authenticator/Constants.java
index 23f3fce36..aaa649ff7 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -29,11 +29,6 @@ public class Constants {
     public static final String DIGEST_METHOD = "DIGEST";
     public static final String FORM_METHOD = "FORM";
 
-    // User data constraints for transport guarantee
-    public static final String NONE_TRANSPORT = "NONE";
-    public static final String INTEGRAL_TRANSPORT = "INTEGRAL";
-    public static final String CONFIDENTIAL_TRANSPORT = "CONFIDENTIAL";
-
     // Form based authentication constants
     public static final String FORM_ACTION = "/j_security_check";
     public static final String FORM_PASSWORD = "j_password";
@@ -48,42 +43,6 @@ public class Constants {
 
     // --------------------------------------------------------- Request Notes
 
-
-    /**
-     * <p>If a user has been authenticated by the web layer, by means of a
-     * login method other than CLIENT_CERT, the username and password
-     * used to authenticate the user will be attached to the request as
-     * Notes for use by other server components.  A server component can
-     * also call several existing methods on Request to determine whether
-     * or not any user has been authenticated:</p>
-     * <ul>
-     * <li><strong>request.getAuthType()</strong>
-     *     will return BASIC, CLIENT_CERT, DIGEST, FORM, or <code>null</code>
-     *     if there is no authenticated user.</li>
-     * <li><strong>request.getUserPrincipal()</strong>
-     *     will return the authenticated <code>Principal</code> returned by the
-     *     <code>Realm</code> that authenticated this user.</li>
-     * </ul>
-     * <p>If CLIENT_CERT authentication was performed, the certificate chain
-     * will be available as a request attribute, as defined in the
-     * servlet specification.</p>
-     */
-
-
-    /**
-     * The notes key for the password used to authenticate this user.
-     */
-    public static final String REQ_PASSWORD_NOTE =
-      "org.apache.catalina.request.PASSWORD";
-
-
-    /**
-     * The notes key for the username used to authenticate this user.
-     */
-    public static final String REQ_USERNAME_NOTE =
-      "org.apache.catalina.request.USERNAME";
-
-
     /**
      * The notes key to track the single-sign-on identity with which this
      * request is associated.
diff --git a/java/org/apache/catalina/authenticator/SavedRequest.java b/java/org/apache/catalina/authenticator/SavedRequest.java
index 6d76a02b7..dc95e4047 100644
--- a/java/org/apache/catalina/authenticator/SavedRequest.java
+++ b/java/org/apache/catalina/authenticator/SavedRequest.java
@@ -118,28 +118,6 @@ public final class SavedRequest {
     }
 
 
-
-    /**
-     * The set of request parameters associated with this Request.  Each
-     * entry is keyed by the parameter name, pointing at a String array of
-     * the corresponding values.
-     */
-    private HashMap<String,String[]> parameters =
-        new HashMap<String,String[]>();
-
-    public void addParameter(String name, String values[]) {
-        parameters.put(name, values);
-    }
-
-    public Iterator<String> getParameterNames() {
-        return (parameters.keySet().iterator());
-    }
-
-    public String[] getParameterValues(String name) {
-        return parameters.get(name);
-    }
-
-
     /**
      * The query string associated with this Request.
      */