Author: markt
Date: Thu Jul 12 21:07:48 2012
New Revision: 1360943
URL: http://svn.apache.org/viewvc?rev=1360943&view=rev
Log:
Deprecation prior to removal in 8.0.x
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1360892,1360942
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java?rev=1360943&r1=1360942&r2=1360943&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
Thu Jul 12 21:07:48 2012
@@ -28,6 +28,10 @@ import org.apache.catalina.deploy.JspPro
public class ApplicationJspPropertyGroupDescriptor
implements JspPropertyGroupDescriptor{
+ /**
+ * @deprecated Will be made private in 8.0.x
+ */
+ @Deprecated
JspPropertyGroup jspPropertyGroup;
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=1360943&r1=1360942&r2=1360943&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 Thu
Jul 12 21:07:48 2012
@@ -1655,7 +1655,7 @@ public class StandardWrapper extends Con
*/
@Override
public void incrementErrorCount(){
- swValve.setErrorCount(swValve.getErrorCount() + 1);
+ swValve.incrementErrorCount();
}
public long getLoadTime() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1360943&r1=1360942&r2=1360943&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Thu Jul 12 21:07:48 2012
@@ -522,6 +522,10 @@ final class StandardWrapperValve
return processingTime;
}
+ /**
+ * Deprecated unused
+ */
+ @Deprecated
public void setProcessingTime(long processingTime) {
this.processingTime = processingTime;
}
@@ -530,6 +534,10 @@ final class StandardWrapperValve
return maxTime;
}
+ /**
+ * Deprecated unused
+ */
+ @Deprecated
public void setMaxTime(long maxTime) {
this.maxTime = maxTime;
}
@@ -538,6 +546,10 @@ final class StandardWrapperValve
return minTime;
}
+ /**
+ * Deprecated unused
+ */
+ @Deprecated
public void setMinTime(long minTime) {
this.minTime = minTime;
}
@@ -546,6 +558,10 @@ final class StandardWrapperValve
return requestCount;
}
+ /**
+ * Deprecated unused
+ */
+ @Deprecated
public void setRequestCount(int requestCount) {
this.requestCount = requestCount;
}
@@ -554,6 +570,14 @@ final class StandardWrapperValve
return errorCount;
}
+ public void incrementErrorCount() {
+ errorCount++;
+ }
+
+ /**
+ * Deprecated unused
+ */
+ @Deprecated
public void setErrorCount(int errorCount) {
this.errorCount = errorCount;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
