Author: jboynes
Date: Wed Aug 14 01:54:37 2013
New Revision: 1513712
URL: http://svn.apache.org/r1513712
Log:
Remove TLD-related properties from Context since processing has been moved to
Jasper.
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/test/org/apache/catalina/core/TesterContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1513712&r1=1513711&r2=1513712&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Aug 14 01:54:37 2013
@@ -610,45 +610,6 @@ public interface Context extends Contain
* @param xmlNamespaceAware true to enable namespace awareness
*/
public void setXmlNamespaceAware(boolean xmlNamespaceAware);
- /**
- * Get the server.xml <context> attribute's xmlValidation.
- * @return true if validation is enabled.
- */
-
-
- /**
- * Set the validation feature of the XML parser used when
- * parsing tlds files.
- * @param tldValidation true to enable xml instance validation
- */
- @Deprecated
- public void setTldValidation(boolean tldValidation);
-
-
- /**
- * Get the server.xml <context> attribute's webXmlValidation.
- * @return true if validation is enabled.
- *
- */
- @Deprecated
- public boolean getTldValidation();
-
-
- /**
- * Get the server.xml <host> attribute's xmlNamespaceAware.
- * @return true if namespace awareness is enabled.
- */
- @Deprecated
- public boolean getTldNamespaceAware();
-
-
- /**
- * Set the namespace aware feature of the XML parser used when
- * parsing xml instances.
- * @param tldNamespaceAware true to enable namespace awareness
- */
- @Deprecated
- public void setTldNamespaceAware(boolean tldNamespaceAware);
/**
* Get the Jar Scanner to be used to scan for JAR resources for this
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1513712&r1=1513711&r2=1513712&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Aug 14
01:54:37 2013
@@ -6486,49 +6486,6 @@ public class StandardContext extends Con
/**
- * Set the validation feature of the XML parser used when
- * parsing tlds files.
- * @param tldValidation true to enable xml instance validation
- */
- @Override
- public void setTldValidation(boolean tldValidation){
-
- this.tldValidation = tldValidation;
-
- }
-
- /**
- * Get the server.xml <context> attribute's webXmlValidation.
- * @return true if validation is enabled.
- *
- */
- @Override
- public boolean getTldValidation(){
- return tldValidation;
- }
-
- /**
- * Get the server.xml <host> attribute's xmlNamespaceAware.
- * @return true if namespace awarenes is enabled.
- */
- @Override
- public boolean getTldNamespaceAware(){
- return tldNamespaceAware;
- }
-
-
- /**
- * Set the namespace aware feature of the XML parser used when
- * parsing xml instances.
- * @param tldNamespaceAware true to enable namespace awareness
- */
- @Override
- public void setTldNamespaceAware(boolean tldNamespaceAware){
- this.tldNamespaceAware= tldNamespaceAware;
- }
-
-
- /**
* Support for "stateManageable" JSR77
*/
public boolean isStateManageable() {
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1513712&r1=1513711&r2=1513712&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Wed Aug 14
01:54:37 2013
@@ -412,17 +412,18 @@ public class MBeanFactory {
String docBase)
throws Exception {
- return createStandardContext(parent, path, docBase, false, false,
- false, false);
+ return createStandardContext(parent, path, docBase, false, false);
}
- /**
+ /**
* Create a new StandardContext.
*
* @param parent MBean Name of the associated parent component
* @param path The context path for this Context
* @param docBase Document base directory (or WAR) for this Context
+ * @param xmlValidation if XML descriptors should be validated
+ * @param xmlNamespaceAware if the XML processor should namespace aware
*
* @exception Exception if an MBean cannot be created or registered
*/
@@ -430,9 +431,7 @@ public class MBeanFactory {
String path,
String docBase,
boolean xmlValidation,
- boolean xmlNamespaceAware,
- boolean tldValidation,
- boolean tldNamespaceAware)
+ boolean xmlNamespaceAware)
throws Exception {
// Create a new StandardContext instance
@@ -442,8 +441,6 @@ public class MBeanFactory {
context.setDocBase(docBase);
context.setXmlValidation(xmlValidation);
context.setXmlNamespaceAware(xmlNamespaceAware);
- context.setTldValidation(tldValidation);
- context.setTldNamespaceAware(tldNamespaceAware);
ContextConfig contextConfig = new ContextConfig();
context.addLifecycleListener(contextConfig);
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1513712&r1=1513711&r2=1513712&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Wed Aug 14
01:54:37 2013
@@ -456,16 +456,6 @@ public class FailedContext extends Lifec
public void setXmlValidation(boolean xmlValidation) { /* NO-OP */ }
@Override
- public void setTldValidation(boolean tldValidation) { /* NO-OP */ }
- @Override
- public boolean getTldValidation() { return false; }
-
- @Override
- public boolean getTldNamespaceAware() { return false; }
- @Override
- public void setTldNamespaceAware(boolean tldNamespaceAware) { /* NO-OP */ }
-
- @Override
public JarScanner getJarScanner() { return null; }
@Override
public void setJarScanner(JarScanner jarScanner) { /* NO-OP */ }
Modified: tomcat/trunk/test/org/apache/catalina/core/TesterContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TesterContext.java?rev=1513712&r1=1513711&r2=1513712&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TesterContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TesterContext.java Wed Aug 14
01:54:37 2013
@@ -645,26 +645,6 @@ public class TesterContext implements Co
}
@Override
- public void setTldValidation(boolean tldValidation) {
- // NO-OP
- }
-
- @Override
- public boolean getTldValidation() {
- return false;
- }
-
- @Override
- public boolean getTldNamespaceAware() {
- return false;
- }
-
- @Override
- public void setTldNamespaceAware(boolean tldNamespaceAware) {
- // NO-OP
- }
-
- @Override
public JarScanner getJarScanner() {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
