tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1060927 - in /tomcat/trunk/java/org/apache: catalina/Context.java catalina/core/StandardContext.java catalina/startup/ContextConfig.java naming/resources/BaseDirContext.java
Date Wed, 19 Jan 2011 19:36:58 GMT
Author: markt
Date: Wed Jan 19 19:36:58 2011
New Revision: 1060927

URL: http://svn.apache.org/viewvc?rev=1060927&view=rev
Log:
Rename in preparation for https://issues.apache.org/bugzilla/show_bug.cgi?id=50535

Modified:
    tomcat/trunk/java/org/apache/catalina/Context.java
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1060927&r1=1060926&r2=1060927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Jan 19 19:36:58 2011
@@ -1214,11 +1214,11 @@ public interface Context extends Contain
 
     
     /**
-     * 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);
     
     
     /**

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1060927&r1=1060926&r2=1060927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jan 19 19:36:58 2011
@@ -1046,14 +1046,14 @@ public class StandardContext extends Con
 
 
     /**
-     * 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()));

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1060927&r1=1060926&r2=1060927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Jan 19 19:36:58 2011
@@ -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) {

Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1060927&r1=1060926&r2=1060927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Wed Jan 19 19:36:58
2011
@@ -153,7 +153,7 @@ public abstract class BaseDirContext imp
      * 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();   



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message