Author: markt Date: Thu Jun 23 11:44:39 2011 New Revision: 1138839 URL: http://svn.apache.org/viewvc?rev=1138839&view=rev Log: Move the statics out of the "instance variable" section
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1138839&r1=1138838&r2=1138839&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Jun 23 11:44:39 2011 @@ -114,14 +114,23 @@ public class ContextConfig private static final String SCI_LOCATION = "META-INF/services/javax.servlet.ServletContainerInitializer"; - // ----------------------------------------------------- Instance Variables - /** - * Custom mappings of login methods to authenticators + * The string resources for this package. */ - protected Map<String,Authenticator> customAuthenticators; + protected static final StringManager sm = + StringManager.getManager(Constants.Package); + + + protected static final LoginConfig DUMMY_LOGIN_CONFIG = + new LoginConfig("NONE", null, null, null); + /** + * The <code>Digester</code> we will use to process web application + * context files. + */ + protected static Digester contextDigester = null; + /** * The set of Authenticators that we know how to configure. The key is @@ -132,6 +141,45 @@ public class ContextConfig /** + * The <code>Digester</code>s available to process web deployment descriptor + * files. + */ + protected static Digester[] webDigesters = new Digester[4]; + + + /** + * The <code>Digester</code>s available to process web fragment deployment + * descriptor files. + */ + protected static Digester[] webFragmentDigesters = new Digester[4]; + + + /** + * The <code>Rule</code>s used to parse the web.xml + */ + protected static WebRuleSet webRuleSet = new WebRuleSet(false); + + + /** + * The <code>Rule</code>s used to parse the web-fragment.xml + */ + protected static WebRuleSet webFragmentRuleSet = new WebRuleSet(true); + + + /** + * Deployment count. + */ + protected static long deploymentCount = 0L; + + + // ----------------------------------------------------- Instance Variables + /** + * Custom mappings of login methods to authenticators + */ + protected Map<String,Authenticator> customAuthenticators; + + + /** * The Context we are associated with. */ protected Context context = null; @@ -175,20 +223,6 @@ public class ContextConfig new HashMap<Class<?>, Set<ServletContainerInitializer>>(); /** - * The string resources for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - /** - * The <code>Digester</code> we will use to process web application - * context files. - */ - protected static Digester contextDigester = null; - - - /** * The <code>Digester</code> we will use to process web application * deployment descriptor files. */ @@ -201,37 +235,7 @@ public class ContextConfig protected Digester webFragmentDigester = null; - protected static Digester[] webDigesters = new Digester[4]; - - /** - * The <code>Digester</code>s available to process web fragment - * deployment descriptor files. - */ - protected static Digester[] webFragmentDigesters = new Digester[4]; - - /** - * The <code>Rule</code>s used to parse the web.xml - */ - protected static WebRuleSet webRuleSet = new WebRuleSet(false); - - /** - * The <code>Rule</code>s used to parse the web-fragment.xml - */ - protected static WebRuleSet webFragmentRuleSet = new WebRuleSet(true); - - /** - * Deployment count. - */ - protected static long deploymentCount = 0L; - - - protected static final LoginConfig DUMMY_LOGIN_CONFIG = - new LoginConfig("NONE", null, null, null); - - // ------------------------------------------------------------- Properties - - /** * Return the location of the default deployment descriptor */ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org