Author: markt
Date: Fri Nov 22 16:02:16 2013
New Revision: 1544593
URL: http://svn.apache.org/r1544593
Log:
Better names
Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1544593&r1=1544592&r2=1544593&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Fri Nov 22 16:02:16 2013
@@ -277,8 +277,8 @@ public final class Globals {
* <p>
* This must be kept in sync with org.apache.jasper.Constants
*/
- public static final String JASPER_XML_VALIDATION_ATTR =
- "org.apache.jasper.XML_VALIDATE";
+ public static final String JASPER_XML_VALIDATION_TLD_ATTR =
+ "org.apache.jasper.XML_VALIDATE_TLD";
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1544593&r1=1544592&r2=1544593&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Nov
22 16:02:16 2013
@@ -222,7 +222,7 @@ public class ApplicationContext
public Object getAttribute(String name) {
// Special handling for XML validation as the context setting must
// always override anything that might have been set by an application.
- if (Globals.JASPER_XML_VALIDATION_ATTR.equals(name) &&
+ if (Globals.JASPER_XML_VALIDATION_TLD_ATTR.equals(name) &&
context.getTldValidation()) {
return Boolean.TRUE;
} else if (Globals.JASPER_XML_VALIDATION_DOC_ATTR.equals(name) &&
@@ -244,7 +244,7 @@ public class ApplicationContext
// Special handling for XML validation as this attribute will always be
// available if validation has been enabled on the context
if (context.getTldValidation()) {
- names.add(Globals.JASPER_XML_VALIDATION_ATTR);
+ names.add(Globals.JASPER_XML_VALIDATION_TLD_ATTR);
}
if (context.getXmlValidationJspDoc()) {
names.add(Globals.JASPER_XML_VALIDATION_DOC_ATTR);
Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1544593&r1=1544592&r2=1544593&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Fri Nov 22 16:02:16 2013
@@ -158,7 +158,7 @@ public class Constants {
* <p>
* This must be kept in sync with org.apache.catalina.Globals
*/
- public static final String XML_VALIDATION_ATTR =
"org.apache.jasper.XML_VALIDATE";
+ public static final String XML_VALIDATION_TLD_ATTR =
"org.apache.jasper.XML_VALIDATE_TLD";
/**
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=1544593&r1=1544592&r2=1544593&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Fri Nov 22 16:02:16 2013
@@ -121,7 +121,7 @@ class ImplicitTagLibraryInfo extends Tag
TldResourcePath resourcePath = new
TldResourcePath(url, path);
boolean validate = Boolean.parseBoolean(
ctxt.getServletContext().getInitParameter(
- Constants.XML_VALIDATION_ATTR));
+ Constants.XML_VALIDATION_TLD_ATTR));
TldParser parser = new TldParser(true, validate, new
ImplicitTldRuleSet());
taglibXml = parser.parse(resourcePath);
} catch (IOException | SAXException e) {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java?rev=1544593&r1=1544592&r2=1544593&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java Fri Nov 22
16:02:16 2013
@@ -73,7 +73,7 @@ public class TldCache {
this.tldResourcePathTaglibXmlMap.put(tldResourcePath, cacheEntry);
}
boolean validate = Boolean.parseBoolean(
-
servletContext.getInitParameter(Constants.XML_VALIDATION_ATTR));
+
servletContext.getInitParameter(Constants.XML_VALIDATION_TLD_ATTR));
tldParser = new TldParser(true, validate);
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1544593&r1=1544592&r2=1544593&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Fri Nov
22 16:02:16 2013
@@ -79,7 +79,7 @@ public class JasperInitializer implement
}
boolean validate = Boolean.parseBoolean(
- context.getInitParameter(Constants.XML_VALIDATION_ATTR));
+ context.getInitParameter(Constants.XML_VALIDATION_TLD_ATTR));
// scan the application for TLDs
TldScanner scanner = new TldScanner(context, true, validate);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
