[OT] AB on Windows?
Hi all! I'm sorry to bring this off-topic matter up here. Does anyone know about a tool similar to ab for Windows or better yet, ab for Windows? I need the simplicity and the clear results ab gives me, but don't have access to a Linux box in the test center. Regards, Gummi Haf -- Gudmundur Hafsteinsson - [EMAIL PROTECTED] Dimon Software - www.dimonsoftware.com "... 'cause that's what tiggers do the best!" - Tigger -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
BugRat Report #833 has been filed.
Bug report #833 has just been filed. You can view the report at the following URL: http://znutar.cortexity.com/BugRatViewer/ShowReport/833 REPORT #833 Details. Project: Tomcat Category: Bug Report SubCategory: New Bug Report Class: swbug State: received Priority: high Severity: critical Confidence: public Environment: Release: 3.2 JVM Release: 1.3 Operating System: Windows 2000 OS Release: 5.00.2195 Platform: Intel Synopsis: Problems with using xerces Description: We are using xerces to parse xml files. Parsing xml files with DOMParser works fine in standalone application, but when we try to use it in a servlet on Tomcat 3.2 (or later) this bug is reported: File9 = org.xml.sax.SAXParseException: The markup in the document following the root element must be well-formed. at org.apache.xerces.framework.XMLParser.reportError (XMLParser.java:1056) at org.apache.xerces.framework.XMLDocumentScanner.reportFatalXMLError (XMLDocumentScanner.java:626) at org.apache.xerces.framework.XMLDocumentScanner.abortMarkup (XMLDocumentScanner.java:680) at org.apache.xerces.framework.XMLDocumentScanner$TrailingMiscDispatcher. dispatch(XMLDocumentScanner.java:1497) at org.apache.xerces.framework.XMLDocumentScanner.parseSome (XMLDocumentScanner.java:381) at org.apache.xerces.framework.XMLParser.parse (XMLParser.java:948) at com.sparkit.extracta.DomHelper.parseXml(DomHelper.java:98) . . . Title: BugRat Report # 833 BugRat Report # 833 Project: Tomcat Release: 3.2 Category: Bug Report SubCategory: New Bug Report Class: swbug State: received Priority: high Severity: critical Confidence: public Submitter: Dejan Pazin ([EMAIL PROTECTED]) Date Submitted: Jan 24 2001, 05:39:17 CST Responsible: Z_Tomcat Alias ([EMAIL PROTECTED]) Synopsis: Problems with using xerces Environment: (jvm, os, osrel, platform) 1.3, Windows 2000, 5.00.2195, Intel Additional Environment Description: Report Description: We are using xerces to parse xml files. Parsing xml files with DOMParser works fine in standalone application, but when we try to use it in a servlet on Tomcat 3.2 (or later) this bug is reported: File9 = org.xml.sax.SAXParseException: The markup in the document following the root element must be well-formed. at org.apache.xerces.framework.XMLParser.reportError (XMLParser.java:1056) at org.apache.xerces.framework.XMLDocumentScanner.reportFatalXMLError (XMLDocumentScanner.java:626) at org.apache.xerces.framework.XMLDocumentScanner.abortMarkup (XMLDocumentScanner.java:680) at org.apache.xerces.framework.XMLDocumentScanner$TrailingMiscDispatcher. dispatch(XMLDocumentScanner.java:1497) at org.apache.xerces.framework.XMLDocumentScanner.parseSome (XMLDocumentScanner.java:381) at org.apache.xerces.framework.XMLParser.parse (XMLParser.java:948) at com.sparkit.extracta.DomHelper.parseXml(DomHelper.java:98) . . . How To Reproduce: null View this report online... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
BUG #817
Alexander, I tried duplicating this problem (http://znutar.cortexity.com/BugRatViewer/ShowReport/817) and so far it seems work correctly. My root document has page directive like %@ page language="java" contentType="text/html;charset=Shift_JIS" % and contains Japanese text. It also has an include directive like %@ include file="include.html" % The include.html file contains Shift_JIS encoded Japanese text. The Japanese text from both the root and included document are displayed correctly. If you could provide a small example that demonstrates the problem I can try to investigate further. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
BugRat Report #834 has been filed.
Bug report #834 has just been filed. You can view the report at the following URL: http://znutar.cortexity.com/BugRatViewer/ShowReport/834 REPORT #834 Details. Project: Tomcat Category: Bug Report SubCategory: New Bug Report Class: swbug State: received Priority: high Severity: critical Confidence: public Environment: Release: 3.2.1 JVM Release: 1.3 Operating System: Solaris OS Release: 8 Platform: Sun Synopsis: web.xml broken. Jikes compilation broken. Description: Uncommenting the jsp servlet parameter for Jikes compilation doesn't cause jikes to be used as it did in 3.1.1. The servlet-class name for the jsp servlet in web.xml refers to a nonexistent class now: org.apache.jasper.runtime.JspServlet. There is no such class in jasper.jar or in the code. Deleting web.xml entirely has no effect. Problem not present in 3.1.1. Title: BugRat Report # 834 BugRat Report # 834 Project: Tomcat Release: 3.2.1 Category: Bug Report SubCategory: New Bug Report Class: swbug State: received Priority: high Severity: critical Confidence: public Submitter: Tim Taylor ([EMAIL PROTECTED]) Date Submitted: Jan 24 2001, 11:22:56 CST Responsible: Z_Tomcat Alias ([EMAIL PROTECTED]) Synopsis: web.xml broken. Jikes compilation broken. Environment: (jvm, os, osrel, platform) 1.3, Solaris, 8, Sun Additional Environment Description: Report Description: Uncommenting the jsp servlet parameter for Jikes compilation doesn't cause jikes to be used as it did in 3.1.1. The servlet-class name for the jsp servlet in web.xml refers to a nonexistent class now: org.apache.jasper.runtime.JspServlet. There is no such class in jasper.jar or in the code. Deleting web.xml entirely has no effect. Problem not present in 3.1.1. How To Reproduce: null View this report online... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. +1 -- Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
on 1/24/01 10:06 AM, "Larry Isaacs" [EMAIL PROTECTED] wrote: It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. I'm not sure that I agree with this. What if I want to state my approval, but don't want to help out? -jon - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
Larry, First off: +0 Actually, I'm planning on contributing bug fixes and documentation in the mod_jk/ajp areas, so I'm sort of a +.5 -- I don't think I can be one of the core Release Team, but I am planning on committing some real time to supporting this version pre- and post-release. Just so you (or whoever is the RM) knows. Secondly, some of the wording about release dates confused me: At the bottom of the Milestone 2 release (which is scheduled for Feb 8th, one week after M1), it says: "Should that not be the case, this release may be skipped since the beta release is expected a week later." But the Beta release is March 15th -- 5 weeks later. Is M2 supposed to March 8th? -Dan Larry Isaacs wrote: To complete the task of bringing the development on the jakarta-tomcat MAIN branch to a release, I offer the Tomcat 3.3 Release Plan. Though this version of Tomcat contains no major feature enhancements, it does contain a sufficient number of improvements and other changes to warrant being called Tomcat 3.3 to distinguish it from Tomcat 3.2 and its maintenance releases. The Tomcat 3.3 Release Plan may be found at: http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomcat/RELEASE-PLAN-3.3 Since I am volunteering to be the Release Manager for this plan, this document already has my name filled in. However, my support of this plan is not contingent on me being the Release Manager. I am will to support someone else if they wish to volunteer. In addition to the release plan, the STATUS.html document has been updated, and may be found at: http://jakarta.apache.org/cvsweb/index.cgi/~checkout~/jakarta-tomcat/STATUS.html This file documents some of the changes that have been completed and targeted for the milestone 1 release, but doesn't cover all the changes made since Tomcat 3.2. It also includes action items specifically addressing the task of releasing this version of Tomcat. Many of the action items left over from the Tomcat 3.2 version of this document have been moved to the "Ideas For The Future" section at the end. This is based on the assumption that work for these items wasn't completed. If I am in error on one of these items, or you know who should be added as having volunteered on any of them, please let me know. It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. Thanks, Larry Isaacs __ Larry Isaacs [EMAIL PROTECTED] SAS Institute Inc. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] -- Dan Milstein // [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. Is it a request for a vote ? As I understand it, it's a request for a final review of the plan (is that right ?). Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ContextConfig.java
remm01/01/24 11:23:12
Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
Log:
- Replace some FS spcific code with access through a directory context.
- I ran Watchdog 4 again, and everything was still running fine. Since Watchdog is
supposed to use that code (it's loading a TLD file from a JAR), I assume it's
working fine.
Revision ChangesPath
1.40 +24 -25
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ContextConfig.java2001/01/24 02:35:00 1.39
+++ ContextConfig.java2001/01/24 19:23:09 1.40
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.39 2001/01/24 02:35:00 remm Exp $
- * $Revision: 1.39 $
- * $Date: 2001/01/24 02:35:00 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.40 2001/01/24 19:23:09 remm Exp $
+ * $Revision: 1.40 $
+ * $Date: 2001/01/24 19:23:09 $
*
*
*
@@ -83,6 +83,10 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import javax.servlet.ServletContext;
+import javax.naming.NamingException;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.DirContext;
import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.catalina.Authenticator;
import org.apache.catalina.Context;
@@ -112,7 +116,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.39 $ $Date: 2001/01/24 02:35:00 $
+ * @version $Revision: 1.40 $ $Date: 2001/01/24 19:23:09 $
*/
public final class ContextConfig
@@ -861,29 +865,24 @@
// FIXME - Yet another dependence on files
if (debug = 1)
log("Scanning library JAR files");
- ServletContext servletContext = context.getServletContext();
-URL libURL = null;
+DirContext resources = context.getResources();
+String libName = "/WEB-INF/lib";
+DirContext libDir = null;
+// Looking up directory /WEB-INF/lib in the context
try {
-libURL = servletContext.getResource("/WEB-INF/lib");
-} catch (MalformedURLException e) {
-;
+NamingEnumeration enum = resources.list(libName);
+while (enum.hasMoreElements()) {
+NameClassPair ncPair =
+(NameClassPair) enum.nextElement();
+String filename = libName + "/" + ncPair.getName();
+if (!filename.endsWith(".jar"))
+continue;
+tldConfigJar(filename, mapper);
+}
+} catch (NamingException e) {
+// Silent catch: it's valid that no /WEB-INF/lib directory
+//exists
}
-
- if ((libURL != null) "file".equals(libURL.getProtocol())) {
- File libFile = new File(libURL.getFile());
- if (libFile.exists() libFile.canRead()
- libFile.isDirectory()) {
- String filenames[] = libFile.list();
- for (int i = 0; i filenames.length; i++) {
- if (!filenames[i].endsWith(".jar"))
- continue;
-String resourcePath = "/WEB-INF/lib/" + filenames[i];
-if (debug = 2)
-log(" Trying '" + resourcePath + "'");
-tldConfigJar("/WEB-INF/lib/" + filenames[i], mapper);
- }
- }
- }
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.3 Release Plan
-Original Message- From: Remy Maucherat [mailto:[EMAIL PROTECTED]] Sent: Wednesday, January 24, 2001 2:16 PM To: [EMAIL PROTECTED] Subject: Re: [PROPOSAL] Tomcat 3.3 Release Plan It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. Is it a request for a vote ? As I understand it, it's a request for a final review of the plan (is that right ?). This is correct. This isn't the vote. This proposal is being offered for comment and feedback. I think we will need a "go" from the PMC before the vote can take place. Issues about voting I don't think have been finalized. Cheers, Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
Jon Stevens wrote: on 1/24/01 10:06 AM, "Larry Isaacs" [EMAIL PROTECTED] wrote: It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. I'm not sure that I agree with this. What if I want to state my approval, but don't want to help out? By the current understanding of the voting rules, you would say "+0" to mean this. If you disagreed, you would vote "-0" (I don't think this is a good idea, but I'm not going to try to block it) or "-1" (this is a bad idea and should not be done). Under appropriate circumstances (valid reasoning/alternative supplied, decision which requires consensus) a -1 vote is a veto, but release plans don't fall into that category (they require at least 3 +1s, and more +1s than -1s). -jon Craig - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
Jon Stevens wrote: It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. I'm not sure that I agree with this. What if I want to state my approval, but don't want to help out? The consensus seems to be that in the context of a release vote, a "+0" means I agree but may not contribute, and "+1" means I agree and will help. It looks like Larry is trying to keep up with the latest proposal on the jakarta mailing list, as maintained by Ted Husted. Ted originally tried to make a case for a separate set of indicators for approval and committed to make it happen (his specific proposal was a "binding" suffix), but that was voted down in favor of the simpler -1/-0/+0/+1 scheme. Even though Ted's overall proposal hasn't been ratified, this particular provision makes sense to me as there was much concern expressed over the lack of support for previous releases. - Sam Ruby - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
One additional item to be completed before beta: usability enhancements ( easier configuration, better error messages, more documentation on module options ). I volunteer for that ( I'll also include few more pages to the /admin for better monitoring of the running tomcat, etc. ) -- Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.3 Release Plan
-Original Message- From: Sam Ruby [mailto:[EMAIL PROTECTED]] Sent: Wednesday, January 24, 2001 2:28 PM To: [EMAIL PROTECTED] Subject: Re: [PROPOSAL] Tomcat 3.3 Release Plan Jon Stevens wrote: It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. I'm not sure that I agree with this. What if I want to state my approval, but don't want to help out? The consensus seems to be that in the context of a release vote, a "+0" means I agree but may not contribute, and "+1" means I agree and will help. It looks like Larry is trying to keep up with the latest proposal on the jakarta mailing list, as maintained by Ted Husted. Ted originally tried to make a case for a separate set of indicators for approval and committed to make it happen (his specific proposal was a "binding" suffix), but that was voted down in favor of the simpler -1/-0/+0/+1 scheme. Even though Ted's overall proposal hasn't been ratified, this particular provision makes sense to me as there was much concern expressed over the lack of support for previous releases. My understanding it that the text "but to provide maintenance support beyond the release" is a requirement for this release. Is this accurate? If so, we may need a way to distinguish between those who are and aren't committing to maintenance. Both of these +1's should be counted when comparing against -1's. I wouldn't want to lose any potential +1's because they didn't want to commit to maintenance. Whether there are the 3 required committers for maintenance should be a separate issue. Perhaps the vote should include voting for plan approval and a separate indication of willingness to do maintenance? Cheers, Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: [PROPOSAL] Tomcat 3.3 Release Plan
-Original Message- From: Craig R. McClanahan [mailto:[EMAIL PROTECTED]] Sent: Wednesday, January 24, 2001 3:15 PM To: [EMAIL PROTECTED] Subject: Re: [PROPOSAL] Tomcat 3.3 Release Plan Larry Isaacs wrote: If so, we may need a way to distinguish between those who are and aren't committing to maintenance. Both of these +1's should be counted when comparing against -1's. I wouldn't want to lose any potential +1's because they didn't want to commit to maintenance. Whether there are the 3 required committers for maintenance should be a separate issue. IMHO, having people vote +0 instead of +1 if they like the idea but don't have time to support it is *precisely* what you want. Otherwise, you can get into a scenario of a ton of +1s that say "great idea, as long as someone else does all the work", and where does that leave you? Craig Oops. I oversimplified my wording. A +1 without committing to mainentance would still be a commitment to help with the release. Just not a commitment to go beyond the release. Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspParseEventListener.java
horwat 01/01/24 12:26:39
Modified:jasper/src/share/org/apache/jasper/compiler
JspParseEventListener.java
Log:
Fix _jspx_init() thread safety
BR 157
Revision ChangesPath
1.21 +11 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JspParseEventListener.java2000/12/22 18:37:39 1.20
+++ JspParseEventListener.java2001/01/24 20:26:39 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.20 2000/12/22 18:37:39 pierred Exp $
- * $Revision: 1.20 $
- * $Date: 2000/12/22 18:37:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.21 2001/01/24 20:26:39 horwat Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/01/24 20:26:39 $
*
*
*
@@ -333,8 +333,16 @@
writer.println();
writer.println("if (_jspx_inited == false) {");
writer.pushIndent();
+ writer.println("synchronized (this) {");
+writer.pushIndent();
+writer.println("if (_jspx_inited == false) {");
+writer.pushIndent();
writer.println("_jspx_init();");
writer.println("_jspx_inited = true;");
+writer.popIndent();
+writer.println("}");
+writer.popIndent();
+writer.println("}");
writer.popIndent();
writer.println("}");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: Tools.jar
Title: Tools.jar Eitan, I don't think that tools.jar is needed for "normal activity". We redistribute Tomcat with the JRE and don't have any issues. If you need tools.jar to compile JSPs, try pre-compiling them and distributing the resulting .class files with your product. If this is not an option, well... Glenn. -Original Message-From: eitan golan (Kamoon IL) [mailto:[EMAIL PROTECTED]]Sent: Tuesday, January 23, 2001 10:51 AMTo: '[EMAIL PROTECTED]'; '[EMAIL PROTECTED]'Subject: Tools.jar Hello there boys and Girls I have a license issue 1. Sun JDK's license is for non commercial or production use 2. For Production and commercial use they give the JRE 3. Tools.jar is a part of the JDK and is missing from the JRE 4. Tomcat needs Tools.jar for it's normal activity result : Cant put Tomcat on production or commercial use Any Solutions ? Eitan GolanMIS KAMOON 29 Bezalel St. Ramat Gan, 52521 ISRAEL +972 (3) 6129922 ext. 205 +972 (3) 6129923 Fax +972 (58) 638845 Mobile www.Kamoon.com
Re: [PROPOSAL] Tomcat 3.3 Release Plan
Larry Isaacs wrote: -Original Message- From: Craig R. McClanahan [mailto:[EMAIL PROTECTED]] Sent: Wednesday, January 24, 2001 3:15 PM To: [EMAIL PROTECTED] Subject: Re: [PROPOSAL] Tomcat 3.3 Release Plan Larry Isaacs wrote: If so, we may need a way to distinguish between those who are and aren't committing to maintenance. Both of these +1's should be counted when comparing against -1's. I wouldn't want to lose any potential +1's because they didn't want to commit to maintenance. Whether there are the 3 required committers for maintenance should be a separate issue. IMHO, having people vote +0 instead of +1 if they like the idea but don't have time to support it is *precisely* what you want. Otherwise, you can get into a scenario of a ton of +1s that say "great idea, as long as someone else does all the work", and where does that leave you? Craig Oops. I oversimplified my wording. A +1 without committing to mainentance would still be a commitment to help with the release. Just not a commitment to go beyond the release. OK, i see the distinction you're drawing now. Hans told us he is going to submit (on GENERAL) his proposed revisions and clarifications to the voting rules sometime today -- if you care about these issues, and are not yet subscribed there, I would suggest doing so (send an empty message to [EMAIL PROTECTED]). Larry Craig - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
This has probably already been covered, but just to be sure... Once the proposed revisions and clarifications have been decided on (on GENERAL), can the final product be posted to this list? I do want to understand what my votes mean, but I am not planning on subscribing to the GENERAL list (I don't want to sit in on the debate, just understand the outcome). -Dan Hans told us he is going to submit (on GENERAL) his proposed revisions and clarifications to the voting rules sometime today -- if you care about these issues, and are not yet subscribed there, I would suggest doing so (send an empty message to [EMAIL PROTECTED]). Craig - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] -- Dan Milstein // [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
Dan Milstein wrote: This has probably already been covered, but just to be sure... Once the proposed revisions and clarifications have been decided on (on GENERAL), can the final product be posted to this list? I do want to understand what my votes mean, but I am not planning on subscribing to the GENERAL list (I don't want to sit in on the debate, just understand the outcome). A pointer to them should be posted here, but the official home for all the policies and procedures will be on the Jakarta web site (once it's updated as necessary). -Dan Craig Hans told us he is going to submit (on GENERAL) his proposed revisions and clarifications to the voting rules sometime today -- if you care about these issues, and are not yet subscribed there, I would suggest doing so (send an empty message to [EMAIL PROTECTED]). Craig - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] -- Dan Milstein // [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: Tools.jar
Glenn Twiggs wrote: I don't think that tools.jar is needed for "normal activity". We redistribute Tomcat with the JRE and don't have any issues. If you need tools.jar to compile JSPs, try pre-compiling them and distributing the resulting .class files with your product. If this is not an option, well... another option is Jikes. - Sam Ruby - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
Dan Milstein wrote: This has probably already been covered, but just to be sure... Once the proposed revisions and clarifications have been decided on (on GENERAL), can the final product be posted to this list? I do want to understand what my votes mean, but I am not planning on subscribing to the GENERAL list (I don't want to sit in on the debate, just understand the outcome). If the vote passes, I will update the guideline documents on the web site and announce it on this list and on the GENERAL list. Hans -- Hans Bergsten [EMAIL PROTECTED] Gefion Software http://www.gefionsoftware.com Author of JavaServer Pages (O'Reilly), http://TheJSPBook.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Tools.jar
REanother option is Jikes. Dare I say, better? I think most would agree. -Matthew - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationContext.java
remm01/01/24 14:39:57
Modified:catalina/src/share/org/apache/catalina/core
ApplicationContext.java
Log:
- Reimplement ServletContext.getResourcePaths() using directory contexts
(instead of Resources).
Revision ChangesPath
1.12 +36 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApplicationContext.java 2001/01/23 06:14:20 1.11
+++ ApplicationContext.java 2001/01/24 22:39:56 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.11 2001/01/23 06:14:20 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/01/23 06:14:20 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.12 2001/01/24 22:39:56 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/01/24 22:39:56 $
*
*
*
@@ -75,6 +75,8 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
+import javax.naming.NamingException;
+import javax.naming.Binding;
import javax.naming.directory.DirContext;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
@@ -105,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.11 $ $Date: 2001/01/23 06:14:20 $
+ * @version $Revision: 1.12 $ $Date: 2001/01/24 22:39:56 $
*/
public final class ApplicationContext
@@ -475,19 +477,18 @@
public Set getResourcePaths() {
ResourceSet set = new ResourceSet();
-// FIXME !
-/*
-Resources resources = context.getResources();
+DirContext resources = context.getResources();
if (resources == null) {
set.setLocked(true);
return (set);
+}
+
+try {
+listPaths(set, resources, "");
+} catch (NamingException e) {
+// Ignore
}
-String paths[] = resources.getResourcePaths();
-if (paths == null)
-paths = new String[0];
-for (int i = 0; i paths.length; i++)
-set.add(paths[i]);
-*/
+
set.setLocked(true);
return (set);
@@ -728,6 +729,28 @@
}
}
parameters = results;
+
+}
+
+
+/**
+ * List resource paths (recursively), and store all of them in the given
+ * Set.
+ */
+private static void listPaths(Set set, DirContext resources, String path)
+throws NamingException {
+
+Enumeration childPaths = resources.listBindings(path);
+while (childPaths.hasMoreElements()) {
+Binding binding = (Binding) childPaths.nextElement();
+String name = binding.getName();
+String childPath = path + "/" + name;
+set.add(childPath);
+Object object = binding.getObject();
+if (object instanceof DirContext) {
+listPaths(set, resources, childPath);
+}
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
BugRat Report #835 has been filed.
Bug report #835 has just been filed. You can view the report at the following URL: http://znutar.cortexity.com/BugRatViewer/ShowReport/835 REPORT #835 Details. Project: Tomcat Category: Bug Report SubCategory: New Bug Report Class: swbug State: received Priority: high Severity: critical Confidence: public Environment: Release: 1 JVM Release: 1.2 Operating System: NT OS Release: NT 2000 Platform: NT Synopsis: Renaming XML as JSP causes errors on IE Description: When I rename an XML file as JSP, make no changes, and attempt to access it from IE5, there is a error on the client side. Title: BugRat Report # 835 BugRat Report # 835 Project: Tomcat Release: 1 Category: Bug Report SubCategory: New Bug Report Class: swbug State: received Priority: high Severity: critical Confidence: public Submitter: Raghu Bala ([EMAIL PROTECTED]) Date Submitted: Jan 24 2001, 05:10:10 CST Responsible: Z_Tomcat Alias ([EMAIL PROTECTED]) Synopsis: Renaming XML as JSP causes errors on IE Environment: (jvm, os, osrel, platform) 1.2, NT, NT 2000, NT Additional Environment Description: Report Description: When I rename an XML file as JSP, make no changes, and attempt to access it from IE5, there is a error on the client side. View this report online... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
FW: cvs commit:jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warpWarpConnection.java WarpConnectionHandler.java WarpConnector.javaWarpConstants.java WarpContext.java WarpDebug.java WarpEngine.javaWarpEngineMapper.java WarpHandler.java WarpHandlerTable.java WarpHost.javaWarpInputStream.java WarpOutputStream.java WarpPacket.java WarpReader.javaWarpRequest.java WarpRequestHandler.java WarpResponse.java WarpTable.javaMakefile
Another big one... -- Pier Fumagalli mailto:[EMAIL PROTECTED] -- Forwarded Message From: [EMAIL PROTECTED] Date: 24 Jan 2001 23:11:14 - To: [EMAIL PROTECTED] Subject: failure notice Return-Path: [EMAIL PROTECTED] Received: (qmail 64409 invoked by uid 500); 24 Jan 2001 23:11:10 - Delivered-To: [EMAIL PROTECTED] Received: (qmail 64328 invoked by uid 1023); 24 Jan 2001 23:11:06 - Date: 24 Jan 2001 23:11:06 - Message-ID: [EMAIL PROTECTED] From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp WarpConnection.java WarpConnectionHandler.java WarpConnector.java WarpConstants.java WarpContext.java WarpDebug.java WarpEngine.java WarpEngineMapper.java WarpHandler.java WarpHandlerTable.java WarpHost.java WarpInputStream.java WarpOutputStream.java WarpPacket.java WarpReader.java WarpRequest.java WarpRequestHandler.java WarpResponse.java WarpTable.java Makefile pier01/01/24 15:11:05 Modified:catalina/src/share/org/apache/catalina/connector/warp WarpConnection.java WarpConnectionHandler.java WarpConnector.java WarpConstants.java WarpContext.java WarpDebug.java WarpEngine.java WarpEngineMapper.java WarpHandler.java WarpHandlerTable.java WarpHost.java WarpInputStream.java WarpOutputStream.java WarpPacket.java WarpReader.java WarpRequest.java WarpRequestHandler.java WarpResponse.java WarpTable.java Removed: catalina/src/share/org/apache/catalina/connector/warp Makefile Log: Rollback after failing commit. -- End of Forwarded Message - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PROPOSAL] Tomcat 3.3 Release Plan
At 10:49 24/1/01 -0800, Jon Stevens wrote: on 1/24/01 10:06 AM, "Larry Isaacs" [EMAIL PROTECTED] wrote: It should be noted that when this plan comes up for a vote, a +1 by a committer will constitute a commitment not only to helping with the release, but to provide maintenance support beyond the release. I'm not sure that I agree with this. What if I want to state my approval, but don't want to help out? You would "+0" it ;) Cheers, Pete *-* | "Faced with the choice between changing one's mind, | | and proving that there is no need to do so - almost | | everyone gets busy on the proof." | | - John Kenneth Galbraith | *-* - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: cvs commit:jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warpWarpConnection.java WarpConnectionHandler.java WarpConnector.javaWarpConstants.java WarpContext.java WarpDebug.java WarpEngine.javaWarpEngineMapper.java WarpHandler.java WarpHandlerTable.java WarpHost.javaWarpInputStream.java WarpOutputStream.java WarpPacket.java WarpReader.javaWarpRequest.java WarpRequestHandler.java WarpResponse.java WarpTable.javaMakefile
on 1/24/01 3:23 PM, "Pier Fumagalli" [EMAIL PROTECTED] wrote: Another big one... -- Pier Fumagalli mailto:[EMAIL PROTECTED] One thing that I have asked (several times now) is that commits be made smaller by doing them in chunks instead (everyone agreed). I know you are just rolling back this time, but in the future, it would be nice to see smaller commit's and more messages... :-) thanks! -jon - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
BugRat Report #791 was closed (apparently by: Marc Saegesser)
Report #791 was closed by Person #0 Synopsis: JDBCRealm: authenticating a user that is not in any groups results in ArrayIndexOutOfBoundException if logging is on (logged in as: Marc Saegesser) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes TroubleShooter.java
pier01/01/24 16:42:15
Added: webapps/examples/WEB-INF/classes TroubleShooter.java
Log:
Added a TroubleShooter servlet (like SnoopServlet, but better)
Revision ChangesPath
1.1
jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/TroubleShooter.java
Index: TroubleShooter.java
===
/* $Id: TroubleShooter.java,v 1.1 2001/01/25 00:42:15 pier Exp $
*
*/
import java.io.IOException;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Enumeration;
import javax.servlet.*;
import javax.servlet.http.*;
public class TroubleShooter extends HttpServlet {
public void printHeader(PrintWriter out, String header) {
out.println(" tr");
out.println("td bgcolor=\"#99\" colspan=\"2\"");
out.println(" b"+header+"/b");
out.println("/td");
out.println(" /tr");
}
public void printValue(PrintWriter out, String key, String val) {
out.println(" tr");
out.println("td bgcolor=\"#cc\""+key+"/td");
out.println("td bgcolor=\"#ff\""+val+"/td");
out.println(" /tr");
}
public void printVoid(PrintWriter out) {
out.println(" trtd bgcolor=\"#ff\" colspan=\"2\"nbsp;/td/tr");
}
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
doGet(request,response);
}
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/html");
out.println("html");
out.println(" head");
out.println(" titleTroubleShooter Servlet Output/title");
out.println(" /head");
out.println(" body");
out.println(" center");
out.println(" h2TroubleShooter Servlet Output/h2");
String
url=request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getRequestURI();
out.println(" table border=\"0\" cellspacing=\"2\" cellpadding=\"2\"");
out.println("tr");
out.println(" td");
out.println(" form action=\""+url+"\" method=\"GET\"");
out.println(" input type=\"hidden\" name=\"hiddenName\"
value=\"hiddenValue\"");
out.println(" input type=\"submit\" name=\"submitName\"
value=\"Submit using GET\"");
out.println(" /form");
out.println(" /td");
out.println(" td");
out.println(" form action=\""+url+"\" method=\"POST\"");
out.println(" input type=\"hidden\" name=\"hiddenName\"
value=\"hiddenValue\"");
out.println(" input type=\"submit\" name=\"submitName\"
value=\"Submit using POST\"");
out.println(" /form");
out.println(" /td");
out.println(" td");
out.println(" form enctype=\"multipart/form-data\" action=\""+url+"\"
method=\"POST\"");
out.println(" input type=\"hidden\" name=\"hiddenName\"
value=\"hiddenValue\"");
out.println(" input type=\"submit\" name=\"submitName\"
value=\"Submit using POST with quot;multipart/form-dataquot; encoding\"");
out.println(" /form");
out.println(" /td");
out.println("/tr");
out.println(" /table");
out.println(" /center");
out.println(" br");
out.println(" table width=\"100%\" border=\"1\" cellspacing=\"0\"
cellpadding=\"1\"");
printHeader(out,"Servlet init parameters:");
Enumeration enum = getInitParameterNames();
while (enum.hasMoreElements()) {
String key = (String)enum.nextElement();
String val = getInitParameter(key);
printValue(out,key,val);
}
printVoid(out);
printHeader(out,"Context init parameters:");
ServletContext context = getServletContext();
enum = context.getInitParameterNames();
while (enum.hasMoreElements()) {
String key = (String)enum.nextElement();
Object val = context.getInitParameter(key);
printValue(out,key,val.toString());
}
printVoid(out);
printHeader(out,"Context attributes:");
enum = context.getAttributeNames();
while (enum.hasMoreElements()) {
String key = (String)enum.nextElement();
Object val = context.getAttribute(key);
printValue(out,key,val.toString());
}
printVoid(out);
printHeader(out,"Request
Re: cvs commit:jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warpWarpConnection.java WarpConnectionHandler.java WarpConnector.javaWarpConstants.java WarpContext.java WarpDebug.java WarpEngine.javaWarpEngineMapper.java WarpHandler.java WarpHandlerTable.java WarpHost.javaWarpInputStream.java WarpOutputStream.java WarpPacket.java WarpReader.javaWarpRequest.java WarpRequestHandler.java WarpResponse.java WarpTable.javaMakefile
Jon Stevens [EMAIL PROTECTED] wrote: on 1/24/01 3:23 PM, "Pier Fumagalli" [EMAIL PROTECTED] wrote: Another big one... -- Pier Fumagalli mailto:[EMAIL PROTECTED] One thing that I have asked (several times now) is that commits be made smaller by doing them in chunks instead (everyone agreed). I know you are just rolling back this time, but in the future, it would be nice to see smaller commit's and more messages... Will do... Pier -- Pier Fumagalli mailto:[EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
jakarta-watchdog-4.0 fixes
jakarta-watchdog-4.0 needs two things fixed: 1. build.sh uses the shell /bin/bash instead of /bin/sh 2. build.xml refers to jakarta-servletapi-4 instead of jakarta-servletapi-4.0 I would commit these fixes, but I don't have commit for jakarta-watchdog-4.0 Regards, Glenn -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
horwat 01/01/24 18:46:03
Modified:jasper/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
Log:
If real file does exist, use the context to get the resource.
Revision ChangesPath
1.17 +11 -9
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TagLibraryInfoImpl.java 2000/12/08 20:45:12 1.16
+++ TagLibraryInfoImpl.java 2001/01/25 02:46:02 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.16 2000/12/08 20:45:12 pierred Exp $
- * $Revision: 1.16 $
- * $Date: 2000/12/08 20:45:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.17 2001/01/25 02:46:02 horwat Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/01/25 02:46:02 $
*
* The Apache Software License, Version 1.1
*
@@ -150,15 +150,17 @@
private InputStream getResourceAsStream(String uri)
throws FileNotFoundException
{
-if (uri.indexOf(":") 0) {
-// may be fully qualified (Windows) or may be a URL. Let
-// getResourceAsStream deal with it.
-return ctxt.getResourceAsStream(uri);
-} else {
-// assume it translates to a real file, and use getRealPath
+try {
+// see if file exists on the filesystem first
String real = ctxt.getRealPath(uri);
return (real == null) ? null : new FileInputStream(real);
}
+catch (FileNotFoundException ex) {
+// if file not found on filesystem, get the resource through
+// the context
+return ctxt.getResourceAsStream(uri);
+}
+
}
public TagLibraryInfoImpl(JspCompilationContext ctxt, String prefix,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/compat Action.java Jdk11Compat.java Jdk12Support.java
costin 01/01/24 21:07:40
Modified:.build.xml
src/etc server.xml tomcat.policy
src/facade22/org/apache/tomcat/facade
RequestDispatcherImpl.java
src/share/org/apache/tomcat/core BaseInterceptor.java
src/share/org/apache/tomcat/modules/config
LoaderInterceptor11.java PolicyInterceptor.java
ServerXmlInterceptor.java
src/share/org/apache/tomcat/modules/generators
Jdk12Interceptor.java
src/share/org/apache/tomcat/modules/session
SimpleSessionStore.java
Added: src/share/org/apache/tomcat/modules/config PolicyLoader.java
src/share/org/apache/tomcat/util/compat Action.java
Jdk11Compat.java Jdk12Support.java
Log:
Fixes and changes for JDK1.1 support.
The build on 1.1 was broken for few weeks, and I hope this solution
will improve the things a bit (in addition, I'll check the nightly 1.1
build until we're done ).
The util.compat package contains a helper that will avoid the use of
introspection or other (complex) solutions to maintain 1.1 compatibility.
It's just a small wrapper around common methods, with 2 implementations -
one for jdk1.1 ( doing nothing for doPriviledged, returning SimpleClassLoader,
etc) and one for jdk1.2+ ( wrapping and performing PriviledgedAction,
returning the URLClassLoader, etc).
As a result:
- LoaderInterceptor12 is no longer needed
- LoaderInterceptor11 will automatically use URLClassLoader if in Java2
environment, no need to edit server.xml for that
- Jdk12Interceptor compiles and can be loaded in jdk1.1. It'll do
java2 tasks if java2 is detected ( there is another trick to add it only
if needed - see next )
- and of course, it builds and work fine on JDK1.1 ( again )
As a related change, PolicyInterceptor will be automatically
loaded if Java2 is detected and a security manager is set (or a
secure option is set on the contextmanager ). To do that we use
PolicyLoader, that detect the conditions where we want sandboxing
and if java2 is available and loads the "real" policy interceptor.
That simplifies a lot the configuration, we no longer need to explain
how to change the config just to run JNDI in java2 environment.
I also added the permissions needed to run /admin in a sandbox, there
are few tests that are failing in sandbox - I'm working on a fix
( but probably next week, I have a deadline for monday )
Also, added a small comment ( to be expanded ) in BaseInterceptor.
Revision ChangesPath
1.106 +3 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- build.xml 2001/01/22 16:42:00 1.105
+++ build.xml 2001/01/25 05:07:32 1.106
@@ -107,6 +107,7 @@
!-- no dependencies --
include name="org/apache/tomcat/util/**"/
exclude name="**/util/net/SSLSocketFactory.java" unless="jsse.present"/
+ exclude name="**/util/compat/Jdk12Support.java" unless="jdk12.present"/
/javac
jar jarfile="${tomcat.build}/lib/tomcat_util.jar"
basedir="${tomcat.build}/classes"
@@ -238,9 +239,10 @@
pathelement location="${tomcat.build}/lib/tomcat_core.jar"/
/classpath
include name="org/apache/tomcat/modules/**"/
- exclude
+ !-- exclude
name="org/apache/tomcat/modules/generators/Jdk12Interceptor.java"
unless="jdk12.present"/
+ --
exclude
name="org/apache/tomcat/modules/config/LoaderInterceptor12.java"
unless="jdk12.present"/
1.60 +6 -3 jakarta-tomcat/src/etc/server.xml
Index: server.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- server.xml2001/01/01 02:07:23 1.59
+++ server.xml2001/01/25 05:07:33 1.60
@@ -112,6 +112,9 @@
ContextInterceptor
className="org.apache.tomcat.facade.WebXmlReader" /
+ContextInterceptor
+className="org.apache.tomcat.modules.config.PolicyLoader" /
+
!-- Uncomment out if you have JDK1.2 and want to implement
the Java SecurityManager
ContextInterceptor
@@ -149,11 +152,11 @@
className="org.apache.tomcat.modules.mappers.SimpleMapper1"
debug="0" /
-!-- fix the context class loader, other JDK1.2 specific code
+!-- fix the context class loader, other JDK1.2 specific code --
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util XMLWriter.java
remm01/01/24 21:39:03
Modified:catalina/src/share/org/apache/catalina/util XMLWriter.java
Log:
- Adds streaming capabilities to the XML writer.
Revision ChangesPath
1.4 +31 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/XMLWriter.java
Index: XMLWriter.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/XMLWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLWriter.java2000/11/09 07:23:05 1.3
+++ XMLWriter.java2001/01/25 05:39:02 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/XMLWriter.java,v
1.3 2000/11/09 07:23:05 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2000/11/09 07:23:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/XMLWriter.java,v
1.4 2001/01/25 05:39:02 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/01/25 05:39:02 $
*
*
*
@@ -63,10 +63,13 @@
package org.apache.catalina.util;
+import java.io.IOException;
+import java.io.Writer;
+
/**
* XMLWriter helper class.
*
- * @author Remy Maucherat
+ * @author a href="mailto:[EMAIL PROTECTED]"Remy Maucherat/a
*/
public class XMLWriter {
@@ -98,9 +101,15 @@
/**
* Buffer.
*/
-protected StringBuffer buffer;
+protected StringBuffer buffer = new StringBuffer();
+
+/**
+ * Writer.
+ */
+protected Writer writer = null;
+
// --- Constructors
@@ -108,10 +117,17 @@
* Constructor.
*/
public XMLWriter() {
-buffer = new StringBuffer();
}
+/**
+ * Constructor.
+ */
+public XMLWriter(Writer writer) {
+this.writer = writer;
+}
+
+
// - Public Methods
@@ -138,6 +154,7 @@
writeElement(namespace, namespaceInfo, name, OPENING);
buffer.append(value);
writeElement(namespace, namespaceInfo, name, CLOSING);
+
}
@@ -244,16 +261,19 @@
* Write XML Header.
*/
public void writeXMLHeader() {
-buffer.append("?xml version=\"1.0\"?\n");
+buffer.append("?xml version=\"1.0\" encoding=\"utf-8\" ?\n");
}
/**
- * Write XML Header.
+ * Send data and reinitializes buffer.
*/
-public void writeXMLHeader(String encoding) {
-buffer.append("?xml version=\"1.0\" encoding=\"" + encoding
- + "\"?\n");
+public void sendData()
+throws IOException {
+if (writer != null) {
+writer.write(buffer.toString());
+buffer = new StringBuffer();
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java WebdavServlet.java
remm01/01/24 21:45:41
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java WebdavServlet.java
Log:
- Update PROPFIND to use streaming (as the response could get very big).
- Fix a bug where href elements could include incorrect paths containing "//".
- Avoid putting the '' character in the XML response.
Revision ChangesPath
1.21 +13 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultServlet.java 2001/01/23 04:47:57 1.20
+++ DefaultServlet.java 2001/01/25 05:45:40 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.20 2001/01/23 04:47:57 remm Exp $
- * $Revision: 1.20 $
- * $Date: 2001/01/23 04:47:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.21 2001/01/25 05:45:40 remm Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/01/25 05:45:40 $
*
*
*
@@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.20 $ $Date: 2001/01/23 04:47:57 $
+ * @version $Revision: 1.21 $ $Date: 2001/01/25 05:45:40 $
*/
public class DefaultServlet
@@ -911,6 +911,15 @@
if (index 0)
break;
normalized = normalized.substring(0, index) + "%20"
+ + normalized.substring(index + 1);
+ }
+
+ // Replace "" with "%26"
+while (true) {
+ int index = normalized.indexOf("");
+ if (index 0)
+ break;
+ normalized = normalized.substring(0, index) + "%26"
+ normalized.substring(index + 1);
}
1.11 +23 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
Index: WebdavServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WebdavServlet.java2001/01/23 04:47:57 1.10
+++ WebdavServlet.java2001/01/25 05:45:40 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
1.10 2001/01/23 04:47:57 remm Exp $
- * $Revision: 1.10 $
- * $Date: 2001/01/23 04:47:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
1.11 2001/01/25 05:45:40 remm Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/01/25 05:45:40 $
*
*
*
@@ -124,7 +124,7 @@
* are handled by the DefaultServlet.
*
* @author Remy Maucherat
- * @version $Revision: 1.10 $ $Date: 2001/01/23 04:47:57 $
+ * @version $Revision: 1.11 $ $Date: 2001/01/25 05:45:40 $
*/
public class WebdavServlet
@@ -507,7 +507,7 @@
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
// Create multistatus object
-XMLWriter generatedXML = new XMLWriter();
+XMLWriter generatedXML = new XMLWriter(resp.getWriter());
generatedXML.writeXMLHeader();
generatedXML.writeElement(null, "multistatus"
@@ -543,7 +543,7 @@
NameClassPair ncPair =
(NameClassPair) enum.nextElement();
String newPath = currentPath;
-if (!newPath.equals("/"))
+if (!(newPath.endsWith("/")))
newPath += "/";
newPath += ncPair.getName();
stackBelow.push(newPath);
@@ -581,15 +581,21 @@
stackBelow = new Stack();
}
+generatedXML.sendData();
+
}
}
generatedXML.writeElement(null, "multistatus",
XMLWriter.CLOSING);
+generatedXML.sendData();
+
+/*
Writer writer = resp.getWriter();
writer.write(generatedXML.toString());
writer.flush();
+*/
}
@@ -1906,8 +1912,9 @@
