You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/25 19:42:43 UTC
svn commit: r1188822 - in /tomcat/trunk/java/org/apache/catalina: ./ core/
Author: markt
Date: Tue Oct 25 17:42:43 2011
New Revision: 1188822
URL: http://svn.apache.org/viewvc?rev=1188822&view=rev
Log:
Deprecate unused code in o.a.catalina.core
Modified:
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Tue Oct 25 17:42:43 2011
@@ -176,6 +176,7 @@ public interface Container extends Lifec
/**
* Return an object which may be utilized for mapping to this component.
*/
+ @Deprecated
public Object getMappingObject();
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Oct 25 17:42:43 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/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Tue Oct 25 17:42:43 2011
@@ -51,6 +51,7 @@ class ApplicationHttpResponse extends Ht
*
* @param response The servlet response being wrapped
*/
+ @Deprecated
public ApplicationHttpResponse(HttpServletResponse response) {
this(response, false);
@@ -351,6 +352,7 @@ class ApplicationHttpResponse extends Ht
/**
* Return the included flag for this response.
*/
+ @Deprecated
boolean isIncluded() {
return (this.included);
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java Tue Oct 25 17:42:43 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/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue Oct 25 17:42:43 2011
@@ -439,6 +439,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/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Tue Oct 25 17:42:43 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/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Oct 25 17:42:43 2011
@@ -1270,6 +1270,7 @@ public class StandardContext extends Con
* Returns true if the resources associated with this context are
* filesystem based.
*/
+ @Deprecated
public boolean isFilesystemBased() {
return (filesystemBased);
@@ -1780,6 +1781,7 @@ public class StandardContext extends Con
/**
* Return the compiler classpath.
*/
+ @Deprecated
public String getCompilerClasspath(){
return compilerClasspath;
}
@@ -1788,6 +1790,7 @@ public class StandardContext extends Con
/**
* Set the compiler classpath.
*/
+ @Deprecated
public void setCompilerClasspath(String compilerClasspath) {
this.compilerClasspath = compilerClasspath;
}
@@ -2245,6 +2248,7 @@ public class StandardContext extends Con
/**
* Return the "replace welcome files" property.
*/
+ @Deprecated
public boolean isReplaceWelcomeFiles() {
return (this.replaceWelcomeFiles);
@@ -2567,6 +2571,7 @@ public class StandardContext extends Con
/**
* Save config ?
*/
+ @Deprecated
public boolean isSaveConfig() {
return saveConfig;
}
@@ -2575,6 +2580,7 @@ public class StandardContext extends Con
/**
* Set save config flag.
*/
+ @Deprecated
public void setSaveConfig(boolean saveConfig) {
this.saveConfig = saveConfig;
}
@@ -3486,6 +3492,7 @@ public class StandardContext extends Con
/**
* FIXME: Fooling introspection ...
*/
+ @Deprecated
public Context findMappingObject() {
return (Context) getMappingObject();
}
@@ -6327,6 +6334,7 @@ public class StandardContext extends Con
/**
* Return the naming resources associated with this web application.
*/
+ @Deprecated
public javax.naming.directory.DirContext getStaticResources() {
return getResources();
@@ -6338,6 +6346,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();
@@ -6464,6 +6473,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();
@@ -6505,10 +6515,12 @@ public class StandardContext extends Con
return startTime;
}
+ @Deprecated
public boolean isEventProvider() {
return false;
}
+ @Deprecated
public boolean isStatisticsProvider() {
return false;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1188822&r1=1188821&r2=1188822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Oct 25 17:42:43 2011
@@ -282,6 +282,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};
@@ -996,6 +997,7 @@ public class StandardWrapper extends Con
/**
* FIXME: Fooling introspection ...
*/
+ @Deprecated
public Wrapper findMappingObject() {
return (Wrapper) getMappingObject();
}
@@ -1537,6 +1539,7 @@ public class StandardWrapper extends Con
return swValve.getProcessingTime();
}
+ @Deprecated
public void setProcessingTime(long processingTime) {
swValve.setProcessingTime(processingTime);
}
@@ -1545,6 +1548,7 @@ public class StandardWrapper extends Con
return swValve.getMaxTime();
}
+ @Deprecated
public void setMaxTime(long maxTime) {
swValve.setMaxTime(maxTime);
}
@@ -1553,6 +1557,7 @@ public class StandardWrapper extends Con
return swValve.getMinTime();
}
+ @Deprecated
public void setMinTime(long minTime) {
swValve.setMinTime(minTime);
}
@@ -1561,6 +1566,7 @@ public class StandardWrapper extends Con
return swValve.getRequestCount();
}
+ @Deprecated
public void setRequestCount(int requestCount) {
swValve.setRequestCount(requestCount);
}
@@ -1569,6 +1575,7 @@ public class StandardWrapper extends Con
return swValve.getErrorCount();
}
+ @Deprecated
public void setErrorCount(int errorCount) {
swValve.setErrorCount(errorCount);
}
@@ -1585,6 +1592,7 @@ public class StandardWrapper extends Con
return loadTime;
}
+ @Deprecated
public void setLoadTime(long loadTime) {
this.loadTime = loadTime;
}
@@ -1901,14 +1909,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org