Author: markt
Date: Sat Nov 26 09:40:18 2016
New Revision: 1771451
URL: http://svn.apache.org/viewvc?rev=1771451&view=rev
Log:
Back-port some clean-up to make 8.0.x <-> 9.0.x diffs cleaner
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/ClasspathURLStreamHandler.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResource.java?rev=1771451&r1=1771450&r2=1771451&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResource.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResource.java
Sat Nov 26 09:40:18 2016
@@ -27,8 +27,7 @@ import org.apache.tomcat.util.res.String
public abstract class AbstractResource implements WebResource {
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm =
StringManager.getManager(AbstractResource.class);
private final WebResourceRoot root;
private final String webAppPath;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1771451&r1=1771450&r2=1771451&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Sat Nov 26 09:40:18 2016
@@ -37,8 +37,7 @@ public abstract class AbstractResourceSe
private Manifest manifest;
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm =
StringManager.getManager(AbstractResourceSet.class);
protected final void checkPath(String path) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1771451&r1=1771450&r2=1771451&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java Sat
Nov 26 09:40:18 2016
@@ -31,8 +31,7 @@ import org.apache.tomcat.util.res.String
public class Cache {
private static final Log log = LogFactory.getLog(Cache.class);
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm =
StringManager.getManager(Cache.class);
private static final long TARGET_FREE_PERCENT_GET = 5;
private static final long TARGET_FREE_PERCENT_BACKGROUND = 10;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/ClasspathURLStreamHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/ClasspathURLStreamHandler.java?rev=1771451&r1=1771450&r2=1771451&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/ClasspathURLStreamHandler.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/ClasspathURLStreamHandler.java
Sat Nov 26 09:40:18 2016
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.res.String
public class ClasspathURLStreamHandler extends URLStreamHandler {
private static final StringManager sm =
-
StringManager.getManager(ClasspathURLStreamHandler.class.getPackage().getName());
+ StringManager.getManager(ClasspathURLStreamHandler.class);
@Override
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1771451&r1=1771450&r2=1771451&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Sat Nov 26 09:40:18 2016
@@ -62,8 +62,7 @@ import org.apache.tomcat.util.res.String
public class StandardRoot extends LifecycleMBeanBase implements
WebResourceRoot {
private static final Log log = LogFactory.getLog(StandardRoot.class);
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm =
StringManager.getManager(StandardRoot.class);
private Context context;
private boolean allowLinking = false;
@@ -562,10 +561,10 @@ public class StandardRoot extends Lifecy
this.context = context;
}
- /*
+ /**
* Class loader resources are handled by treating JARs in WEB-INF/lib as
* resource JARs (without the internal META-INF/resources/ prefix) mounted
- * at WEB-INF/claasses (rather than the web app root). This enables reuse
+ * at WEB-INF/classes (rather than the web app root). This enables reuse
* of the resource handling plumbing.
*
* These resources are marked as class loader only so they are only used in
@@ -585,7 +584,8 @@ public class StandardRoot extends Lifecy
}
/**
- * For unit testing
+ * For unit testing.
+ * @param main The main resources
*/
protected final void setMainResources(WebResourceSet main) {
this.main = main;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
