Revert r1060927. It changed the API (which would have been fine if it the eventual...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1061047 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java
index 076b768..33c03a2 100644 (file)
--- 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 location (usually a JAR) that contains static resources
-     * in a META-INF/resources directory that should be included in the static
+     * Add a URL for 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 addAltResourceUrl(URL url);
+    public void addResourceJarUrl(URL url);
     
     
     /**

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index c9e03ac..71a2a5f 100644 (file)
--- 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 location (usually a JAR) that contains static resources
-     * in a META-INF/resources directory that should be included in the static
+     * Add a URL for 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 addAltResourceUrl(URL url) {
+    public void addResourceJarUrl(URL url) {
         if (webappResources instanceof BaseDirContext) {
-            ((BaseDirContext) webappResources).addAltResources(url);
+            ((BaseDirContext) webappResources).addResourcesJar(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 68e0fae..2c5e5d1 100644 (file)
--- 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.addAltResourceUrl(url);
+                        context.addResourceJarUrl(url);
                     }
                 }
             } catch (IOException ioe) {

diff --git a/java/org/apache/naming/resources/BaseDirContext.java b/java/org/apache/naming/resources/BaseDirContext.java
index 55e5653..1158107 100644 (file)
--- 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 addAltResources(URL url) {
+    public void addResourcesJar(URL url) {
         try {
             JarURLConnection conn = (JarURLConnection) url.openConnection();
             JarFile jarFile = conn.getJarFile();