tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1188401 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ webapps/docs/
Date Mon, 24 Oct 2011 21:50:26 GMT
Author: markt
Date: Mon Oct 24 21:50:26 2011
New Revision: 1188401

URL: http://svn.apache.org/viewvc?rev=1188401&view=rev
Log:
Start deprecating unused / unnecessary code

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 21:50:26 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188
 305
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188
 305,1188399

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java Mon Oct 24
21:50:26 2011
@@ -25,9 +25,13 @@ public class Constants {
 
     // Authentication methods for login configuration
     // Servlet spec schemes
+    @Deprecated
     public static final String BASIC_METHOD = "BASIC";
+    @Deprecated
     public static final String CERT_METHOD = "CLIENT_CERT";
+    @Deprecated
     public static final String DIGEST_METHOD = "DIGEST";
+    @Deprecated
     public static final String FORM_METHOD = "FORM";
     // Vendor specific schemes
     public static final String SPNEGO_METHOD = "SPNEGO";

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Mon Oct
24 21:50:26 2011
@@ -100,6 +100,7 @@ public class SingleSignOn extends ValveB
     /**
      * The string manager for this package.
      */
+    @Deprecated
     protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Oct 24 21:50:26
2011
@@ -186,6 +186,7 @@ public class InputBuffer extends Reader
      * 
      * @return the associated Coyote request
      */
+    @Deprecated
     public Request getRequest() {
         return this.coyoteRequest;
     }

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Oct 24
21:50:26 2011
@@ -85,6 +85,7 @@ public class MapperListener extends Life
 
     // --------------------------------------------------------- Public Methods
 
+    @Deprecated
     public String getConnectorName() {
         return this.connector.toString();
     }

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java Mon Oct 24 21:50:26
2011
@@ -179,6 +179,7 @@ public class OutputBuffer extends Writer
      * 
      * @return the associated Coyote response
      */
+    @Deprecated
     public Response getResponse() {
         return this.coyoteResponse;
     }

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Mon Oct 24 21:50:26
2011
@@ -282,6 +282,7 @@ public class Request
     /**
      * Session parsed flag.
      */
+    @Deprecated
     protected boolean sessionParsed = false;
 
 
@@ -531,9 +532,11 @@ public class Request
         pathParameters.clear();
     }
 
+    @Deprecated
     protected boolean isProcessing() {
         return coyoteRequest.isProcessing();
     }
+
     /**
      * Clear cached encoders (to save memory for Comet requests).
      */
@@ -639,6 +642,7 @@ public class Request
      *
      * @param host The newly associated Host
      */
+    @Deprecated
     public void setHost(Host host) {
         mappingData.host = host;
     }
@@ -817,6 +821,7 @@ public class Request
      * Return an Iterator containing the String names of all notes bindings
      * that exist for this request.
      */
+    @Deprecated
     public Iterator<String> getNoteNames() {
         return notes.keySet().iterator();
     }
@@ -891,6 +896,7 @@ public class Request
      *
      * @param name The server name
      */
+    @Deprecated
     public void setServerName(String name) {
         coyoteRequest.serverName().setString(name);
     }
@@ -1753,6 +1759,7 @@ public class Request
      * @param name Name of this request parameter
      * @param values Corresponding values for this request parameter
      */
+    @Deprecated
     public void addParameter(String name, String values[]) {
         coyoteRequest.getParameters().addParameterValues(name, values);
     }
@@ -1770,6 +1777,7 @@ public class Request
     /**
      * Clear the collection of Headers associated with this Request.
      */
+    @Deprecated
     public void clearHeaders() {
         // Not used
     }
@@ -1786,6 +1794,7 @@ public class Request
     /**
      * Clear the collection of parameters associated with this Request.
      */
+    @Deprecated
     public void clearParameters() {
         // Not used
     }
@@ -1810,6 +1819,7 @@ public class Request
      *
      * @param path The context path
      */
+    @Deprecated
     public void setContextPath(String path) {
 
         if (path == null) {
@@ -1903,6 +1913,7 @@ public class Request
      * 
      * @return the URL decoded request URI
      */
+    @Deprecated
     public MessageBytes getDecodedRequestURIMB() {
         return coyoteRequest.decodedURI();
     }
@@ -1915,6 +1926,7 @@ public class Request
      *
      * @param path The servlet path
      */
+    @Deprecated
     public void setServletPath(String path) {
         if (path != null)
             mappingData.wrapperPath.setString(path);
@@ -1976,6 +1988,7 @@ public class Request
      * 
      * @return the context path
      */
+    @Deprecated
     public MessageBytes getContextPathMB() {
         return mappingData.contextPath;
     }
@@ -1998,6 +2011,7 @@ public class Request
     /**
      * Set the set of cookies received with this Request.
      */
+    @Deprecated
     public void setCookies(Cookie[] cookies) {
 
         this.cookies = cookies;
@@ -2108,6 +2122,7 @@ public class Request
      * 
      * @return the path info
      */
+    @Deprecated
     public MessageBytes getPathInfoMB() {
         return mappingData.pathInfo;
     }
@@ -2237,6 +2252,7 @@ public class Request
      * 
      * @return the servlet path
      */
+    @Deprecated
     public MessageBytes getServletPathMB() {
         return mappingData.wrapperPath;
     }
@@ -2529,6 +2545,7 @@ public class Request
      * Not part of Servlet 3 spec but probably should be.
      * @return true if the requested session ID was obtained from the SSL session
      */
+    @Deprecated
     public boolean isRequestedSessionIdFromSSL() {
         return requestedSessionSSL;
     }

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Mon Oct 24 21:50:26
2011
@@ -130,6 +130,7 @@ public class Response
     /**
      * Return the Connector through which this Request was received.
      */
+    @Deprecated
     public Connector getConnector() {
         return (this.connector);
     }
@@ -170,6 +171,7 @@ public class Response
     /**
      * Get the Coyote response.
      */
+    @Deprecated
     public org.apache.coyote.Response getCoyoteResponse() {
         return (coyoteResponse);
     }
@@ -190,6 +192,7 @@ public class Response
      *
      * @param context The newly associated Context
      */
+    @Deprecated
     public void setContext(Context context) {
         request.setContext(context);
     }
@@ -356,6 +359,7 @@ public class Response
     /**
      * Return the "processing inside an include" flag.
      */
+    @Deprecated
     public boolean getIncluded() {
         return included;
     }
@@ -367,6 +371,7 @@ public class Response
      * @param included <code>true</code> if we are currently inside a
      *  RequestDispatcher.include(), else <code>false</code>
      */
+    @Deprecated
     public void setIncluded(boolean included) {
         this.included = included;
     }
@@ -424,6 +429,7 @@ public class Response
     /**
      * Return the output stream associated with this Response.
      */
+    @Deprecated
     public OutputStream getStream() {
         if (outputStream == null) {
             outputStream = new CoyoteOutputStream(outputBuffer);
@@ -480,7 +486,8 @@ public class Response
      *
      * @exception IOException if an input/output error occurs
      */
-    public ServletOutputStream createOutputStream() 
+    @Deprecated
+    public ServletOutputStream createOutputStream()
         throws IOException {
         // Probably useless
         if (outputStream == null) {
@@ -957,6 +964,7 @@ public class Response
      * @exception IllegalStateException if this response has already been
      *  committed
      */
+    @Deprecated
     public void reset(int status, String message) {
         reset();
         setStatus(status, message);

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1188401&r1=1188400&r2=1188401&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 24 21:50:26 2011
@@ -215,6 +215,10 @@
         <bug>52059</bug>: In Windows uninstaller: Do not forget to remove
         Tomcat keys from 32-bit registry on deinstallation. (kkolinko)
       </fix>
+      <scode>
+        Start the process of deprecating unused and unnecessary code that will
+        be removed in the next major release (8.0.x). (markt)
+      </scode>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message