Author: markt
Date: Wed Dec 4 21:21:28 2013
New Revision: 1547919
URL: http://svn.apache.org/r1547919
Log:
Switch o.a.catalina classes to use the new DigesterFactory and LocalResolver
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SchemaResolver.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1547919&r1=1547918&r2=1547919&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java Wed
Dec 4 21:21:28 2013
@@ -14,18 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.ant;
-
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
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;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1547919&r1=1547918&r2=1547919&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Wed Dec 4 21:21:28 2013
@@ -95,6 +95,7 @@ import org.apache.tomcat.util.bcel.class
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.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
import org.apache.tomcat.util.res.StringManager;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java?rev=1547919&r1=1547918&r2=1547919&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
Wed Dec 4 21:21:28 2013
@@ -30,7 +30,10 @@ import org.apache.tomcat.util.digester.R
* Wrapper class around the Digester that hide Digester's initialization
details
*
* @author Jean-Francois Arcand
+ *
+ * @deprecated Use {@link org.apache.tomcat.util.descriptor.DigesterFactory}
*/
+@Deprecated
public class DigesterFactory {
/**
* The log.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1547919&r1=1547918&r2=1547919&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Wed
Dec 4 21:21:28 2013
@@ -40,6 +40,7 @@ import org.apache.catalina.deploy.Applic
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.digester.Digester;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.scan.Jar;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SchemaResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SchemaResolver.java?rev=1547919&r1=1547918&r2=1547919&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SchemaResolver.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SchemaResolver.java Wed
Dec 4 21:21:28 2013
@@ -30,7 +30,9 @@ import org.xml.sax.SAXException;
* to a local file stored in the servlet-api.jar and jsp-api.jar.
*
* @author Jean-Francois Arcand
+ * @deprecated Use {@link org.apache.tomcat.util.descriptor.LocalResolver}
*/
+@Deprecated
public class SchemaResolver implements EntityResolver {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
