remm 2004/06/26 10:41:33 Modified: catalina/src/share/org/apache/catalina/startup EngineRuleSet.java WebRuleSet.java SetDocBaseRule.java ClusterRuleSet.java SetAllPropertiesRule.java NamingRuleSet.java DigesterFactory.java CopyParentClassLoaderRule.java TldRuleSet.java Catalina.java LifecycleListenerRule.java ContextConfig.java ContextRuleSet.java HostRuleSet.java TldConfig.java catalina/src/share/org/apache/catalina/core StandardHostDeployer.java util/java/org/apache/tomcat/util IntrospectionUtils.java catalina/src/share/org/apache/catalina/realm MemoryRuleSet.java JAASMemoryLoginModule.java MemoryRealm.java catalina/src/share/org/apache/catalina/users MemoryUserDatabase.java catalina/src/share/org/apache/catalina/util SchemaResolver.java catalina/src/share/org/apache/catalina/ant ValidatorTask.java Added: util/java/org/apache/tomcat/util/digester SetTopRule.java Digester.java AbstractObjectCreationFactory.java package.html SimpleRegexMatcher.java RulesBase.java SetPropertyRule.java ObjectCreationFactory.java GenericParser.java ArrayStack.java FactoryCreateRule.java NodeCreateRule.java BeanPropertySetterRule.java RegexMatcher.java ParserFeatureSetterFactory.java RuleSet.java SetPropertiesRule.java Rule.java RegexRules.java ObjectParamRule.java SetNextRule.java SetRootRule.java Rules.java AbstractRulesImpl.java WithDefaultsRulesWrapper.java CallParamRule.java XercesParser.java CallMethodRule.java ExtendedBaseRules.java Substitutor.java RuleSetBase.java PathCallParamRule.java ObjectCreateRule.java Removed: catalina/src/share/org/apache/catalina/util CatalinaDigester.java Log: - Move the core digester to tomcat-utils. - Use digester from tomcat-utils. - This copy of digester is only cleaned of beanutils dependencies (and one extra rule that was not used and was not worth modifying). There are still rules and features that neither Tomcat not the modeler are using and that will be removed. - Note: The modeler still needs the regular digester. I'll add a checkout -> replace package names -> build procedure to the download target, but I need to evaluate the features from the digester that it needs first. Revision Changes Path 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetTopRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetTopRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Digester.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Digester.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/package.html http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/package.html?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SimpleRegexMatcher.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SimpleRegexMatcher.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RulesBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RulesBase.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetPropertyRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetPropertyRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/GenericParser.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/GenericParser.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ArrayStack.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ArrayStack.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/FactoryCreateRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/FactoryCreateRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/NodeCreateRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/NodeCreateRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/BeanPropertySetterRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/BeanPropertySetterRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RegexMatcher.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RegexMatcher.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RuleSet.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetPropertiesRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetPropertiesRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Rule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Rule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RegexRules.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RegexRules.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ObjectParamRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ObjectParamRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetNextRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetNextRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetRootRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/SetRootRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Rules.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Rules.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/CallParamRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/CallParamRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/XercesParser.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/XercesParser.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/CallMethodRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ExtendedBaseRules.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ExtendedBaseRules.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Substitutor.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/Substitutor.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RuleSetBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/RuleSetBase.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/PathCallParamRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/PathCallParamRule.java?rev=1.1 1.1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ObjectCreateRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1.1 1.5 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java.diff?r1=1.4&r2=1.5 1.13 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java.diff?r1=1.12&r2=1.13 1.14 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java.diff?r1=1.13&r2=1.14 1.4 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClusterRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClusterRuleSet.java.diff?r1=1.3&r2=1.4 1.6 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java.diff?r1=1.5&r2=1.6 1.4 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java.diff?r1=1.3&r2=1.4 1.7 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/DigesterFactory.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/DigesterFactory.java.diff?r1=1.6&r2=1.7 1.5 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/CopyParentClassLoaderRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/CopyParentClassLoaderRule.java.diff?r1=1.4&r2=1.5 1.4 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldRuleSet.java.diff?r1=1.3&r2=1.4 1.31 +4 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java.diff?r1=1.30&r2=1.31 1.5 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LifecycleListenerRule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LifecycleListenerRule.java.diff?r1=1.4&r2=1.5 1.46 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java.diff?r1=1.45&r2=1.46 1.9 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java.diff?r1=1.8&r2=1.9 1.8 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java.diff?r1=1.7&r2=1.8 1.40 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java.diff?r1=1.39&r2=1.40 1.25 +3 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java.diff?r1=1.24&r2=1.25 1.7 +792 -769 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java.diff?r1=1.6&r2=1.7 1.5 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java.diff?r1=1.4&r2=1.5 1.10 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java.diff?r1=1.9&r2=1.10 1.5 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java.diff?r1=1.4&r2=1.5 1.7 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java.diff?r1=1.6&r2=1.7 1.5 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/SchemaResolver.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/SchemaResolver.java.diff?r1=1.4&r2=1.5 1.8 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/ValidatorTask.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/ValidatorTask.java.diff?r1=1.7&r2=1.8
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]