Author: markt
Date: Thu Dec 24 14:37:57 2009
New Revision: 893768
URL: http://svn.apache.org/viewvc?rev=893768&view=rev
Log:
Make naming consistent with elsewhere in Tomcat
Added:
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
- copied, changed from r893744,
tomcat/trunk/java/org/apache/tomcat/util/scan/DefaultJarScanner.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/scan/DefaultJarScanner.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
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=893768&r1=893767&r2=893768&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Dec 24
14:37:57 2009
@@ -104,7 +104,7 @@
import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.util.modeler.Registry;
-import org.apache.tomcat.util.scan.DefaultJarScanner;
+import org.apache.tomcat.util.scan.StandardJarScanner;
/**
* Standard implementation of the <b>Context</b> interface. Each
@@ -781,7 +781,7 @@
public JarScanner getJarScanner() {
if (jarScanner == null) {
- jarScanner = new DefaultJarScanner();
+ jarScanner = new StandardJarScanner();
}
return jarScanner;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java?rev=893768&r1=893767&r2=893768&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java Thu Dec
24 14:37:57 2009
@@ -23,7 +23,7 @@
import javax.servlet.ServletContext;
import org.apache.tomcat.JarScanner;
-import org.apache.tomcat.util.scan.DefaultJarScanner;
+import org.apache.tomcat.util.scan.StandardJarScanner;
/**
* Provide a mechanism for Jasper to obtain a reference to the JarScanner
@@ -44,7 +44,7 @@
(JarScanner) ctxt.getAttribute(JarScanner.class.getName());
if (jarScanner == null) {
ctxt.log(Localizer.getMessage("jsp.warning.noJarScanner"));
- jarScanner = new DefaultJarScanner();
+ jarScanner = new StandardJarScanner();
}
return jarScanner;
}
Copied: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(from r893744,
tomcat/trunk/java/org/apache/tomcat/util/scan/DefaultJarScanner.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?p2=tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java&p1=tomcat/trunk/java/org/apache/tomcat/util/scan/DefaultJarScanner.java&r1=893744&r2=893768&rev=893768&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/DefaultJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Thu
Dec 24 14:37:57 2009
@@ -51,9 +51,9 @@
* </ul>
* All of the extensions may be controlled via configuration.
*/
-public class DefaultJarScanner implements JarScanner {
+public class StandardJarScanner implements JarScanner {
- private static final Log log = LogFactory.getLog(DefaultJarScanner.class);
+ private static final Log log = LogFactory.getLog(StandardJarScanner.class);
private static final Set<String> defaultJarsToSkip = new HashSet<String>();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
