You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/05/12 04:20:06 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Request.java RequestDispatcherImpl.java RequestImpl.java
costin 00/05/11 19:20:05
Modified: src/share/org/apache/tomcat/core Request.java
RequestDispatcherImpl.java RequestImpl.java
Log:
Remove few old deprecated methods.
(I started to remove old code, optimize - more changes will follow )
Revision Changes Path
1.35 +7 -26 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Request.java 2000/05/09 17:56:13 1.34
+++ Request.java 2000/05/12 02:19:58 1.35
@@ -74,10 +74,6 @@
*/
public interface Request {
- // -------------------- Multiple JVM support --------------------
- // GS, used by the load balancing layer
- public String getJvmRoute();
-
// -------------------- Basic Request properties --------------------
public String getScheme() ;
@@ -141,15 +137,6 @@
public Context getContext() ;
- /** Everything after context path ( servletPath + pathInfo + queryInfo )
- * @deprecated - artificial construct in tomcat implementation
- */
- public void setLookupPath( String l ) ;
-
- /** @deprecated - artificial construct in tomcat implementation
- */
- public String getLookupPath() ;
-
/** Real Path - should be implemented as a callback ( override it in adapters).
* Map interceptor should set it to something reasonable ( context home + path )
* MappedPath is similar - it contain mappings inside a context, for normal
@@ -207,6 +194,10 @@
// -------------------- Session --------------------
+ // -------------------- Multiple JVM support --------------------
+ // GS, used by the load balancing layer
+ public String getJvmRoute();
+
// Will be set by session interceptors
public String getRequestedSessionId() ;
@@ -277,14 +268,14 @@
// -------------------- Internal/deprecated--------------------
// Derived from parsing query string and body (for POST)
+ // Used in ReqDispatcher
/** @deprecated internal use only */
public void setParameters( Hashtable h ) ;
-
/** @deprecated internal use only */
public Hashtable getParameters() ;
/** @deprecated */
- Principal getUserPrincipal() ;
+ Principal getUserPrincipal() ;
void setUserPrincipal(Principal p) ;
@@ -302,18 +293,8 @@
* @deprecated - use Container instead
*/
public void setWrapper(ServletWrapper handler) ;
-
- /** The file - result of mapping the request ( using aliases and other
- * mapping rules. Usefull only for static resources.
- * @deprecated - internal use only
- */
- public String getMappedPath() ;
-
- /**
- * @deprecated - internal use only
- */
- public void setMappedPath( String m ) ;
+ // -------------------- Notes --------------------
/** Add a per/request internal attribute.
* We keep internal attributes in a separate space to prevent
* servlets from accessing them. We also use indexed access for
1.24 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- RequestDispatcherImpl.java 2000/04/26 16:15:14 1.23
+++ RequestDispatcherImpl.java 2000/05/12 02:19:59 1.24
@@ -149,7 +149,7 @@
realRequest.setContext( context );
// Note that Mapper interceptor uses lookup path.
- realRequest.setLookupPath( path );
+ //realRequest.setLookupPath( path );
realRequest.setRequestURI( context.getPath() + path );
// merge query string as specified in specs - before, it may affect
1.33 +4 -3 jakarta-tomcat/src/share/org/apache/tomcat/core/RequestImpl.java
Index: RequestImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestImpl.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- RequestImpl.java 2000/05/09 17:56:14 1.32
+++ RequestImpl.java 2000/05/12 02:19:59 1.33
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestImpl.java,v 1.32 2000/05/09 17:56:14 costin Exp $
- * $Revision: 1.32 $
- * $Date: 2000/05/09 17:56:14 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestImpl.java,v 1.33 2000/05/12 02:19:59 costin Exp $
+ * $Revision: 1.33 $
+ * $Date: 2000/05/12 02:19:59 $
*
* ====================================================================
*
@@ -160,6 +160,7 @@
StringManager.getManager("org.apache.tomcat.core");
public RequestImpl() {
+ // System.out.println("XXX new ri " );
headers = new MimeHeaders();
recycle(); // XXX need better placement-super()
}