Remove some unused methods and related code

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

diff --git a/java/org/apache/coyote/http11/InternalOutputBuffer.java b/java/org/apache/coyote/http11/InternalOutputBuffer.java
index 0de094c..310f01a 100644 (file)
--- a/java/org/apache/coyote/http11/InternalOutputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalOutputBuffer.java
@@ -466,20 +466,6 @@ public class InternalOutputBuffer
 
     }
 
-    private String getMessage(final int message){
-        if (org.apache.coyote.Constants.IS_SECURITY_ENABLED){
-           return AccessController.doPrivileged(
-                new PrivilegedAction<String>(){
-                    public String run(){
-                        return HttpMessages.getMessage(message); 
-                    }
-                }
-           );
-        } else {
-            return HttpMessages.getMessage(message);
-        }
-    }
-
     /**
      * Send a header.
      * 

diff --git a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
index 21dbefc..56c099d 100644 (file)
--- a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
+++ b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jasper.el;
 
-import javax.el.ELContext;
 import javax.el.ExpressionFactory;
 import javax.el.ValueExpression;
 import javax.servlet.jsp.el.ELException;

diff --git a/java/org/apache/jk/config/ApacheConfig.java b/java/org/apache/jk/config/ApacheConfig.java
index 232f205..71755e8 100644 (file)
--- a/java/org/apache/jk/config/ApacheConfig.java
+++ b/java/org/apache/jk/config/ApacheConfig.java
@@ -380,14 +380,6 @@ public class ApacheConfig  extends BaseJkConfig {
        }
     }    
 
-    
-    private void generateNameVirtualHost( PrintWriter mod_jk, String ip ) {
-        if( !NamedVirtualHosts.containsKey(ip) ) {
-            mod_jk.println("NameVirtualHost " + ip + "");
-            NamedVirtualHosts.put(ip,ip);
-        }
-    }
-    
     // -------------------- Apache serves static mode --------------------
     // This is not going to work for all apps. We fall back to stupid mode.
     
@@ -561,14 +553,4 @@ public class ApacheConfig  extends BaseJkConfig {
         return docBase;
     }
 
-    private String getVirtualHostAddress(String vhost, String vhostip) {
-        if( vhostip == null ) {
-            if ( vhost != null && vhost.length() > 0 && Character.isDigit(vhost.charAt(0)) )
-                vhostip=vhost;
-            else
-                vhostip="*";
-        }
-        return vhostip;
-    }
-
 }

diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java
index d90a654..e159763 100644 (file)
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -30,9 +30,6 @@ import java.io.IOException;
  */
 public final class UDecoder {
     
-    private static org.apache.juli.logging.Log log=
-        org.apache.juli.logging.LogFactory.getLog(UDecoder.class );
-    
     protected static final boolean ALLOW_ENCODED_SLASH = 
         Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "false")).booleanValue();
 
@@ -276,10 +273,4 @@ public final class UDecoder {
        return digit;
     }
 
-    private final static int debug=0;
-    private static void log( String s ) {
-        if (log.isDebugEnabled())
-            log.debug("URLDecoder: " + s );
-    }
-
 }

diff --git a/java/org/apache/tomcat/util/buf/UEncoder.java b/java/org/apache/tomcat/util/buf/UEncoder.java
index abcea45..8108a4c 100644 (file)
--- a/java/org/apache/tomcat/util/buf/UEncoder.java
+++ b/java/org/apache/tomcat/util/buf/UEncoder.java
@@ -140,11 +140,6 @@ public final class UEncoder {
 
     // -------------------- Internal implementation --------------------
     
-    // 
-    private void init() {
-       
-    }
-    
     private void initSafeChars() {
        safeChars=new BitSet(128);
        int i;

diff --git a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
index 2cf3ad2..d13436e 100644 (file)
--- a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
+++ b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
@@ -214,32 +214,6 @@ public class BaseNotificationBroadcaster implements NotificationBroadcaster {
 
     }
 
-
-    // -------------------- Internal Extensions   --------------------
-
-    // Fast access. First index is the hook type
-    // ( FixedNotificationFilter.getType() ).
-    NotificationListener hooks[][]=new NotificationListener[20][];
-    int hookCount[]=new int[20];
-
-    private synchronized void registerNotifications( FixedNotificationFilter filter ) {
-        String names[]=filter.getNames();
-        Registry reg=Registry.getRegistry(null, null);
-        for( int i=0; i<names.length; i++ ) {
-            int code=reg.getId(null, names[i]);
-            if( hooks.length < code ) {
-                // XXX reallocate
-                throw new RuntimeException( "Too many hooks " + code );
-            }
-            NotificationListener listeners[]=hooks[code];
-            if( listeners== null ) {
-
-            }
-
-
-        }
-    }
-
 }