cvs commit: jakarta-tomcat RELEASE-PLAN-3.2.2
marcsaeg01/02/07 15:24:57 Added: .Tag: tomcat_32 RELEASE-PLAN-3.2.2 Log: First draft of the proposed release plan for Tomcat 3.2.2 Revision ChangesPath No revision No revision 1.1.2.1 +67 -0 jakarta-tomcat/Attic/RELEASE-PLAN-3.2.2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat RELEASE-PLAN-3.2.2
marcsaeg01/02/07 17:05:35 Modified:.Tag: tomcat_32 RELEASE-PLAN-3.2.2 Log: Updated release criteria to include Bugzilla resolution requirements. Revision ChangesPath No revision No revision 1.1.2.2 +8 -6 jakarta-tomcat/Attic/RELEASE-PLAN-3.2.2 Index: RELEASE-PLAN-3.2.2 === RCS file: /home/cvs/jakarta-tomcat/Attic/RELEASE-PLAN-3.2.2,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- RELEASE-PLAN-3.2.22001/02/07 23:24:53 1.1.2.1 +++ RELEASE-PLAN-3.2.22001/02/08 01:05:27 1.1.2.2 @@ -1,4 +1,4 @@ -$Id: RELEASE-PLAN-3.2.2,v 1.1.2.1 2001/02/07 23:24:53 marcsaeg Exp $ +$Id: RELEASE-PLAN-3.2.2,v 1.1.2.2 2001/02/08 01:05:27 marcsaeg Exp $ NOTE: This document is the first cut at a release plan for the next dot release of Tomcat. Nothing in this document should be @@ -52,11 +52,13 @@ Release Criteria: -Any bug introduced after Tomcat 3.2.1 MUST be fixed. Bugs that existed -prior to the release of Tomcat 3.2.1 that are not fixed before the -code freeze/beta release will not be fixed in Tomcat 3.2.2. Once -Tomcat 3.2.2 is finalized the tomcat_32 branch will be unfrozen and -developers may commit fixes for a future release. +Any bug introduced by a code change since Tomcat 3.2.1 was released MUST +be fixed. If it worked in 3.2.1 it will work in 3.2.2. + +All Bugzilla items opened against "Tocmat 3" must be marked as RESOLVED. +Those items that are not going to be fixed in Tomcat 3.2.2 will be given +a resolution of LATER. After Tomcat 3.2.2 is released items marked LATER +will be re-opened and may then be addressed in a future release. The Tomcat 3.2.2 release MUST run the jakarta-watchdog test suite with no errors on the following platforms: Linux, Solaris, Windows 9x, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler Compiler.java
marcsaeg01/01/05 10:04:37
Modified:src/share/org/apache/jasper/compiler Tag: tomcat_32
Compiler.java
Log:
Added a method to remove the generated .class file. This will be called
to remove generated files in the event that the associated JSP page is removed.
PR: 698
Revision ChangesPath
No revision
No revision
1.19.2.4 +19 -3
jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -r1.19.2.3 -r1.19.2.4
--- Compiler.java 2000/12/22 14:19:12 1.19.2.3
+++ Compiler.java 2001/01/05 18:04:36 1.19.2.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v 1.19.2.3
2000/12/22 14:19:12 pierred Exp $
- * $Revision: 1.19.2.3 $
- * $Date: 2000/12/22 14:19:12 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v 1.19.2.4
2001/01/05 18:04:36 marcsaeg Exp $
+ * $Revision: 1.19.2.4 $
+ * $Date: 2001/01/05 18:04:36 $
*
*
*
@@ -374,6 +374,22 @@
}
return null;
}
+
+ /**
+ * Remove generated files
+ */
+ public void removeGeneratedFiles()
+ {
+ try{
+ // XXX Should we delete the generated .java file too?
+ String classFileName = mangler.getClassFileName();
+ if(classFileName != null){
+ File classFile = new File(classFileName);
+ classFile.delete();
+ }
+ }catch(Exception e){
+ }
+ }
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/servlet JspServlet.java
marcsaeg01/01/05 10:09:10
Modified:src/share/org/apache/jasper/servlet Tag: tomcat_32
JspServlet.java
Log:
If the JSP page can't be found have the compiler remove any previously
generated .class file. This will happen if a JSP page is removed after
it has been previously compiled.
PR: 698
Revision ChangesPath
No revision
No revision
1.3.2.3 +2 -1
jakarta-tomcat/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- JspServlet.java 2000/11/09 13:22:17 1.3.2.2
+++ JspServlet.java 2001/01/05 18:09:10 1.3.2.3
@@ -450,7 +450,7 @@
}
// Class jspClass = (Class) loadedJSPs.get(jspUri);
boolean firstTime = jsw.servletClass == null;
-JspCompilationContext ctxt = new JspEngineContext(loader, classpath,
+ JspCompilationContext ctxt = new JspEngineContext(loader, classpath,
context, jspUri,
isErrorPage, options,
req, res);
@@ -469,6 +469,7 @@
}
}
} catch (FileNotFoundException ex) {
+ compiler.removeGeneratedFiles();
throw ex;
} catch (JasperException ex) {
throw ex;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
marcsaeg01/01/04 13:24:00
Modified:src/share/org/apache/tomcat/core Tag: tomcat_32
ContextManager.java
Log:
If no context can be found for the request URI then display
a 404 error. Previously this caused a tight loop in
PrefixMapper.getLongestPrefixMatch().
A portion of this fix was submitted by Shawn McMurdo [[EMAIL PROTECTED]].
Revision ChangesPath
No revision
No revision
1.100.2.20 +66 -0
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.100.2.19
retrieving revision 1.100.2.20
diff -u -r1.100.2.19 -r1.100.2.20
--- ContextManager.java 2000/11/16 18:25:21 1.100.2.19
+++ ContextManager.java 2001/01/04 21:23:59 1.100.2.20
@@ -1015,6 +1015,15 @@
Context ctx = req.getContext();
if(ctx==null) ctx=getContext("");
+ if(ctx == null){
+ // The request didn't map into any context so send a 404 error.
+ try{
+ handleContextNotFound(req, res);
+ }catch(IOException e){
+ }
+ return;
+ }
+
// don't log normal cases ( redirect and need_auth ), they are not
// error
// XXX this log was intended to debug the status code generation.
@@ -1182,6 +1191,63 @@
return false;
}
+ /**
+ * Called if the request does not map into any context. This code
+ * was lifted from DefaultCMSetter.NotFoundHandler becuase without
+ * a valid context we really can't execute that servlet.
+ */
+ private void handleContextNotFound(Request req, Response res) throws
IOException
+ {
+ StringManager
sm=StringManager.getManager("org.apache.tomcat.resources");
+ res.setContentType("text/html"); // ISO-8859-1 default
+
+ String requestURI = (String)req.
+ getAttribute("javax.servlet.include.request_uri");
+
+ if (requestURI == null || res.isIncluded()) {
+ requestURI = req.getRequestURI();
+ }
+
+ StringBuffer buf = new StringBuffer();
+ buf.append("headtitle")
+ .append(sm.getString("defaulterrorpage.notfound404"))
+ .append("/title/head\r\n");
+ buf.append("bodyh1")
+ .append(sm.getString("defaulterrorpage.notfound404"))
+ .append("/h1\r\nb");
+ buf.append(sm.getString("defaulterrorpage.originalrequest"))
+ .append("/b ")
+ .append( requestURI );
+
+ if (getShowDebugInfo()) {
+ if (res.isIncluded()) {
+ requestURI = (String)req.
+ getAttribute("javax.servlet.include.request_uri");
+ }
+ if (requestURI != null) {
+ buf.append("brbr\r\nb")
+
.append(sm.getString("defaulterrorpage.notfoundrequest"))
+ .append("/b ")
+ .append( requestURI );
+ }
+ }
+
+ buf.append("/body\r\n");
+
+ String body = buf.toString();
+
+ res.setContentLength(body.length());
+
+ if( res.isUsingStream() ) {
+ ServletOutputStream out = res.getOutputStream();
+ out.print(body);
+ out.flush();
+ } else {
+ PrintWriter out = res.getWriter();
+ out.print(body);
+ out.flush();
+ }
+ }
// Support for notes
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util PrefixMapper.java
marcsaeg01/01/04 13:28:33
Modified:src/share/org/apache/tomcat/util Tag: tomcat_32
PrefixMapper.java
Log:
getLongestPrefixMatch() would enter a tight loop if the request URI didn't
map into a context. Now, if a match can't be found it returns null and
a 404 error page will be sent back to the client browser.
Revision ChangesPath
No revision
No revision
1.3.2.1 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java
Index: PrefixMapper.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- PrefixMapper.java 2000/06/19 21:53:16 1.3
+++ PrefixMapper.java 2001/01/04 21:28:33 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.3
2000/06/19 21:53:16 costin Exp $
- * $Revision: 1.3 $
- * $Date: 2000/06/19 21:53:16 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v 1.3.2.1
2001/01/04 21:28:33 marcsaeg Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2001/01/04 21:28:33 $
*
*
*
@@ -215,7 +215,7 @@
if( container!=null ) return container;
}
- while (s.length() = 0) {
+ while (s.length() 0) {
//if(debug8) context.log( "Prefix: " + s );
container = myMap.prefixMappedServlets.get(s);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request SimpleMapper1.java
marcsaeg01/01/04 13:26:18
Modified:src/share/org/apache/tomcat/request Tag: tomcat_32
SimpleMapper1.java
Log:
contextMap() now returns 404 if a context can't be found for the request
URI. This will cause an error page to be sent to the client browser.
Revision ChangesPath
No revision
No revision
1.15.2.6 +1 -2
jakarta-tomcat/src/share/org/apache/tomcat/request/Attic/SimpleMapper1.java
Index: SimpleMapper1.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/Attic/SimpleMapper1.java,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -r1.15.2.5 -r1.15.2.6
--- SimpleMapper1.java2000/12/12 20:33:44 1.15.2.5
+++ SimpleMapper1.java2001/01/04 21:26:17 1.15.2.6
@@ -259,8 +259,7 @@
path );
if( container == null )
- throw new RuntimeException( "Assertion failed: " +
- "container==null");
+ return 404;
if(debug0)
cm.log("SM: Prefix match " + path + " - " +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc/appdev/sample build.bat
marcsaeg00/12/27 09:20:16 Modified:src/doc/appdev/sample Tag: tomcat_32 build.bat Log: The CP variable is being built up in three steps, but the second step didn't include %CP% so the results of the first step were lost. PR: 591 Submitted by: Terry Traub ( [EMAIL PROTECTED] ) Revision ChangesPath No revision No revision 1.3.2.3 +2 -2 jakarta-tomcat/src/doc/appdev/sample/build.bat Index: build.bat === RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/sample/build.bat,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- build.bat 2000/11/27 22:45:57 1.3.2.2 +++ build.bat 2000/12/27 17:20:11 1.3.2.3 @@ -1,12 +1,12 @@ @echo off rem build.bat -- Build Script for the "Hello, World" Application -rem $Id: build.bat,v 1.3.2.2 2000/11/27 22:45:57 craigmcc Exp $ +rem $Id: build.bat,v 1.3.2.3 2000/12/27 17:20:11 marcsaeg Exp $ set _CP=%CP% rem Identify the custom class path components we need set CP=%TOMCAT_HOME%\lib\ant.jar;%TOMCAT_HOME%\lib\servlet.jar -set CP=%TOMCAT_HOME%\lib\jaxp.jar;%TOMCAT_HOME%\lib\parser.jar +set CP=%CP%;%TOMCAT_HOME%\lib\jaxp.jar;%TOMCAT_HOME%\lib\parser.jar set CP=%CP%;%JAVA_HOME%\lib\tools.jar rem Execute ANT to perform the requird build target
