Author: remy.maucherat(a)jboss.com Date: 2010-04-21 12:54:16 -0400 (Wed, 21 Apr 2010) New Revision: 1443 Modified: trunk/java/org/apache/catalina/Context.java trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/catalina/core/StandardWrapper.java trunk/java/org/apache/catalina/startup/ContextConfig.java Log: - Drop ignore annotations flag. Modified: trunk/java/org/apache/catalina/Context.java =================================================================== --- trunk/java/org/apache/catalina/Context.java 2010-04-16 15:20:58 UTC (rev 1442) +++ trunk/java/org/apache/catalina/Context.java 2010-04-21 16:54:16 UTC (rev 1443) @@ -327,21 +327,6 @@ /** - * Return the boolean on the annotations parsing. - */ - public boolean getIgnoreAnnotations(); - - - /** - * Set the boolean on the annotations parsing for this web - * application. - * - * @param ignoreAnnotations The boolean on the annotations parsing - */ - public void setIgnoreAnnotations(boolean ignoreAnnotations); - - - /** * Used to create application instances. */ public InstanceManager getInstanceManager(); Modified: trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 2010-04-16 15:20:58 UTC (rev 1442) +++ trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 2010-04-21 16:54:16 UTC (rev 1443) @@ -54,7 +54,6 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Enumeration; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; @@ -76,7 +75,6 @@ import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.StringManager; -import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.log.SystemLogHandler; import org.apache.tomcat.util.modeler.Registry; @@ -515,12 +513,10 @@ } else { filter.destroy(); } - if (!context.getIgnoreAnnotations()) { - try { - ((StandardContext) context).getInstanceManager().destroyInstance(this.filter); - } catch (Exception e) { - context.getLogger().error("ApplicationFilterConfig.preDestroy", e); - } + try { + ((StandardContext) context).getInstanceManager().destroyInstance(this.filter); + } catch (Exception e) { + context.getLogger().error("ApplicationFilterConfig.preDestroy", e); } } this.filter = null; Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2010-04-16 15:20:58 UTC (rev 1442) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-04-21 16:54:16 UTC (rev 1443) @@ -384,12 +384,6 @@ /** - * Ignore annotations. - */ - protected boolean ignoreAnnotations = false; - - - /** * The set of classnames of InstanceListeners that will be added * to each newly created Wrapper by <code>createWrapper()</code>. */ @@ -1196,27 +1190,6 @@ /** - * Return the boolean on the annotations parsing. - */ - public boolean getIgnoreAnnotations() { - return this.ignoreAnnotations; - } - - - /** - * Set the boolean on the annotations parsing for this web - * application. - * - * @param ignoreAnnotations The boolean on the annotations parsing - */ - public void setIgnoreAnnotations(boolean ignoreAnnotations) { - boolean oldIgnoreAnnotations = this.ignoreAnnotations; - this.ignoreAnnotations = ignoreAnnotations; - support.firePropertyChange("ignoreAnnotations", oldIgnoreAnnotations, this.ignoreAnnotations); - } - - - /** * Set the session cookie configuration. * * @param sessionCookie The new value Modified: trunk/java/org/apache/catalina/core/StandardWrapper.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapper.java 2010-04-16 15:20:58 UTC (rev 1442) +++ trunk/java/org/apache/catalina/core/StandardWrapper.java 2010-04-21 16:54:16 UTC (rev 1443) @@ -1418,9 +1418,7 @@ (InstanceEvent.AFTER_DESTROY_EVENT, instance); // Annotation processing - if (!((Context) getParent()).getIgnoreAnnotations()) { - ((Context) getParent()).getInstanceManager().destroyInstance(instance); - } + ((Context) getParent()).getInstanceManager().destroyInstance(instance); } catch (Throwable t) { instanceSupport.fireInstanceEvent @@ -1461,9 +1459,7 @@ s.destroy(); } // Annotation processing - if (!((Context) getParent()).getIgnoreAnnotations()) { - ((Context) getParent()).getInstanceManager().destroyInstance(s); - } + ((Context) getParent()).getInstanceManager().destroyInstance(s); } } catch (Throwable t) { instancePool = null; Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/ContextConfig.java 2010-04-16 15:20:58 UTC (rev 1442) +++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2010-04-21 16:54:16 UTC (rev 1443) @@ -413,7 +413,7 @@ applicationServletContainerInitializerConfig(); } // Parse fragment order - if (ok && !context.getIgnoreAnnotations()) { + if (ok) { createFragmentsOrder(); } // Scan fragments, TLDs and annotations