From ca5519c49b56ce2c981b4d423347542664541696 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Dec 2009 14:37:57 +0000
Subject: [PATCH] Make naming consistent with elsewhere in Tomcat

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@893768 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardContext.java                    | 4 ++--
 java/org/apache/jasper/compiler/JarScannerFactory.java                | 4 ++--
 .../util/scan/{DefaultJarScanner.java => StandardJarScanner.java}     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename java/org/apache/tomcat/util/scan/{DefaultJarScanner.java => StandardJarScanner.java} (98%)

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 01309f5b7..a3136298c 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -104,7 +104,7 @@ import org.apache.naming.resources.WARDirContext;
 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 class StandardContext
     
     public JarScanner getJarScanner() {
         if (jarScanner == null) {
-            jarScanner = new DefaultJarScanner();
+            jarScanner = new StandardJarScanner();
         }
         return jarScanner;
     }
diff --git a/java/org/apache/jasper/compiler/JarScannerFactory.java b/java/org/apache/jasper/compiler/JarScannerFactory.java
index d8a32344c..b48e95915 100644
--- a/java/org/apache/jasper/compiler/JarScannerFactory.java
+++ b/java/org/apache/jasper/compiler/JarScannerFactory.java
@@ -23,7 +23,7 @@ package org.apache.jasper.compiler;
 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 @@ public class JarScannerFactory {
         	(JarScanner) ctxt.getAttribute(JarScanner.class.getName());
         if (jarScanner == null) {
             ctxt.log(Localizer.getMessage("jsp.warning.noJarScanner"));
-            jarScanner = new DefaultJarScanner();
+            jarScanner = new StandardJarScanner();
         }
         return jarScanner;
     }
diff --git a/java/org/apache/tomcat/util/scan/DefaultJarScanner.java b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
similarity index 98%
rename from java/org/apache/tomcat/util/scan/DefaultJarScanner.java
rename to java/org/apache/tomcat/util/scan/StandardJarScanner.java
index ad81dc116..810b159b8 100644
--- a/java/org/apache/tomcat/util/scan/DefaultJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -51,9 +51,9 @@ import org.apache.tomcat.util.res.StringManager;
  * </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>();
     
-- 
2.11.0