costin 00/11/06 10:17:28
Modified: . build.xml
src/facade22/org/apache/tomcat/facade
HttpServletResponseFacade.java
src/share/org/apache/tomcat/core Response.java
Removed: src/facade23 README
src/facade23/org/apache/tomcat/facade23 CookieFacade.java
HttpServletRequestFacade.java
HttpServletResponseFacade.java
HttpSessionFacade.java RequestDispatcherImpl.java
ServletConfigImpl.java ServletContextFacade.java
ServletInputStreamFacade.java
ServletOutputStreamFacade.java ServletWrapper.java
ServletWriterFacade.java SessionContextImpl.java
Log:
Removed "facade23" from the working space.
It will become a new revolution ( "Implementation of servlet2.3 spec for
tomcat3" ), the announcement will be sent later this week ( after I figure
out if it's a good idea to start with the current facade22 or it's better
to do a fresh start and re-implement all the interfaces from scratch )
If anyone is interested to implement the Servlet 2.3 spec for tomcat
please let me know, I'll have time to finish this work on this only in
late december, so if anyone wants to "own" the 2.3 spec implementation
it'll be perfect and I would be able to just fix bugs and help :-)
Revision Changes Path
1.93 +1 -30 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- build.xml 2000/11/06 15:06:16 1.92
+++ build.xml 2000/11/06 18:17:04 1.93
@@ -39,9 +39,6 @@
<property name="servlet22.jar"
value="bin/servlet22.jar"/>
- <property name="servlet23.jar"
- value="bin/servlet23.jar" />
-
<!-- default servlet.jar, used to compile webapps -->
<!-- we use 2.2 because the api is backward compatible, but it
may have problems in the reverse direction -->
@@ -92,12 +89,8 @@
<!-- new dir struct for running both 2.2 and 2.3 -->
<mkdir dir="${tomcat.build}/lib/servlet22"/>
- <mkdir dir="${tomcat.build}/lib/servlet23"/>
<copyfile src="${servlet22.jar}"
dest="${tomcat.build}/lib/servlet22/servlet22.jar"/>
- <copyfile src="${servlet23.jar}"
- dest="${tomcat.build}/lib/servlet23/servlet23.jar"/>
-
<fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.sh" cr="remove"/>
<fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.bat" cr="add"/>
@@ -260,28 +253,6 @@
</jar>
</target>
- <!-- ==================== Servlet 23 (default) implementation ========== -->
- <target name="facade23" depends="init" >
- <javac destdir="${tomcat.build}/classes"
- debug="${debug}"
- optimize="${optimize}"
- deprecation="off"
- srcdir="src/facade23" >
- <classpath>
- <pathelement location="${servlet23.jar}" />
- <pathelement location="${tomcat.build}/lib/tomcat_util.jar" />
- <pathelement location="${tomcat.build}/lib/tomcat_core.jar" />
- <pathelement location="${tomcat.build}/lib/tomcat_modules.jar" />
- </classpath>
- <include name="org/apache/tomcat/facade23/**" />
- </javac>
- <jar jarfile="${tomcat.build}/lib/servlet23/facade23.jar"
- basedir="${tomcat.build}/classes" >
- <include name="org/apache/tomcat/facade23/**" />
- </jar>
- </target>
-
-
<!-- ==================== "Standard" interceptors ========== -->
<target name="tomcat_modules" depends="init" >
<javac destdir="${tomcat.build}/classes"
@@ -338,7 +309,7 @@
/>
</target>
- <target name="tomcat-jars-new"
depends="tomcat_util,tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,facade23,tomcat_config,dav">
+ <target name="tomcat-jars-new"
depends="tomcat_util,tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat_config,dav">
</target>
<!-- ==================== J2EE integration ========== -->
1.9 +1 -0
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
Index: HttpServletResponseFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HttpServletResponseFacade.java 2000/11/02 21:51:37 1.8
+++ HttpServletResponseFacade.java 2000/11/06 18:17:07 1.9
@@ -108,6 +108,7 @@
// -------------------- Public methods --------------------
public void addCookie(Cookie cookie) {
+ if( response.isIncluded() ) return;
// layer costs - this can be avoided, but it's not a
// frequent operation ( for example sc can be reused )
ServerCookie sc=new ServerCookie();
1.42 +13 -10 jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
Index: Response.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Response.java 2000/11/02 21:44:37 1.41
+++ Response.java 2000/11/06 18:17:26 1.42
@@ -204,15 +204,20 @@
public void reset() throws IllegalStateException {
+ if( ! included ) {
+ // Reset the headers only if this is the main request,
+ // not for included
+ contentType = DEFAULT_CONTENT_TYPE;
+ locale = DEFAULT_LOCALE;
+ characterEncoding = DEFAULT_CHAR_ENCODING;
+ contentLength = -1;
+ status = 200;
+ headers.clear();
+ }
+
// Force the PrintWriter to flush its data to the output
- // stream before resetting the output stream
- //
- contentType = DEFAULT_CONTENT_TYPE;
- locale = DEFAULT_LOCALE;
- characterEncoding = DEFAULT_CHAR_ENCODING;
- contentLength = -1;
- status = 200;
-
+ // stream before resetting the output stream
+ //
// Reset the stream
if( commited ) {
String msg = sm.getString("servletOutputStreamImpl.reset.ise");
@@ -220,8 +225,6 @@
}
oBuffer.reset();
- // Clear the headers
- if( ! included) headers.clear();
}
public void finish() throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
