remm 2004/06/23 01:25:04
Modified: catalina/src/share/org/apache/catalina/valves
RequestDumperValve.java RequestFilterValve.java
JDBCAccessLogValve.java ErrorReportValve.java
AccessLogValve.java PersistentValve.java
ValveBase.java ExtendedAccessLogValve.java
RemoteAddrValve.java RemoteHostValve.java
catalina/src/share/org/apache/catalina/connector
RequestFacade.java Constants.java
ResponseFacade.java
catalina/src/share/org/apache/catalina Container.java
Pipeline.java Realm.java Service.java Valve.java
catalina/src/share/org/apache/catalina/core
DummyRequest.java StandardWrapperValve.java
StandardPipeline.java StandardServer.java
DummyResponse.java ApplicationDispatcher.java
StandardHostValve.java
ApplicationFilterFactory.java ContainerBase.java
StandardEngineValve.java StandardService.java
StandardContextValve.java
catalina/src/share/org/apache/catalina/authenticator
SingleSignOn.java NonLoginAuthenticator.java
FormAuthenticator.java DigestAuthenticator.java
SSLAuthenticator.java BasicAuthenticator.java
AuthenticatorBase.java
catalina/src/share/org/apache/catalina/startup Embedded.java
Catalina.java
catalina/src/share/org/apache/catalina/realm RealmBase.java
JAASMemoryLoginModule.java
catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java MBeanFactory.java
ConnectorMBean.java MBeanUtils.java
. build.xml
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationValve.java
Added: catalina/src/share/org/apache/catalina/connector
CoyoteOutputStream.java Connector.java
Response.java CoyoteInputStream.java
CoyoteAdapter.java MapperListener.java
LocalStrings.properties LocalStrings_es.properties
OutputBuffer.java LocalStrings_ja.properties
LocalStrings_fr.properties CoyoteReader.java
InputBuffer.java mbeans-descriptors.xml
CoyoteWriter.java CoyotePrincipal.java Request.java
Removed: catalina/src/share/org/apache/catalina/connector
HttpResponseFacade.java HttpRequestFacade.java
catalina/src/share/org/apache/catalina HttpRequest.java
ValveContext.java HttpResponse.java Connector.java
Request.java Response.java
catalina/src/share/org/apache/coyote/tomcat5
OutputBuffer.java CoyoteResponseFacade.java
CoyoteRequestFacade.java MapperListener.java
CoyoteServerSocketFactory.java
LocalStrings_ja.properties CoyoteAdapter.java
LocalStrings_fr.properties LocalStrings.properties
CoyoteConnector.java CoyoteReader.java
Constants.java CoyotePrincipal.java
LocalStrings_es.properties CoyoteOutputStream.java
CoyoteInputStream.java CoyoteWriter.java
CoyoteResponse.java CoyoteRequest.java
mbeans-descriptors.xml InputBuffer.java
catalina/src/share/org/apache/catalina/core
StandardValveContext.java
catalina/src/share/org/apache/catalina/net
DefaultServerSocketFactory.java
ServerSocketFactory.java
Log:
- Move Coyote adapter to o.a.catalina.connector.
- Remove interfaces for Request/Response and move to concrete classes.
- Remove a lot of RTTI and casts on Request/Response. I likely missed some, so this
is a WIP.
- I'm using version number 5.5 for this refactoring, as an indication that this is
no longer 5.0.x.
- Move back to the valve pattern of Tomcat 4.0 beta 1 (I feel old now :( ), but
without the double chaining.
The extra robustness of the valve context is nice, but it added complexity (and
was slower) and overall wasn't needed.
- In the end, I didn't remove Logger yet (it'll be my next commit :) ).
Revision Changes Path
1.5 +39 -58
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.4&r2=1.5
1.6 +7 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java.diff?r1=1.5&r2=1.6
1.7 +27 -36
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.6&r2=1.7
1.18 +9 -18
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.17&r2=1.18
1.11 +17 -23
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java.diff?r1=1.10&r2=1.11
1.6 +5 -7
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.5&r2=1.6
1.13 +33 -6
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.12&r2=1.13
1.9 +31 -47
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java.diff?r1=1.8&r2=1.9
1.3 +5 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteAddrValve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteAddrValve.java.diff?r1=1.2&r2=1.3
1.3 +5 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteHostValve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteHostValve.java.diff?r1=1.2&r2=1.3
1.5 +370 -46
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/RequestFacade.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/RequestFacade.java.diff?r1=1.4&r2=1.5
1.3 +29 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Constants.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Constants.java.diff?r1=1.2&r2=1.3
1.6 +261 -48
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ResponseFacade.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ResponseFacade.java.diff?r1=1.5&r2=1.6
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteOutputStream.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteOutputStream.java?rev=1.1
1.1
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?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteInputStream.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteInputStream.java?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/MapperListener.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/MapperListener.java?rev=1.1
1.3 +58 -21
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties.diff?r1=1.2&r2=1.3
1.3 +56 -18
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings_es.properties
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings_es.properties.diff?r1=1.2&r2=1.3
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java?rev=1.1
1.3 +56 -18
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings_ja.properties
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings_ja.properties.diff?r1=1.2&r2=1.3
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings_fr.properties
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings_fr.properties?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteReader.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteReader.java?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/InputBuffer.java?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/mbeans-descriptors.xml
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteWriter.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteWriter.java?rev=1.1
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyotePrincipal.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyotePrincipal.java?rev=1.1
1.1
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?rev=1.1
1.9 +4 -1
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.8&r2=1.9
1.3 +4 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Pipeline.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Pipeline.java.diff?r1=1.2&r2=1.3
1.9 +8 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Realm.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Realm.java.diff?r1=1.8&r2=1.9
1.3 +3 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Service.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Service.java.diff?r1=1.2&r2=1.3
1.3 +19 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Valve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Valve.java.diff?r1=1.2&r2=1.3
1.11 +4 -15
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/DummyRequest.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/DummyRequest.java.diff?r1=1.10&r2=1.11
1.27 +31 -45
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.26&r2=1.27
1.20 +93 -91
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.19&r2=1.20
1.30 +4 -34
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.29&r2=1.30
1.4 +4 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/DummyResponse.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/DummyResponse.java.diff?r1=1.3&r2=1.4
1.35 +6 -8
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.34&r2=1.35
1.20 +35 -77
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.19&r2=1.20
1.15 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java.diff?r1=1.14&r2=1.15
1.33 +2 -2
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.32&r2=1.33
1.8 +7 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngineValve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngineValve.java.diff?r1=1.7&r2=1.8
1.14 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java.diff?r1=1.13&r2=1.14
1.15 +9 -13
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.14&r2=1.15
1.14 +15 -31
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.13&r2=1.14
1.6 +5 -5
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.5&r2=1.6
1.10 +20 -24
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.9&r2=1.10
1.7 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java.diff?r1=1.6&r2=1.7
1.13 +9 -11
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.12&r2=1.13
1.7 +10 -15
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java.diff?r1=1.6&r2=1.7
1.20 +26 -47
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.19&r2=1.20
1.17 +3 -15
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.16&r2=1.17
1.29 +3 -11
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.28&r2=1.29
1.34 +23 -30
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.33&r2=1.34
1.8 +5 -7
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.7&r2=1.8
1.14 +2 -2
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.13&r2=1.14
1.25 +5 -5
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.24&r2=1.25
1.7 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java.diff?r1=1.6&r2=1.7
1.25 +2 -2
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.24&r2=1.25
1.189 +2 -2 jakarta-tomcat-5/build.xml
http://cvs.apache.org/viewcvs/jakarta-tomcat-5/build.xml.diff?r1=1.188&r2=1.189
1.14 +13 -28
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java.diff?r1=1.13&r2=1.14
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
