Move DigesterFactory to new o.a.t.u.descriptor package since JspC will eventually need to use it.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1501159 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/ant/ValidatorTask.java b/java/org/apache/catalina/ant/ValidatorTask.java
index 4036cdb..935c1aa 100644
--- a/java/org/apache/catalina/ant/ValidatorTask.java
+++ b/java/org/apache/catalina/ant/ValidatorTask.java
@@ -25,7 +25,7 @@
import java.io.InputStream;
import org.apache.catalina.startup.Constants;
-import org.apache.catalina.startup.DigesterFactory;
+import org.apache.tomcat.util.descriptor.DigesterFactory;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tools.ant.BuildException;
import org.xml.sax.InputSource;
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index a50cbc1..7539c1d 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -87,6 +87,7 @@
import org.apache.tomcat.util.bcel.classfile.ElementValue;
import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.descriptor.DigesterFactory;
import org.apache.tomcat.util.descriptor.web.ApplicationListener;
import org.apache.tomcat.util.descriptor.web.ContextEjb;
import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index cd0c436..ee4cda1 100644
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -39,6 +39,7 @@
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.JarScannerCallback;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.descriptor.DigesterFactory;
import org.apache.tomcat.util.descriptor.web.ApplicationListener;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/catalina/startup/DigesterFactory.java b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
similarity index 96%
rename from java/org/apache/catalina/startup/DigesterFactory.java
rename to java/org/apache/tomcat/util/descriptor/DigesterFactory.java
index 9296870..40cfb45 100644
--- a/java/org/apache/catalina/startup/DigesterFactory.java
+++ b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
@@ -14,15 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.startup;
+package org.apache.tomcat.util.descriptor;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.Servlet;
-import org.apache.tomcat.util.descriptor.LocalResolver;
-import org.apache.tomcat.util.descriptor.XmlIdentifiers;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
