Author: jboynes Date: Thu Aug 15 02:37:36 2013 New Revision: 1514139 URL: http://svn.apache.org/r1514139 Log: revert r1513714
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java?rev=1514139&r1=1514138&r2=1514139&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java Thu Aug 15 02:37:36 2013 @@ -655,11 +655,7 @@ public interface Context extends Contain * Set the validation feature of the XML parser used when * parsing tlds files. * @param tldValidation true to enable xml instance validation - * - * @deprecated This will be removed in Tomcat 8.0.x onwards. TLD processing - * has been moved to Jasper. */ - @Deprecated public void setTldValidation(boolean tldValidation); @@ -667,21 +663,14 @@ public interface Context extends Contain * Get the server.xml <context> attribute's webXmlValidation. * @return true if validation is enabled. * - * @deprecated This will be removed in Tomcat 8.0.x onwards. TLD processing - * has been moved to Jasper. */ - @Deprecated public boolean getTldValidation(); /** * Get the server.xml <host> attribute's xmlNamespaceAware. * @return true if namespace awareness is enabled. - * - * @deprecated This will be removed in Tomcat 8.0.x onwards. TLD processing - * has been moved to Jasper. */ - @Deprecated public boolean getTldNamespaceAware(); @@ -689,11 +678,7 @@ public interface Context extends Contain * Set the namespace aware feature of the XML parser used when * parsing xml instances. * @param tldNamespaceAware true to enable namespace awareness - * - * @deprecated This will be removed in Tomcat 8.0.x onwards. TLD processing - * has been moved to Jasper. */ - @Deprecated public void setTldNamespaceAware(boolean tldNamespaceAware); /** Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1514139&r1=1514138&r2=1514139&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu Aug 15 02:37:36 2013 @@ -6630,7 +6630,6 @@ public class StandardContext extends Con * @param tldValidation true to enable xml instance validation */ @Override - @Deprecated public void setTldValidation(boolean tldValidation){ this.tldValidation = tldValidation; @@ -6643,7 +6642,6 @@ public class StandardContext extends Con * */ @Override - @Deprecated public boolean getTldValidation(){ return tldValidation; } @@ -6652,22 +6650,14 @@ public class StandardContext extends Con * Sets the process TLDs attribute. * * @param newProcessTlds The new value - * - * @deprecated This will be removed in Tomcat 8.0.x onwards. TLD processing - * has been moved to Jasper. */ - @Deprecated public void setProcessTlds(boolean newProcessTlds) { processTlds = newProcessTlds; } /** * Returns the processTlds attribute value. - * - * @deprecated This will be removed in Tomcat 8.0.x onwards. TLD processing - * has been moved to Jasper. */ - @Deprecated public boolean getProcessTlds() { return processTlds; } @@ -6677,7 +6667,6 @@ public class StandardContext extends Con * @return true if namespace awarenes is enabled. */ @Override - @Deprecated public boolean getTldNamespaceAware(){ return tldNamespaceAware; } @@ -6689,7 +6678,6 @@ public class StandardContext extends Con * @param tldNamespaceAware true to enable namespace awareness */ @Override - @Deprecated public void setTldNamespaceAware(boolean tldNamespaceAware){ this.tldNamespaceAware= tldNamespaceAware; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1514139&r1=1514138&r2=1514139&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Thu Aug 15 02:37:36 2013 @@ -55,11 +55,7 @@ import org.xml.sax.SAXException; * @author Craig R. McClanahan * @author Jean-Francois Arcand * @author Costin Manolache - * - * @deprecated This will be removed in Tomcat 8.0.x onwards. TLD processing - * has been moved to Jasper. */ -@Deprecated public final class TldConfig implements LifecycleListener { private static final String TLD_EXT = ".tld"; Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1514139&r1=1514138&r2=1514139&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 15 02:37:36 2013 @@ -111,11 +111,6 @@ <bug>55404</bug>: Log warnings about using security roles in web.xml without defining them as warnings. (markt) </fix> - <scode> - <bug>55246</bug>: Deprecate TldConfig and TLD-related properties of Context - as they have been removed in Tomcat 8.0.x where TLD processing is handled - by Jasper. (jboynes) - </scode> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org