Author: markt
Date: Wed Jan 19 22:51:59 2011
New Revision: 1061047
URL: http://svn.apache.org/viewvc?rev=1061047&view=rev
Log:
Revert r1060927. It changed the API (which would have been fine if it the
eventual solution needed it but it doesn't)
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=1061047&r1=1061046&r2=1061047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Jan 19 22:51:59 2011
@@ -1214,11 +1214,11 @@ public interface Context extends Contain
/**
- * 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);
/**
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=1061047&r1=1061046&r2=1061047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jan 19
22:51:59 2011
@@ -1046,14 +1046,14 @@ public class StandardContext extends Con
/**
- * 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()));
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=1061047&r1=1061046&r2=1061047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Jan 19
22:51:59 2011
@@ -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) {
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=1061047&r1=1061046&r2=1061047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Wed Jan
19 22:51:59 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 addAltResources(URL url) {
+ public void addResourcesJar(URL url) {
try {
JarURLConnection conn = (JarURLConnection) url.openConnection();
JarFile jarFile = conn.getJarFile();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
