Author: markt Date: Tue Oct 25 17:53:29 2011 New Revision: 1188832 URL: http://svn.apache.org/viewvc?rev=1188832&view=rev Log: Make unused code as deprecated prior to removal in Tomcat 8.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationResponse.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 25 17:53:29 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,1188399 +/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,1188822 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java Tue Oct 25 17:53:29 2011 @@ -185,6 +185,7 @@ public interface Container extends Lifec /** * Return an object which may be utilized for mapping to this component. */ + @Deprecated public Object getMappingObject(); Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Oct 25 17:53:29 2011 @@ -217,6 +217,7 @@ public class ApplicationContext * The path must begin with a "/" and is interpreted as relative to the * current context root. */ + @Deprecated public DirContext getResources() { return context.getResources(); @@ -1499,6 +1500,7 @@ public class ApplicationContext return this.context; } + @Deprecated protected Map<String,String> getReadonlyAttributes() { return this.readOnlyAttributes; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Tue Oct 25 17:53:29 2011 @@ -51,6 +51,7 @@ class ApplicationHttpResponse extends Ht * * @param response The servlet response being wrapped */ + @Deprecated public ApplicationHttpResponse(HttpServletResponse response) { this(response, false); @@ -370,6 +371,7 @@ class ApplicationHttpResponse extends Ht /** * Return the included flag for this response. */ + @Deprecated boolean isIncluded() { return (this.included); Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationResponse.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationResponse.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationResponse.java Tue Oct 25 17:53:29 2011 @@ -49,6 +49,7 @@ class ApplicationResponse extends Servle * * @param response The servlet response being wrapped */ + @Deprecated public ApplicationResponse(ServletResponse response) { this(response, false); @@ -174,6 +175,7 @@ class ApplicationResponse extends Servle /** * Return the included flag for this response. */ + @Deprecated boolean isIncluded() { return (this.included); Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Tue Oct 25 17:53:29 2011 @@ -451,6 +451,7 @@ public abstract class ContainerBase exte /** * Return an object which may be utilized for mapping to this component. */ + @Deprecated @Override public Object getMappingObject() { return this; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java Tue Oct 25 17:53:29 2011 @@ -171,6 +171,7 @@ public class NamingContextListener /** * Return the comp context. */ + @Deprecated public javax.naming.Context getCompContext() { return this.compCtx; } @@ -187,6 +188,7 @@ public class NamingContextListener /** * Return the associated naming context. */ + @Deprecated public NamingContext getNamingContext() { return (this.namingContext); } Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue Oct 25 17:53:29 2011 @@ -1277,6 +1277,7 @@ public class StandardContext extends Con * Returns true if the resources associated with this context are * filesystem based. */ + @Deprecated public boolean isFilesystemBased() { return (filesystemBased); @@ -1787,6 +1788,7 @@ public class StandardContext extends Con /** * Return the compiler classpath. */ + @Deprecated public String getCompilerClasspath(){ return compilerClasspath; } @@ -1795,6 +1797,7 @@ public class StandardContext extends Con /** * Set the compiler classpath. */ + @Deprecated public void setCompilerClasspath(String compilerClasspath) { this.compilerClasspath = compilerClasspath; } @@ -2264,6 +2267,7 @@ public class StandardContext extends Con /** * Return the "replace welcome files" property. */ + @Deprecated public boolean isReplaceWelcomeFiles() { return (this.replaceWelcomeFiles); @@ -2586,6 +2590,7 @@ public class StandardContext extends Con /** * Save config ? */ + @Deprecated public boolean isSaveConfig() { return saveConfig; } @@ -2594,6 +2599,7 @@ public class StandardContext extends Con /** * Set save config flag. */ + @Deprecated public void setSaveConfig(boolean saveConfig) { this.saveConfig = saveConfig; } @@ -3505,6 +3511,7 @@ public class StandardContext extends Con /** * FIXME: Fooling introspection ... */ + @Deprecated public Context findMappingObject() { return (Context) getMappingObject(); } @@ -6367,6 +6374,7 @@ public class StandardContext extends Con /** * Return the naming resources associated with this web application. */ + @Deprecated public javax.naming.directory.DirContext getStaticResources() { return getResources(); @@ -6378,6 +6386,7 @@ public class StandardContext extends Con * Return the naming resources associated with this web application. * FIXME: Fooling introspection ... */ + @Deprecated public javax.naming.directory.DirContext findStaticResources() { return getResources(); @@ -6504,6 +6513,7 @@ public class StandardContext extends Con return true; } + @Deprecated public void startRecursive() throws LifecycleException { // nothing to start recursive, the servlets will be started by load-on-startup start(); @@ -6545,10 +6555,12 @@ public class StandardContext extends Con return startTime; } + @Deprecated public boolean isEventProvider() { return false; } + @Deprecated public boolean isStatisticsProvider() { return false; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1188832&r1=1188831&r2=1188832&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Oct 25 17:53:29 2011 @@ -289,6 +289,7 @@ public class StandardWrapper extends Con * Static class array used when the SecurityManager is turned on and * <code>Servlet.service</code> is invoked. */ + @Deprecated protected static Class<?>[] classTypeUsedInService = new Class[]{ ServletRequest.class, ServletResponse.class}; @@ -1016,6 +1017,7 @@ public class StandardWrapper extends Con /** * FIXME: Fooling introspection ... */ + @Deprecated public Wrapper findMappingObject() { return (Wrapper) getMappingObject(); } @@ -1557,6 +1559,7 @@ public class StandardWrapper extends Con return swValve.getProcessingTime(); } + @Deprecated public void setProcessingTime(long processingTime) { swValve.setProcessingTime(processingTime); } @@ -1565,6 +1568,7 @@ public class StandardWrapper extends Con return swValve.getMaxTime(); } + @Deprecated public void setMaxTime(long maxTime) { swValve.setMaxTime(maxTime); } @@ -1573,6 +1577,7 @@ public class StandardWrapper extends Con return swValve.getMinTime(); } + @Deprecated public void setMinTime(long minTime) { swValve.setMinTime(minTime); } @@ -1581,6 +1586,7 @@ public class StandardWrapper extends Con return swValve.getRequestCount(); } + @Deprecated public void setRequestCount(int requestCount) { swValve.setRequestCount(requestCount); } @@ -1589,6 +1595,7 @@ public class StandardWrapper extends Con return swValve.getErrorCount(); } + @Deprecated public void setErrorCount(int errorCount) { swValve.setErrorCount(errorCount); } @@ -1605,6 +1612,7 @@ public class StandardWrapper extends Con return loadTime; } + @Deprecated public void setLoadTime(long loadTime) { this.loadTime = loadTime; } @@ -1921,14 +1929,17 @@ public class StandardWrapper extends Con // ------------------------------------------------------------- Attributes + @Deprecated public boolean isEventProvider() { return false; } + @Deprecated public boolean isStateManageable() { return false; } + @Deprecated public boolean isStatisticsProvider() { return false; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org