From e26fc5054b0c1fcff4c64157a71436a27563493f Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 19 Jan 2011 19:36:58 +0000 Subject: [PATCH] Rename in preparation for https://issues.apache.org/bugzilla/show_bug.cgi?id=50535 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1060927 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/Context.java | 6 +++--- java/org/apache/catalina/core/StandardContext.java | 8 ++++---- java/org/apache/catalina/startup/ContextConfig.java | 2 +- java/org/apache/naming/resources/BaseDirContext.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index 33c03a237..076b76810 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -1214,11 +1214,11 @@ public interface Context extends Container { /** - * Add a URL for a JAR that contains static resources in a - * META-INF/resources directory that should be included in the static + * Add a URL for a location (usually a JAR) that contains static resources + * in a META-INF/resources directory that should be included in the static * resources for this context. */ - public void addResourceJarUrl(URL url); + public void addAltResourceUrl(URL url); /** diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 71a2a5fdc..c9e03ac00 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -1046,14 +1046,14 @@ public class StandardContext extends ContainerBase /** - * Add a URL for a JAR that contains static resources in a - * META-INF/resources directory that should be included in the static + * Add a URL for a location (usually a JAR) that contains static resources + * in a META-INF/resources directory that should be included in the static * resources for this context. */ @Override - public void addResourceJarUrl(URL url) { + public void addAltResourceUrl(URL url) { if (webappResources instanceof BaseDirContext) { - ((BaseDirContext) webappResources).addResourcesJar(url); + ((BaseDirContext) webappResources).addAltResources(url); } else { log.error(sm.getString("standardContext.noResourceJar", url, getName())); diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index 2c5e5d138..68e0fae31 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -1502,7 +1502,7 @@ public class ContextConfig jarFile = conn.getJarFile(); ZipEntry entry = jarFile.getEntry("META-INF/resources/"); if (entry != null) { - context.addResourceJarUrl(url); + context.addAltResourceUrl(url); } } } catch (IOException ioe) { diff --git a/java/org/apache/naming/resources/BaseDirContext.java b/java/org/apache/naming/resources/BaseDirContext.java index 1158107c4..55e5653ef 100644 --- a/java/org/apache/naming/resources/BaseDirContext.java +++ b/java/org/apache/naming/resources/BaseDirContext.java @@ -153,7 +153,7 @@ public abstract class BaseDirContext implements DirContext { * Add a resources JAR. The contents of /META-INF/resources/ will be used if * a requested resource can not be found in the main context. */ - public void addResourcesJar(URL url) { + public void addAltResources(URL url) { try { JarURLConnection conn = (JarURLConnection) url.openConnection(); JarFile jarFile = conn.getJarFile(); -- 2.11.0