tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1138789 - /tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
Date Thu, 23 Jun 2011 09:31:10 GMT
Author: markt
Date: Thu Jun 23 09:31:10 2011
New Revision: 1138789

URL: http://svn.apache.org/viewvc?rev=1138789&view=rev
Log:
Don't cache xml parsing config locally, get it from the Context

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java

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=1138789&r1=1138788&r2=1138789&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Thu Jun 23 09:31:10 2011
@@ -134,17 +134,6 @@ public final class TldConfig  implements
     private Digester tldDigester = null;
 
 
-    /**
-     * Attribute value used to turn on/off TLD validation
-     */
-    private boolean tldValidation = false;
-
-
-    /**
-     * Attribute value used to turn on/off TLD  namespace awareness.
-     */
-    private boolean tldNamespaceAware = false;
-
     private boolean rescan=true;
 
     /**
@@ -203,44 +192,6 @@ public final class TldConfig  implements
         }
     }
 
-    /**
-     * Set the validation feature of the XML parser used when
-     * parsing xml instances.
-     * @param tldValidation true to enable xml instance validation
-     */
-    public void setTldValidation(boolean tldValidation){
-        this.tldValidation = tldValidation;
-    }
-
-    /**
-     * Get the server.xml <host> attribute's xmlValidation.
-     * @return true if validation is enabled.
-     *
-     */
-    public boolean getTldValidation(){
-        return this.tldValidation;
-    }
-
-    /**
-     * Get the server.xml <host> attribute's xmlNamespaceAware.
-     * @return true if namespace awareness is enabled.
-     *
-     */
-    public boolean getTldNamespaceAware(){
-        return this.tldNamespaceAware;
-    }
-
-
-    /**
-     * Set the namespace aware feature of the XML parser used when
-     * parsing xml instances.
-     * @param tldNamespaceAware true to enable namespace awareness
-     */
-    public void setTldNamespaceAware(boolean tldNamespaceAware){
-        this.tldNamespaceAware = tldNamespaceAware;
-    }    
-
-
     public boolean isRescan() {
         return rescan;
     }
@@ -610,9 +561,8 @@ public final class TldConfig  implements
     
     private void init() {
         if (tldDigester == null){
-            setTldValidation(context.getTldValidation());
-            setTldNamespaceAware(context.getTldNamespaceAware());
-            tldDigester = createTldDigester(tldNamespaceAware, tldValidation);
+            tldDigester = createTldDigester(context.getTldNamespaceAware(),
+                    context.getTldValidation());
         }
     }
 



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


Mime
View raw message