You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/07/09 11:25:47 UTC
svn commit: r1501159 - in /tomcat/trunk/java/org/apache: catalina/ant/ValidatorTask.java catalina/startup/ContextConfig.java catalina/startup/DigesterFactory.java catalina/startup/TldConfig.java tomcat/util/descriptor/DigesterFactory.java

Author: markt
Date: Tue Jul  9 09:25:47 2013
New Revision: 1501159

URL: http://svn.apache.org/r1501159
Log:
Move DigesterFactory to new o.a.t.u.descriptor package since JspC will eventually need to use it.

Added:
    tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
      - copied, changed from r1501154, tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
Removed:
    tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
Modified:
    tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1501159&r1=1501158&r2=1501159&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Tue Jul  9 09:25:47 2013
@@ -25,7 +25,7 @@ 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/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1501159&r1=1501158&r2=1501159&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jul  9 09:25:47 2013
@@ -87,6 +87,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.descriptor.web.ApplicationListener;
 import org.apache.tomcat.util.descriptor.web.ContextEjb;
 import org.apache.tomcat.util.descriptor.web.ContextEnvironment;

Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1501159&r1=1501158&r2=1501159&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Tue Jul  9 09:25:47 2013
@@ -39,6 +39,7 @@ import org.apache.tomcat.JarScanType;
 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;

Copied: tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (from r1501154, tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?p2=tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java&p1=tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java&r1=1501154&r2=1501159&rev=1501159&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Tue Jul  9 09:25:47 2013
@@ -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;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org