Author: markt
Date: Thu Jan 15 06:09:37 2009
New Revision: 734715
URL: http://svn.apache.org/viewvc?rev=734715&view=rev
Log:
Remove some unused methods and related code
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=734715&r1=734714&r2=734715&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Thu
Jan 15 06:09:37 2009
@@ -466,20 +466,6 @@
}
- 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.
*
Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=734715&r1=734714&r2=734715&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Thu Jan
15 06:09:37 2009
@@ -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;
Modified: tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java?rev=734715&r1=734714&r2=734715&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java (original)
+++ tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java Thu Jan 15
06:09:37 2009
@@ -380,14 +380,6 @@
}
}
-
- 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 @@
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;
- }
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=734715&r1=734714&r2=734715&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Jan 15
06:09:37 2009
@@ -30,9 +30,6 @@
*/
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 @@
return digit;
}
- private final static int debug=0;
- private static void log( String s ) {
- if (log.isDebugEnabled())
- log.debug("URLDecoder: " + s );
- }
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=734715&r1=734714&r2=734715&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Thu Jan 15
06:09:37 2009
@@ -140,11 +140,6 @@
// -------------------- Internal implementation --------------------
- //
- private void init() {
-
- }
-
private void initSafeChars() {
safeChars=new BitSet(128);
int i;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java?rev=734715&r1=734714&r2=734715&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
Thu Jan 15 06:09:37 2009
@@ -214,32 +214,6 @@
}
-
- // -------------------- 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 ) {
-
- }
-
-
- }
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
