remm 2004/06/23 06:51:38 Modified: catalina/src/share/org/apache/catalina/valves RequestDumperValve.java JDBCAccessLogValve.java ErrorReportValve.java PersistentValve.java ValveBase.java catalina/src/share/org/apache/catalina/connector Connector.java Request.java catalina/src/share/org/apache/catalina/core StandardHostDeployer.java StandardContext.java StandardWrapperValve.java NamingContextListener.java StandardPipeline.java ApplicationContext.java StandardServer.java ApplicationDispatcher.java StandardHostValve.java ContainerBase.java StandardContextValve.java catalina/src/share/org/apache/catalina/session FileStore.java StoreBase.java JDBCStore.java catalina/src/share/org/apache/catalina/loader WebappLoader.java catalina/src/share/org/apache/catalina Container.java catalina/src/share/org/apache/catalina/authenticator SingleSignOn.java NonLoginAuthenticator.java FormAuthenticator.java SSLAuthenticator.java AuthenticatorBase.java modules/cluster/src/share/org/apache/catalina/cluster/tcp SimpleTcpCluster.java modules/cluster/src/share/org/apache/catalina/cluster CatalinaCluster.java catalina/src/share/org/apache/catalina/startup Embedded.java HostConfig.java UserConfig.java ExpandWar.java EngineConfig.java ContextConfig.java HostRuleSet.java ContextRuleSet.java catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java RealmBase.java JAASMemoryLoginModule.java JDBCRealm.java JNDIRealm.java DataSourceRealm.java JAASCallbackHandler.java catalina/src/conf server.xml server-minimal.xml catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanFactory.java MBeanUtils.java Removed: catalina/src/share/org/apache/catalina Logger.java catalina/src/share/org/apache/catalina/logger LocalStrings.properties LocalStrings_es.properties LocalStrings_ja.properties FileLogger.java LoggerBase.java SystemErrLogger.java mbeans-descriptors.xml Constants.java LocalStrings_fr.properties SystemOutLogger.java Log: - Remove Logger and all related elements I could find. Some stale stuff is still likely there. - Remove as many "debug" fields as I could find. Obviously, this is replaced by Log.isDebugEnabled so that it is possible to enable debug from one location. - Remove useless log methods a little bit everywhere. - One big TODO: come up with a nice default log configuration for either JDK 1.4 logging or log4j. - I put in some categories names for containers which seemed relatively reasonable for a start, but I think these will be changed. Revision Changes Path 1.6 +38 -74 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java.diff?r1=1.5&r2=1.6 1.8 +2 -49 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java.diff?r1=1.7&r2=1.8 1.19 +3 -45 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java.diff?r1=1.18&r2=1.19 1.7 +15 -26 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java.diff?r1=1.6&r2=1.7 1.14 +1 -29 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java.diff?r1=1.13&r2=1.14 1.2 +1 -42 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java.diff?r1=1.1&r2=1.2 1.2 +4 -41 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java.diff?r1=1.1&r2=1.2 1.24 +5 -5 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.23&r2=1.24 1.131 +1 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java.diff?r1=1.130&r2=1.131 1.28 +24 -80 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java.diff?r1=1.27&r2=1.28 1.7 +36 -133 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/NamingContextListener.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/NamingContextListener.java.diff?r1=1.6&r2=1.7 1.21 +0 -47 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java.diff?r1=1.20&r2=1.21 1.26 +5 -12 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java.diff?r1=1.25&r2=1.26 1.31 +1 -61 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java.diff?r1=1.30&r2=1.31 1.36 +20 -67 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java.diff?r1=1.35&r2=1.36 1.21 +6 -42 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java.diff?r1=1.20&r2=1.21 1.34 +14 -107 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java.diff?r1=1.33&r2=1.34 1.16 +4 -56 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContextValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContextValve.java.diff?r1=1.15&r2=1.16 1.5 +9 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/FileStore.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/FileStore.java.diff?r1=1.4&r2=1.5 1.9 +4 -55 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StoreBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StoreBase.java.diff?r1=1.8&r2=1.9 1.10 +22 -22 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/JDBCStore.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/JDBCStore.java.diff?r1=1.9&r2=1.10 1.28 +1 -53 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java.diff?r1=1.27&r2=1.28 1.10 +3 -10 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Container.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Container.java.diff?r1=1.9&r2=1.10 1.15 +29 -99 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java.diff?r1=1.14&r2=1.15 1.7 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java.diff?r1=1.6&r2=1.7 1.11 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java.diff?r1=1.10&r2=1.11 1.14 +9 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java.diff?r1=1.13&r2=1.14 1.21 +1 -84 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java.diff?r1=1.20&r2=1.21 1.42 +11 -32 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java.diff?r1=1.41&r2=1.42 1.7 +1 -3 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java.diff?r1=1.6&r2=1.7 1.18 +3 -66 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java.diff?r1=1.17&r2=1.18 1.32 +1 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java.diff?r1=1.31&r2=1.32 1.4 +15 -83 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/UserConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/UserConfig.java.diff?r1=1.3&r2=1.4 1.6 +5 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java.diff?r1=1.5&r2=1.6 1.4 +9 -84 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineConfig.java.diff?r1=1.3&r2=1.4 1.45 +1 -68 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.44&r2=1.45 1.7 +1 -9 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.6&r2=1.7 1.8 +1 -9 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.7&r2=1.8 1.6 +6 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java.diff?r1=1.5&r2=1.6 1.35 +1 -77 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java.diff?r1=1.34&r2=1.35 1.9 +9 -16 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.8&r2=1.9 1.8 +9 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java.diff?r1=1.7&r2=1.8 1.14 +36 -55 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java.diff?r1=1.13&r2=1.14 1.9 +8 -8 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java.diff?r1=1.8&r2=1.9 1.4 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASCallbackHandler.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASCallbackHandler.java.diff?r1=1.3&r2=1.4 1.34 +0 -15 jakarta-tomcat-catalina/catalina/src/conf/server.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml.diff?r1=1.33&r2=1.34 1.4 +0 -2 jakarta-tomcat-catalina/catalina/src/conf/server-minimal.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/conf/server-minimal.xml.diff?r1=1.3&r2=1.4 1.15 +1 -42 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java.diff?r1=1.14&r2=1.15 1.26 +1 -93 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java.diff?r1=1.25&r2=1.26 1.26 +1 -100 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java.diff?r1=1.25&r2=1.26
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]