tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Request.java
Date Tue, 26 Dec 2000 22:56:38 GMT
costin      00/12/26 14:56:38

  Modified:    src/share/org/apache/tomcat/core Request.java
  Log:
  - removed ACC and Counters - the code is not used and specific to accounting
  modules - a note can be used instead. We also want to implement that
  in module so we can extend it later.
  
  - 2 more Strings converted to MessageBytes ( we almost finished the conversion)
  
  - removed old code, re-grouped getter/setters next to each other.
  
  Revision  Changes    Path
  1.82      +40 -118   jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- Request.java	2000/12/17 22:16:36	1.81
  +++ Request.java	2000/12/26 22:56:38	1.82
  @@ -80,16 +80,6 @@
    * @author Hans Bergsten [hans@gefionsoftware.com]
    */
   public class Request {
  -    public static final int ACC_PRE_CMAP=0;
  -    public static final int ACC_PRE_RMAP=1;
  -    public static final int ACC_POST_MAP=2;
  -    public static final int ACC_PRE_SERVICE=3;
  -    public static final int ACC_POST_SERVICE=4;
  -    public static final int ACC_IN_OUT=5;
  -    public static final int ACC_OUT_COUNT=6;
  -
  -    public static final int ACCOUNTS=7;
  -
       public static final String SESSIONID_FROM_COOKIE="cookie";
       public static final String SESSIONID_FROM_URL="url";
       public static final int MAX_INCLUDE=10;
  @@ -191,7 +181,7 @@
   
       private Object notes[]=new Object[ContextManager.MAX_NOTES];
       // Accounting
  -    private Counters cntr=new Counters(ACCOUNTS);
  +    private Counters cntr=new Counters(ContextManager.MAX_NOTES);
   
       // -------------------- Constructor --------------------
   
  @@ -245,14 +235,12 @@
   	return response;
       }
   
  +    // -------------------- 
  +    
       public MimeHeaders getMimeHeaders() {
   	return headers;
       }
   
  -    public final Counters getCounters() {
  -	return cntr;
  -    }
  -
       // -------------------- Request data --------------------
   
       public MessageBytes scheme() {
  @@ -270,15 +258,19 @@
       public MessageBytes queryString() {
   	return queryMB;
       }
  -    
  -    public String getProtocol() {
  -        return protoMB.toString();
  +
  +    public MessageBytes servletPath() {
  +	return servletPathMB;
       }
   
  -    public void setProtocol( String protocol ) {
  -	protoMB.setString(protocol);
  +    public MessageBytes pathInfo() {
  +	return pathInfoMB;
       }
   
  +    public MessageBytes protocol() {
  +	return protoMB;
  +    }
  +    
       /** Return the buffer holding the server name, if
        *  any. Use isNull() to check if there is no value
        *  set.
  @@ -288,51 +280,27 @@
       public MessageBytes serverName() {
   	return serverNameMB;
       }
  -
  -//     /** Return the server name. If none was set,
  -//      *  extract it from the host header.
  -//      *
  -//      */
  -//     public String getServerName() {
  -//         return serverName;
  -//     }
  -
  -//     /** Virtual host */
  -//     public void setServerName(String serverName) {
  -// 	this.serverName = serverName;
  -//     }
  -
       
       public int getServerPort() {
           return serverPort;
       }
   
  -    public String getRemoteAddr() {
  -        return remoteAddr;
  -    }
  -
  -    public String getRemoteHost() {
  -	return remoteHost;
  -    }
  -
  -    public void setPathInfo(String pathInfo) {
  -        pathInfoMB.setString( pathInfo );
  -    }
  -
  -//     // What's between context path and servlet name ( /servlet )
  -//     // A smart server may use arbitrary prefixes and rewriting
  -//     public String getServletPrefix() {
  -// 	return null;
  -//     }
  -
       public void setServerPort(int serverPort ) {
   	this.serverPort=serverPort;
       }
   
  +    public String getRemoteAddr() {
  +        return remoteAddr;
  +    }
  +
       public void setRemoteAddr( String remoteAddr ) {
   	this.remoteAddr=remoteAddr;
       }
   
  +    public String getRemoteHost() {
  +	return remoteHost;
  +    }
  +
       public void setRemoteHost(String remoteHost) {
   	this.remoteHost=remoteHost;
       }
  @@ -368,16 +336,8 @@
           return parameters.keys();
       }
   
  -    // --------------------
  +    // -------------------- encoding/type --------------------
   
  -    public void setAuthType(String authType) {
  -        this.authType = authType;
  -    }
  -    
  -    public String getAuthType() {
  -    	return authType;
  -    }
  -
       public String getCharacterEncoding() {
           if(charEncoding!=null) return charEncoding;
           charEncoding = RequestUtil.getCharsetFromContentType( getContentType());
  @@ -414,12 +374,15 @@
   	this.contentType=type;
       }
   
  -    // XXX XXX Servlet API conflicts with the CGI specs -
  -    // PathInfo should be "" if no path info is requested ( as it is in CGI ).
  -    // We are following the spec, but IMHO it's a bug ( in the spec )
  -    public String getPathInfo() {
  -        return pathInfoMB.toString();
  +    // -------------------- Security info -------------------- 
  +    
  +    public void setAuthType(String authType) {
  +        this.authType = authType;
       }
  +    
  +    public String getAuthType() {
  +    	return authType;
  +    }
   
       public void setRemoteUser(String s) {
   	remoteUser=s;
  @@ -435,15 +398,15 @@
   	    // Call all authentication callbacks. If any of them is able to
   	    // 	identify the user it will set the principal in req.
   	    int status=0;
  -	    BaseInterceptor reqI[]= getContext().getContainer().getInterceptors(Container.H_authenticate);
  -            //.getInterceptors(this,);
  +	    BaseInterceptor reqI[]= getContext().getContainer().
  +		getInterceptors(Container.H_authenticate);
   	    for( int i=0; i< reqI.length; i++ ) {
   		status=reqI[i].authenticate( this, response );
   		if ( status != 0 ) {
   		    break;
   		}
   	    }
  -	    // 	    context.log("Auth " + remoteUser );
  +	    //context.log("Auth " + remoteUser );
   	}
   	return remoteUser;
       }
  @@ -483,7 +446,7 @@
   	return userRoles;
       }
   
  -    String checkRoles[]=new String[1];
  +    private String checkRoles[]=new String[1];
       public boolean isUserInRole(String role) {
   	checkRoles[0]=role;
   
  @@ -501,16 +464,6 @@
   	return status==0;
       }
   
  -    public String getServletPath() {
  -        return servletPathMB.toString();
  -    }
  -
  -    public void setServletPath(String servletPath) {
  -	servletPathMB.setString( servletPath );
  -    }
  -
  -
  -
       // -------------------- Session --------------------
       // GS - return the jvm load balance route
       public String getJvmRoute() {
  @@ -598,34 +551,6 @@
   	return scookies;
       }
       
  -//     public int getCookieCount() {
  -// 	if( cookieCount == -1 ) {
  -// 	    cookieCount=0;
  -// 	    // compute cookies
  -// 	    CookieTools.processCookies( this );
  -// 	}
  -// 	return cookieCount;
  -//     }
  -
  -//     public ServerCookie getCookie( int idx ) {
  -// 	if( cookieCount == -1 ) {
  -// 	    getCookieCount(); // will also update the cookies
  -// 	}
  -// 	return scookies[idx];
  -//     }
  -
  -//     public void addCookie( ServerCookie c ) {
  -// 	// not really needed - happen in 1 thread
  -// 	synchronized ( this ) {
  -// 	    if( cookieCount >= scookies.length  ) {
  -// 		ServerCookie scookiesTmp[]=new ServerCookie[2*cookieCount];
  -// 		System.arraycopy( scookies, 0, scookiesTmp, 0, cookieCount);
  -// 		scookies=scookiesTmp;
  -// 	    }
  -// 	    scookies[cookieCount++]=c;
  -// 	}
  -//     }
  -
       // -------------------- LookupResult
   
       /** As result of mapping the request a "handler" will be associated
  @@ -698,7 +623,6 @@
       }
   
       public void setAttribute(String name, Object value) {
  -	//	contextM.log( "setAttribure " + name +  " " + value );
   	if(name!=null && value!=null)
   	    attributes.put(name, value);
       }
  @@ -827,8 +751,9 @@
   	sb.append( "R( ");
   	if( context!=null) {
   	    sb.append( context.getPath() );
  -	    if( getServletPath() != null )
  -		sb.append( " + " + getServletPath() + " + " + getPathInfo());
  +	    if( ! servletPathMB.isNull() )
  +		sb.append( " + " + servletPathMB.toString() + " + " +
  +			   pathInfoMB.toString());
   	} else {
   	    sb.append(requestURI().toString());
   	}
  @@ -846,6 +771,10 @@
   	return notes[pos];
       }
   
  +    public final Counters getCounters() {
  +	return cntr;
  +    }
  +
       // -------------------- Recycling -------------------- 
       public void recycle() {
   	initRequest();
  @@ -875,11 +804,6 @@
           sessionIdSource = null;
   	sessionId=null;
   	
  -// 	for( int i=0; i< cookieCount; i++ ) {
  -// 	    if( scookies[i]!=null )
  -// 		scookies[i].recycle();
  -// 	}
  -// 	cookieCount=-1;
   	scookies.recycle();
   	
   	// counters and notes
  @@ -912,7 +836,5 @@
           protoMB.setString("HTTP/1.0");
           remoteAddr="127.0.0.1";
           remoteHost="localhost";
  -//        localHost="localhost";
  -
       }
   }
  
  
  

Mime
View raw message