Author: markt
Date: Fri Nov 22 16:07:45 2013
New Revision: 1544595
URL: http://svn.apache.org/r1544595
Log:
Better names
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1544593
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Fri Nov 22
16:07:45 2013
@@ -314,8 +314,8 @@ public final class Globals {
* <p>
* This must be kept in sync with org.apache.japser.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/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Fri Nov 22 16:07:45 2013
@@ -237,7 +237,7 @@ public class ApplicationContext
// 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) &&
@@ -260,7 +260,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/tc7.0.x/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java Fri Nov 22
16:07:45 2013
@@ -239,7 +239,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/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Fri Nov 22 16:07:45
2013
@@ -1445,7 +1445,7 @@ public class JspC extends Task implement
System.out.println("**" + me);
}
if (isValidateTld()) {
- context.setAttribute(Constants.XML_VALIDATION_ATTR,
+ context.setAttribute(Constants.XML_VALIDATION_TLD_ATTR,
Boolean.TRUE);
}
if (isValidateJspDoc()) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Fri Nov 22 16:07:45 2013
@@ -126,7 +126,7 @@ class ImplicitTagLibraryInfo extends Tag
boolean validate = Boolean.parseBoolean(
ctxt.getServletContext().getInitParameter(
- Constants.XML_VALIDATION_ATTR));
+
Constants.XML_VALIDATION_TLD_ATTR));
ParserUtils pu = new ParserUtils(validate);
TreeNode tld = pu.parseXMLDocument(uri, in);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java Fri Nov
22 16:07:45 2013
@@ -79,7 +79,7 @@ public class JspConfig {
webXml = new WebXml(ctxt);
boolean validate = Boolean.parseBoolean(
- ctxt.getInitParameter(Constants.XML_VALIDATION_ATTR));
+ ctxt.getInitParameter(Constants.XML_VALIDATION_TLD_ATTR));
TreeNode webApp = null;
if (webXml.getInputSource() != null) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Fri Nov 22 16:07:45 2013
@@ -215,7 +215,7 @@ class TagLibraryInfoImpl extends TagLibr
boolean validate = Boolean.parseBoolean(
ctxt.getServletContext().getInitParameter(
- Constants.XML_VALIDATION_ATTR));
+ Constants.XML_VALIDATION_TLD_ATTR));
// Create an iterator over the child elements of our <taglib> element
ParserUtils pu = new ParserUtils(validate);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1544595&r1=1544594&r2=1544595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Fri Nov 22 16:07:45 2013
@@ -288,7 +288,7 @@ public class TldLocationsCache {
boolean validate = Boolean.parseBoolean(
ctxt.getInitParameter(
- Constants.XML_VALIDATION_ATTR));
+ Constants.XML_VALIDATION_TLD_ATTR));
// Parse the web application deployment descriptor
TreeNode webtld = null;
@@ -497,7 +497,7 @@ public class TldLocationsCache {
boolean validate = Boolean.parseBoolean(
ctxt.getInitParameter(
- Constants.XML_VALIDATION_ATTR));
+ Constants.XML_VALIDATION_TLD_ATTR));
TreeNode tld = new ParserUtils(validate).parseXMLDocument(
resourcePath, stream);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
