Author: markt
Date: Sat Dec 28 14:22:57 2013
New Revision: 1553833
URL: http://svn.apache.org/r1553833
Log:
Rename trace[d] -> track[ed]
Added:
tomcat/trunk/java/org/apache/catalina/TrackedWebResource.java
- copied, changed from r1553166,
tomcat/trunk/java/org/apache/catalina/WebResourceTraceWrapper.java
tomcat/trunk/java/org/apache/catalina/webresources/TrackedInputStream.java
- copied, changed from r1553166,
tomcat/trunk/java/org/apache/catalina/webresources/TraceWrapperInputStream.java
Removed:
tomcat/trunk/java/org/apache/catalina/WebResourceTraceWrapper.java
tomcat/trunk/java/org/apache/catalina/webresources/TraceWrapperInputStream.java
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/java/org/apache/catalina/webresources/mbeans-descriptors.xml
Copied: tomcat/trunk/java/org/apache/catalina/TrackedWebResource.java (from
r1553166, tomcat/trunk/java/org/apache/catalina/WebResourceTraceWrapper.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/TrackedWebResource.java?p2=tomcat/trunk/java/org/apache/catalina/TrackedWebResource.java&p1=tomcat/trunk/java/org/apache/catalina/WebResourceTraceWrapper.java&r1=1553166&r2=1553833&rev=1553833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/WebResourceTraceWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/TrackedWebResource.java Sat Dec 28
14:22:57 2013
@@ -18,7 +18,7 @@ package org.apache.catalina;
import java.io.Closeable;
-public interface WebResourceTraceWrapper extends Closeable {
+public interface TrackedWebResource extends Closeable {
Exception getCreatedBy();
String getName();
}
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java?rev=1553833&r1=1553832&r2=1553833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java Sat Dec 28
14:22:57 2013
@@ -363,7 +363,7 @@ public interface WebResourceRoot extends
int getCacheObjectMaxSize();
/**
- * Controls whether the trace locked files feature is enabled. If enabled,
+ * Controls whether the track locked files feature is enabled. If enabled,
* all calls to methods that return objects that lock a file and need to be
* closed to release that lock (e.g. {@link WebResource#getInputStream()}
* will perform a number of additional tasks.
@@ -378,16 +378,16 @@ public interface WebResourceRoot extends
* logged and then closed.</li>
* </ul>
*
- * @param traceLockedFiles @true to enable it, @false to disable it
+ * @param trackLockedFiles @true to enable it, @false to disable it
*/
- void setTraceLockedFiles(boolean traceLockedFiles);
+ void setTrackLockedFiles(boolean trackLockedFiles);
/**
- * Has the trace locked files feature been enabled?
+ * Has the track locked files feature been enabled?
*
* @return @true if it has been enabled, otherwise @false
*/
- boolean getTraceLockedFiles();
+ boolean getTrackLockedFiles();
/**
* This method will be invoked by the context on a periodic basis and
allows
@@ -396,9 +396,9 @@ public interface WebResourceRoot extends
*/
void backgroundProcess();
- void registerTracedResource(WebResourceTraceWrapper traceWrapper);
+ void registerTrackedResource(TrackedWebResource traceWrapper);
- void deregisterTracedResource(WebResourceTraceWrapper
traceWrapperInputStream);
+ void deregisterTrackedResource(TrackedWebResource traceWrapperInputStream);
/**
* Obtain the set of {@link WebResourceSet#getBaseUrl()} for all
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java?rev=1553833&r1=1553832&r2=1553833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
Sat Dec 28 14:22:57 2013
@@ -93,11 +93,11 @@ public abstract class AbstractResource i
public final InputStream getInputStream() {
InputStream is = doGetInputStream();
- if (is == null || !root.getTraceLockedFiles()) {
+ if (is == null || !root.getTrackLockedFiles()) {
return is;
}
- return new TraceWrapperInputStream(root, getName(), is);
+ return new TrackedInputStream(root, getName(), is);
}
protected abstract InputStream doGetInputStream();
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1553833&r1=1553832&r2=1553833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Sat
Dec 28 14:22:57 2013
@@ -37,10 +37,10 @@ import org.apache.catalina.Context;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.TrackedWebResource;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
-import org.apache.catalina.WebResourceTraceWrapper;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -59,8 +59,7 @@ import org.apache.tomcat.util.res.String
* String)} represents the absolute path to a file.
* </p>
*/
-public class StandardRoot extends LifecycleMBeanBase
- implements WebResourceRoot {
+public class StandardRoot extends LifecycleMBeanBase implements
WebResourceRoot {
private static final Log log = LogFactory.getLog(Cache.class);
protected static final StringManager sm =
@@ -78,9 +77,9 @@ public class StandardRoot extends Lifecy
private boolean cachingAllowed = true;
private ObjectName cacheJmxName = null;
- private boolean traceLockedFiles = false;
- private final Set<WebResourceTraceWrapper> tracedResources =
- Collections.newSetFromMap(new
ConcurrentHashMap<WebResourceTraceWrapper,Boolean>());
+ private boolean trackLockedFiles = false;
+ private final Set<TrackedWebResource> trackedResources =
+ Collections.newSetFromMap(new
ConcurrentHashMap<TrackedWebResource,Boolean>());
// Constructs to make iteration over all WebResourceSets simpler
private final ArrayList<WebResourceSet> mainResources = new ArrayList<>();
@@ -479,21 +478,21 @@ public class StandardRoot extends Lifecy
}
@Override
- public void setTraceLockedFiles(boolean traceLockedFiles) {
- this.traceLockedFiles = traceLockedFiles;
- if (!traceLockedFiles) {
- tracedResources.clear();
+ public void setTrackLockedFiles(boolean trackLockedFiles) {
+ this.trackLockedFiles = trackLockedFiles;
+ if (!trackLockedFiles) {
+ trackedResources.clear();
}
}
@Override
- public boolean getTraceLockedFiles() {
- return traceLockedFiles;
+ public boolean getTrackLockedFiles() {
+ return trackLockedFiles;
}
- public List<String> getTraceResources() {
- List<String> result = new ArrayList<>(tracedResources.size());
- for (WebResourceTraceWrapper traceWrapper : tracedResources) {
+ public List<String> getTrackedResources() {
+ List<String> result = new ArrayList<>(trackedResources.size());
+ for (TrackedWebResource traceWrapper : trackedResources) {
result.add(traceWrapper.toString());
}
return result;
@@ -547,14 +546,14 @@ public class StandardRoot extends Lifecy
@Override
- public void registerTracedResource(WebResourceTraceWrapper traceResource) {
- tracedResources.add(traceResource);
+ public void registerTrackedResource(TrackedWebResource trackedResource) {
+ trackedResources.add(trackedResource);
}
@Override
- public void deregisterTracedResource(WebResourceTraceWrapper
traceResource) {
- tracedResources.remove(traceResource);
+ public void deregisterTrackedResource(TrackedWebResource trackedResource) {
+ trackedResources.remove(trackedResource);
}
@@ -675,13 +674,13 @@ public class StandardRoot extends Lifecy
}
classResources.clear();
- for (WebResourceTraceWrapper tracedResource : tracedResources) {
+ for (TrackedWebResource trackedResource : trackedResources) {
log.error(sm.getString("standardRoot.lockedFile",
context.getName(),
- tracedResource.getName()),
- tracedResource.getCreatedBy());
+ trackedResource.getName()),
+ trackedResource.getCreatedBy());
try {
- tracedResource.close();
+ trackedResource.close();
} catch (IOException e) {
// Ignore
}
Copied:
tomcat/trunk/java/org/apache/catalina/webresources/TrackedInputStream.java
(from r1553166,
tomcat/trunk/java/org/apache/catalina/webresources/TraceWrapperInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/TrackedInputStream.java?p2=tomcat/trunk/java/org/apache/catalina/webresources/TrackedInputStream.java&p1=tomcat/trunk/java/org/apache/catalina/webresources/TraceWrapperInputStream.java&r1=1553166&r2=1553833&rev=1553833&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/TraceWrapperInputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/TrackedInputStream.java
Sat Dec 28 14:22:57 2013
@@ -21,23 +21,23 @@ import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
+import org.apache.catalina.TrackedWebResource;
import org.apache.catalina.WebResourceRoot;
-import org.apache.catalina.WebResourceTraceWrapper;
-class TraceWrapperInputStream extends InputStream implements
WebResourceTraceWrapper {
+class TrackedInputStream extends InputStream implements TrackedWebResource {
private final WebResourceRoot root;
private final String name;
private final InputStream is;
private final Exception creation;
- TraceWrapperInputStream(WebResourceRoot root, String name, InputStream is)
{
+ TrackedInputStream(WebResourceRoot root, String name, InputStream is) {
this.root = root;
this.name = name;
this.is = is;
this.creation = new Exception();
- root.registerTracedResource(this);
+ root.registerTrackedResource(this);
}
@Override
@@ -67,7 +67,7 @@ class TraceWrapperInputStream extends In
@Override
public void close() throws IOException {
- root.deregisterTracedResource(this);
+ root.deregisterTrackedResource(this);
is.close();
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/mbeans-descriptors.xml?rev=1553833&r1=1553832&r2=1553833&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/mbeans-descriptors.xml
Sat Dec 28 14:22:57 2013
@@ -39,12 +39,12 @@
type="java.lang.String"
writeable="false"/>
- <attribute name="traceLockedFiles"
+ <attribute name="trackLockedFiles"
description="Does this resources implementation track requests that
lock files?"
type="boolean"
writeable="true"/>
- <attribute name="traceResources"
+ <attribute name="trackedResources"
description="List of resources currently being tracked for possible
resource leaks"
type="java.util.List"
writeable="false"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
