DO NOT REPLY [Bug 11117] - Coyote connector does not correctly deal with large PUT when using chunked transfer encoding
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7
Coyote connector does not correctly deal with large PUT when using chunked transfer
encoding
--- Additional Comments From [EMAIL PROTECTED] 2002-08-01 07:14 ---
Problem diagnosed, patch attached.
The detailed cause:
This code sets a particular buffer in a ByteChunk, and sets a specific start/end
to this buffer. This allows sharing of the buffers, rather than copying them
around.
In this code, the buffer was set (in chunk - the output ByteChunk) as pointing
to some part of the buffer in readChunk (the input ByteChunk), which is fine.
However, in one particular code path, this was immediately followed by a call to
parseCRLF() - which simply swallows a CRLF pair. In the very unfortunate event
(which happened on sufficiently large inputs with some regularity) of this CRLF
being over the end of the buffer, more content would need to be read in order to
do this. This refilled readChunk, but because this was shared with the (output)
chunk, the output buffer was _also_ overwritten. Output is then corrupted.
This is fixed here by deferring the parseCRLF() until later (the next call to
doRead())
This fix is critical for PUT (and presumably things like POST, or anything else
with a request-body) to work reliably with chunked transfer-encoding.
Index: filters/ChunkedInputFilter.java
===
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java,v
retrieving revision 1.5
diff -u -r1.5 ChunkedInputFilter.java
--- filters/ChunkedInputFilter.java 20 Jun 2002 11:14:30 - 1.5
+++ filters/ChunkedInputFilter.java 1 Aug 2002 07:13:44 -
@@ -136,6 +136,12 @@
*/
protected boolean endChunk = false;
+/**
+ * Flag set to true if the next call to doRead() must parse a CRLF pair
+ * before doing anything else.
+ */
+protected boolean needCRLFParse = false;
+
// - Properties
@@ -158,6 +164,11 @@
if (endChunk)
return -1;
+if(needCRLFParse) {
+needCRLFParse = false;
+parseCRLF();
+}
+
if (remaining = 0) {
if (!parseChunkHeader()) {
throw new IOException(Invalid chunk);
@@ -184,7 +195,7 @@
chunk.setBytes(buf, pos, remaining);
pos = pos + remaining;
remaining = 0;
-parseCRLF();
+needCRLFParse = true;
}
return result;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 11328] - Invocation of getWriter() during RequestDispatcher.foward()
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11328. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11328 Invocation of getWriter() during RequestDispatcher.foward() [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 11115] - Shell scripts not executable
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5 Shell scripts not executable [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-08-01 12:19 --- This should be fixed in the latest nightly. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 11307] - Deadlock in ClassLoader
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11307. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11307 Deadlock in ClassLoader --- Additional Comments From [EMAIL PROTECTED] 2002-08-01 12:54 --- java version 1.3.1_03 Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.1_03-b03) Java HotSpot(TM) Client VM (build 1.3.1_03-b03, mixed mode) Sorry, I wish I had time to produce an example, but that's just not going to be possible right now given my current employment duties. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 11366] New: - Handling of Wrapped Responses
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11366. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11366 Handling of Wrapped Responses Summary: Handling of Wrapped Responses Product: Tomcat 4 Version: 4.0.3 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] When forwarding a request to a resource that sets status HttpServletResponse.SC_NOT_FOUND the server treats wrapped responses differently from unwrapped responses: For an unwrapped response 404 is correctly signalled to the web browser, while with a wrapped response the browser waits indefinitely (IE 5.5) or signals an empty response (Netscape 4.6). wget on the other hand does seem to recognize the 404 in both cases correctly. I'll include an example app. If you install it and click on links 1. and 2. you'll see 404. When clicking on link 3. you'll see the phenomenon described above. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 11366] - Handling of Wrapped Responses
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11366. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11366 Handling of Wrapped Responses --- Additional Comments From [EMAIL PROTECTED] 2002-08-01 13:10 --- Created an attachment (id=2556) Example web app to reproduce the phenomenon -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
How can I ckeck how many users are connected to a Web Site?
Hello everybody! I would like to know if it is possible to know in any moment how many users are connected to a Web Site. How can I do this? Thanks a lot in advance! Luca -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: How can I ckeck how many users are connected to a Web Site?
Hi Luca, If your website has a login system then you can increment a counter in a database each time someone logs in, and decrement it when they log out. You can then build a private admin web page that views the counter. The problem with this method is that many people just close their browser without logging out from websites. A way to solve the logging out problem is to store a last active timestamp against each logged in user and to update it each time they request a page (you'll need to use cookies / sessions to identify the actions of each user). You can assume that a user has logged out once a certain period of inactivity has occurred. If you don't have a login system on your website, you could use the IP address of the user making the request and combine this with the inactivity tracking system mentioned above. Hope this helps, Regards, Chris Newland -Original Message- From: Luca Ventura [mailto:[EMAIL PROTECTED]] Sent: 01 August 2002 14:13 To: tomcat-dev Subject: How can I ckeck how many users are connected to a Web Site? Hello everybody! I would like to know if it is possible to know in any moment how many users are connected to a Web Site. How can I do this? Thanks a lot in advance! Luca -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: How can I ckeck how many users are connected to a Web Site?
Hi, Perhaps the Interface HttpSessionListener (servlet 2.3+ spec only!) could be used? Dan -Original Message- From: Luca Ventura [mailto:[EMAIL PROTECTED]] Sent: 01 August 2002 14:13 To: tomcat-dev Subject: How can I ckeck how many users are connected to a Web Site? Hello everybody! I would like to know if it is possible to know in any moment how many users are connected to a Web Site. How can I do this? Thanks a lot in advance! Luca -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
Justyna Horwat wrote: I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. There are a couple issues which should be fixed first if possible (see the i18n bugs in BZ). Note that the branch will be created when we actually start to make API changes. For the new API support, I was planning to add a new Tomcat 5 adapter (next to the Tomcat 3 and Tomcat 4 adapters). Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Diffie Hellman
Hi, does Tomcat support the Diffie-Hellman Key Agreement Method, when it is ssl enabled ? If not is it possible to make Tomcat-ssl use Diffie-Helman instead then RSA, so that Tomcat does not need a certificate when started in ssl mode ? many thanks Andrea -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
On Wed, 31 Jul 2002, Peter Lin wrote: Justyna Horwat wrote:I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. What kind of changes ? Coyote should be independent of servlet, if you need to add something you can add it to the main branch. 2.4 should be backward compatible - so it shouldn't change any behavior. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] [jakarta-servletapi-5]
Hi , attached is the remaining XML schema that need to be available locally. src/share/dtd/j2ee_1_4.xsd src/share/dtd/web-app_2_4.xsd src/share/dtd/jsp_2_0.xsd src/share/dtd/jsptaglibrary_2_0.xsd Thanks, -- Jeanfrancois jakarta-servletapi- 5_localschema.zip Description: Zip compressed data -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [PATCH] [jakarta-servletapi-5]
Jean-François, These are already in the jakarta-servletapi-5 workspace and will be available in servlet.jar with the patch to jakarta-servletapi-5/build.xml that I posted last night. So, this patch should *not* be applied. Patrick Jean-francois Arcand wrote: Hi , attached is the remaining XML schema that need to be available locally. src/share/dtd/j2ee_1_4.xsd src/share/dtd/web-app_2_4.xsd src/share/dtd/jsp_2_0.xsd src/share/dtd/jsptaglibrary_2_0.xsd Thanks, -- Jeanfrancois -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- Patrick Luby Email: [EMAIL PROTECTED] Sun Microsystems Phone: 408-276-7471 901 San Antonio Road, USCA14-303 Palo Alto, CA 94303-4900 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 BUILDING.txt build.properties.default build.xml
patrickl2002/08/01 07:30:36
Modified:.BUILDING.txt build.properties.default build.xml
Log:
Require use of Xerces 2.0.1 since I found that it does support XML schemas without
throwing a StockOverflow exception. Previously, I thought that only the HEAD branch of
Xerces 2 fixed this problem.
Revision ChangesPath
1.9 +12 -5 jakarta-tomcat-5/BUILDING.txt
Index: BUILDING.txt
===
RCS file: /home/cvs/jakarta-tomcat-5/BUILDING.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BUILDING.txt 1 Aug 2002 05:52:59 - 1.8
+++ BUILDING.txt 1 Aug 2002 14:30:36 - 1.9
@@ -84,16 +84,23 @@
* This is optional with JDK 1.3 or later.
-(4) Download and Install the Xerces 2 nightly build July 31, 2002 or Higher
-Distribution
+(4) Download and Install the Xerces 2 Distribution
-* Download the xercesImpl.jar and xmlParserAPIs.jar files from:
+* Download a binary distribution of version 2.0.1 from:
- http://gump.covalent.net/jars/latest/xml-xerces2/
+ http://xml.apache.org/dist/xerces-j/old_xerces2
-* Place the downloaded files in a convenient location so that the
+ On a Windows platform, you will need:
+Xerces-J-bin.2.0.1.zip
+
+ On a Unix platform, you will need:
+Xerces-J-bin.2.0.1.tar.gz
+
+* Unpack the binary distribution into a convenient location so that the
distribution resides in its own directory (conventionally named
xerces-x_y_z).
+
+* This is optional with JDK 1.4 or later.
(5) Download and Install Subproject Source Code
1.13 +4 -7 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.properties.default 1 Aug 2002 05:52:59 - 1.12
+++ build.properties.default 1 Aug 2002 14:30:36 - 1.13
@@ -102,15 +102,12 @@
regexp.loc=http://jakarta.apache.org/builds/jakarta-regexp/release/v1.2/jakarta-regexp-1.2.tar.gz
-# - Xerces XML Parser, version 2 nightly build July 31, 2002 or later -
-#xerces.home=${base.path}/xerces-2_0_2
-xerces.home=${base.path}/xerces-2-latest
+# - Xerces XML Parser, version 2_0_1 -
+xerces.home=${base.path}/xerces-2_0_1
xerces.lib=${xerces.home}
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
-#xerces.loc=http://xml.apache.org/dist/xerces-j/Xerces-J-bin.2.0.2.tar.gz
-xercesImpl.loc=http://gump.covalent.net/jars/latest/xml-xerces2/xercesImpl.jar
-xmlParserAPIs.loc=http://gump.covalent.net/jars/latest/xml-xerces2/xmlParserAPIs.jar
+xerces.loc=http://xml.apache.org/dist/xerces-j/old_xerces2/Xerces-J-bin.2.0.1.tar.gz
# --
1.15 +1 -18 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 1 Aug 2002 05:52:59 - 1.14
+++ build.xml 1 Aug 2002 14:30:36 - 1.15
@@ -517,27 +517,10 @@
param name=destfile value=${regexp.jar}/
/antcall
-!--
- Can't download a released version of Xerces since they have a XML
- Schema bug
---
-!--
antcall target=downloadgz
+ !-- xerces2 brings 2 files, test for one of them --
param name=sourcefile value=${xerces.loc}/
param name=destfile value=${xmlParserAPIs.jar}/
-/antcall
---
-
-!-- latest xerces2 requires download of 2 separate jars --
-antcall target=downloadfile
- param name=sourcefile value=${xercesImpl.loc}/
- param name=destfile value=${xercesImpl.jar}/
- param name=destdir value=${xerces.home}/
-/antcall
-antcall target=downloadfile
- param name=sourcefile value=${xmlParserAPIs.loc}/
- param name=destfile value=${xmlParserAPIs.jar}/
- param name=destdir value=${xerces.home}/
/antcall
antcall target=cvsbuild
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
Justy, I verified that Tomcat 5 builds and runs and most of the servlet tests in Watchdog pass with the current Coyote connector. Of course, I don't think any of the changes in the proposed 2.4 spec have been implemented yet. Are there any changes to Coyote that are explicitly or implicitly required by the spec? Or is the problem that API changes to the javax/servlet classes that are required by the new spec will cause Coyote to not build? Thanks, Patrick [EMAIL PROTECTED] wrote: On Wed, 31 Jul 2002, Peter Lin wrote: Justyna Horwat wrote:I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. What kind of changes ? Coyote should be independent of servlet, if you need to add something you can add it to the main branch. 2.4 should be backward compatible - so it shouldn't change any behavior. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- Patrick Luby Email: [EMAIL PROTECTED] Sun Microsystems Phone: 408-276-7471 901 San Antonio Road, USCA14-303 Palo Alto, CA 94303-4900 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
On Thu, 1 Aug 2002 [EMAIL PROTECTED] wrote: Date: Thu, 1 Aug 2002 07:10:09 -0700 (PDT) From: [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Re: New coyote branch On Wed, 31 Jul 2002, Peter Lin wrote: Justyna Horwat wrote:I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. What kind of changes ? Coyote should be independent of servlet, if you need to add something you can add it to the main branch. 2.4 should be backward compatible - so it shouldn't change any behavior. Servlet 2.4 introduces attribute change listeners on the ServletRequest interface, analogous to the ones on sessions and contexts. The implementation of these features has to be in the concrete ServletRequest instance's removeAttribute() and setAttribute() methods. See the public draft spec for details. In the current Catalina archtecture, the connector provides this concrete class -- and in the case at hand, it's CoyoteRequest. Costin Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
integrating tomcat 4.04 into iplanet 4.1 using nsapi_redirector on linux
Has anyone done this? If so, I would like some help. I have compiled the redirector and validated that it is getting invoked, my connector is up and listening, I validated that the class files used for ajp13 are getting invoked, I set up my obj.conf file, the server.xml file and my workers.properties file, but I only get this when I hit a JSP page: HTTP 500 - Internal server error Internet Explorer I've been researching this for more than a week with no success. If you've done this, please document how you did it from Makefile samples to configuration files. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] [5.0] servletapi5, connectors, catalina
Hi. The Servlet 2.4 spec says that ServletResponse now gets two more
methods, (from sections 5.4, 14.2.22) Namely;
String getContentType();
void setCharacterEncoding(String charset)
To implement this, I patched 3 repositories jakarta-servletapi-5,
jakarta-tomcat-connectors, jakarta-tomcat-catalina
I tested the connectors patch against 4.0 and my changes don't seem to
break 4.0 (and so dont require messing with forking connectors.)
Cheers,
-bob
P.S. The servletapi is still sprinkled with tabs. I tried to preserve
the current tabbing (and not change all to spaces per jakarta rule(?))
? apipatch.txt
Index: src/share/javax/servlet/ServletResponse.java
===
RCS file:
/home/cvspublic/jakarta-servletapi-5/src/share/javax/servlet/ServletResponse.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ServletResponse.java
--- src/share/javax/servlet/ServletResponse.java16 Jul 2002 16:38:40 -
1.1.1.1
+++ src/share/javax/servlet/ServletResponse.java1 Aug 2002 16:03:09 -
@@ -122,6 +122,16 @@
public String getCharacterEncoding();
+/**
+ * Overrides the name of the character encoding used in the body
+ * of the request. This method must be called prior to reading
+ * request parameters or reading input using getReader().
+ *
+ * @param charset String containing the name of the chararacter encoding.
+ *
+ */
+
+public void setCharacterEncoding(String charset);
/**
@@ -223,6 +233,24 @@
*/
public void setContentType(String type);
+
+/**
+ * Returns the MIME type of the body of the request, or null if
+ * the type is not known. For HTTP servlets, same as the value of
+ * the CGI variable CONTENT_TYPE.
+ *
+ * @return a String containing the name of the MIME type of the
+ * request, or null if the type is not known
+ *
+ * p The content type may include the type of character
+ * encoding used, for example, codetext/html; charset=ISO-8859-4/code.
+ *
+ * @see#getOutputStream
+ * @see#getWriter
+ *
+ */
+
+public String getContentType();
/**
Index: src/share/javax/servlet/ServletResponseWrapper.java
===
RCS file:
/home/cvspublic/jakarta-servletapi-5/src/share/javax/servlet/ServletResponseWrapper.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ServletResponseWrapper.java
--- src/share/javax/servlet/ServletResponseWrapper.java 16 Jul 2002 16:38:40 -
1.1.1.1
+++ src/share/javax/servlet/ServletResponseWrapper.java 1 Aug 2002 16:03:10 -
@@ -74,7 +74,7 @@
*
* @author Various
* @version$Version$
- * @since v 2.3
+ * @since v 2.3
*
* @seejavax.servlet.ServletResponse
*
@@ -117,16 +117,25 @@
this.response = response;
}
- /**
- * The default behavior of this method is to return getCharacterEncoding()
+/**
+ * The default behavior of this method is to call setCharacterEncoding(String
+charset)
* on the wrapped response object.
*/
+public void setCharacterEncoding(String charset) {
+ this.response.setCharacterEncoding(charset);
+}
+
+/**
+ * The default behavior of this method is to return getCharacterEncoding()
+ * on the wrapped response object.
+ */
public String getCharacterEncoding() {
return this.response.getCharacterEncoding();
}
+
/**
* The default behavior of this method is to return getOutputStream()
* on the wrapped response object.
@@ -162,6 +171,15 @@
public void setContentType(String type) {
this.response.setContentType(type);
+}
+
+/**
+ * The default behavior of this method is to return getContentType()
+ * on the wrapped response object.
+ */
+
+public String getContentType() {
+ return this.response.getContentType();
}
/**
Index: src/share/javax/servlet/http/HttpServlet.java
===
RCS file:
/home/cvspublic/jakarta-servletapi-5/src/share/javax/servlet/http/HttpServlet.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 HttpServlet.java
--- src/share/javax/servlet/http/HttpServlet.java 16 Jul 2002 16:38:40 -
1.1.1.1
+++ src/share/javax/servlet/http/HttpServlet.java 1 Aug 2002 16:03:12 -
@@ -890,8 +890,14 @@
didSetContentLength = true;
}
+public void setCharacterEncoding(String charset)
+ { resp.setCharacterEncoding(charset); }
+
public void setContentType(String type)
{ resp.setContentType(type); }
+
+public String getContentType()
+ { return resp.getContentType(); }
public ServletOutputStream getOutputStream() throws IOException
{ return
Re: integrating tomcat 4.04 into iplanet 4.1 using nsapi_redirector on linux
On Thu, Aug 01, 2002 at 12:49:13AM -0500, Jerry Birchler wrote: Has anyone done this? If so, I would like some help. I have compiled the redirector and validated that it is getting invoked, my connector is up and listening, I validated that the class files used for ajp13 are getting invoked, I set up my obj.conf file, the server.xml file and my workers.properties file, but I only get this when I hit a JSP page: HTTP 500 - Internal server error Internet Explorer I've been researching this for more than a week with no success. Could you please turn off the Friendly error messages in IE, and report what the server actually says? And what do the server logs report? The normal gotcha that I've seen is that the jk has been set to use sockets, and the write permissions for it aren't right. From what you report, this seems like a good starting place. Regards, Simon -- Bollocksh, Mish Moneypenny. Bollocksh. --- James Bond -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 8896] - Tomcat failure on simple file in J2SDK 1.4.0
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8896. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8896 Tomcat failure on simple file in J2SDK 1.4.0 --- Additional Comments From [EMAIL PROTECTED] 2002-08-01 16:48 --- Another way in which this can sneak up on you is if your JAVA_HOME environment variable doesn't point to the installation that contains the java command that is earliest in your shell PATH. If your startup script just uses the command java as opposed to $JAVA_HOME/bin/java (on Unix) or %JAVA_HOME%\bin\java (on Windows), then you'll be running the first java in your shell path, but including a tools.jar from another installation in your classpath! And that can get you ... as it got me. :) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
On Thu, 1 Aug 2002, Craig R. McClanahan wrote: Justyna Horwat wrote:I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. What kind of changes ? Coyote should be independent of servlet, if you need to add something you can add it to the main branch. 2.4 should be backward compatible - so it shouldn't change any behavior. Servlet 2.4 introduces attribute change listeners on the ServletRequest interface, analogous to the ones on sessions and contexts. The implementation of these features has to be in the concrete ServletRequest instance's removeAttribute() and setAttribute() methods. See the public draft spec for details. In the current Catalina archtecture, the connector provides this concrete class -- and in the case at hand, it's CoyoteRequest. Few alternatives to branching: - move CoyoteRequest to jakarta-catalina ( we could also move Tomcat33 classes in tomcat33 cvs ). We agreed that tomcat depends on coyote, not the reverse. - create a tomcat5 dir with the new methods. One important note: if the spec wants notification for _all_ request attribute changes, we'll also need to implement this in coyote.Request. Currently that require 2 new ActionCodes. We should also add an ActionCode for _get_ attribute, to support 'lazy' evaluation of some attributes. 3.3 uses a get/setInfo hook - it works for both Request and Context attributes. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Daemon deps
Would it be possible to remove the dependency on Daemon ? I see no reason why Daemon couldn't use introspection to call start/stop/destroy. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-servletapi-5 build.xml
patrickl2002/08/01 10:14:54
Modified:.build.xml
Log:
Add all of the new *.xsd files to the servlet.jar
Revision ChangesPath
1.2 +9 -4 jakarta-servletapi-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-servletapi-5/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 16 Jul 2002 16:38:40 - 1.1
+++ build.xml 1 Aug 2002 17:14:54 - 1.2
@@ -71,16 +71,21 @@
!-- Servlet resources --
copy todir=${servletapi.build}/classes/javax/servlet/resources
-fileset dir=src/share/dtd
- include name=web-app*.dtd/
+fileset dir=src/share/dtd includes=*.dtd,*.xsd
+ exclude name=jsp*.dtd/
+ exclude name=jsp*.xsd/
+ exclude name=web-jsp*.dtd/
+ exclude name=web-jsp*.xsd/
/fileset
/copy
!-- JSP resources --
copy todir=${servletapi.build}/classes/javax/servlet/jsp/resources
fileset dir=src/share/dtd
- include name=web-jsptaglibrary*.dtd/
- include name=jspxml.*/
+ include name=jsp*.dtd/
+ include name=jsp*.xsd/
+ include name=web-jsp*.dtd/
+ include name=web-jsp*.xsd/
/fileset
/copy
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-servletapi-5/src/share/dtd web-app_2_3.dtd.backup
patrickl2002/08/01 10:16:01 Removed: src/share/dtd web-app_2_3.dtd.backup Log: Remove obsolete file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet JspServletWrapper.java
costin 2002/08/01 10:17:28
Modified:jasper2/src/share/org/apache/jasper/servlet
JspServletWrapper.java
Log:
Compilation error with jikes. JasperException extend ServletException.
Revision ChangesPath
1.9 +9 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Index: JspServletWrapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JspServletWrapper.java31 Jul 2002 21:42:27 - 1.8
+++ JspServletWrapper.java1 Aug 2002 17:17:27 - 1.9
@@ -283,8 +283,13 @@
ex, Logger.ERROR);
}
}
-} catch (JasperException ex) {
+} catch (ServletException ex) {
+ throw ex;
+} catch (IOException ex) {
throw ex;
+// Jikes won't compile this ( JasperException extends ServletException
+//} catch (JasperException ex) {
+//throw ex;
} catch (Exception ex) {
throw new JasperException(ex);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteResponse.java
patrickl2002/08/01 10:20:36
Modified:coyote/src/java/org/apache/coyote Response.java
coyote/src/java/org/apache/coyote/tomcat4
CoyoteResponse.java
Log:
Servlet 2.4 spec says that ServletResponse now gets two more methods, (from sections
5.4, 14.2.22) Namely;
String getContentType();
void setCharacterEncoding(String charset)
Submitted by: Bob Herrmann ([EMAIL PROTECTED])
Revision ChangesPath
1.12 +29 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
Index: Response.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Response.java 9 Apr 2002 18:19:27 - 1.11
+++ Response.java 1 Aug 2002 17:20:36 - 1.12
@@ -443,6 +443,35 @@
}
+/*
+ * Overrides the name of the character encoding used in the body
+ * of the request. This method must be called prior to reading
+ * request parameters or reading input using getReader().
+ *
+ * @param charset String containing the name of the chararacter encoding.
+ */
+public void setCharacterEncoding(String charset) {
+
+if (isCommitted())
+return;
+
+characterEncoding = charset;
+
+String type = this.contentType;
+int start = type.indexOf(charset=);
+if ( start != -1 ) {
+int end = type.indexOf(';', start+8);
+if (end = 0)
+type = type.substring(0,start+8)
++charset+type.substring(end-1);
+else
+type = type.substring(0,start+8)
++charset;
+this.contentType = type;
+
+}
+}
+
public String getCharacterEncoding() {
return characterEncoding;
}
1.19 +22 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
Index: CoyoteResponse.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CoyoteResponse.java 28 Jun 2002 11:25:54 - 1.18
+++ CoyoteResponse.java 1 Aug 2002 17:20:36 - 1.19
@@ -717,6 +717,24 @@
}
+/*
+ * Overrides the name of the character encoding used in the body
+ * of the request. This method must be called prior to reading
+ * request parameters or reading input using getReader().
+ *
+ * @param charset String containing the name of the chararacter encoding.
+ */
+public void setCharacterEncoding(String charset) {
+
+if (isCommitted())
+return;
+
+if (included)
+return; // Ignore any call from an included servlet
+
+ coyoteResponse.setCharacterEncoding(charset);
+}
+
/**
* Set the Locale that is appropriate for this response, including
* setting the appropriate character encoding.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-servletapi-5/src/share/javax/servlet/http HttpServlet.java
patrickl2002/08/01 10:22:06
Modified:src/share/javax/servlet ServletResponse.java
ServletResponseWrapper.java
src/share/javax/servlet/http HttpServlet.java
Log:
Servlet 2.4 spec says that ServletResponse now gets two more methods, (from sect
ions 5.4, 14.2.22) Namely;
String getContentType();
void setCharacterEncoding(String charset)
Submitted by: Bob Herrmann ([EMAIL PROTECTED])
Revision ChangesPath
1.2 +28 -0
jakarta-servletapi-5/src/share/javax/servlet/ServletResponse.java
Index: ServletResponse.java
===
RCS file:
/home/cvs/jakarta-servletapi-5/src/share/javax/servlet/ServletResponse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletResponse.java 16 Jul 2002 16:38:40 - 1.1
+++ ServletResponse.java 1 Aug 2002 17:22:05 - 1.2
@@ -122,6 +122,16 @@
public String getCharacterEncoding();
+/**
+ * Overrides the name of the character encoding used in the body
+ * of the request. This method must be called prior to reading
+ * request parameters or reading input using getReader().
+ *
+ * @param charset String containing the name of the chararacter encoding.
+ *
+ */
+
+public void setCharacterEncoding(String charset);
/**
@@ -223,6 +233,24 @@
*/
public void setContentType(String type);
+
+/**
+ * Returns the MIME type of the body of the request, or null if
+ * the type is not known. For HTTP servlets, same as the value of
+ * the CGI variable CONTENT_TYPE.
+ *
+ * @return a String containing the name of the MIME type of the
+ * request, or null if the type is not known
+ *
+ * p The content type may include the type of character
+ * encoding used, for example, codetext/html; charset=ISO-8859-4/code.
+ *
+ * @see #getOutputStream
+ * @see #getWriter
+ *
+ */
+
+public String getContentType();
/**
1.2 +21 -3
jakarta-servletapi-5/src/share/javax/servlet/ServletResponseWrapper.java
Index: ServletResponseWrapper.java
===
RCS file:
/home/cvs/jakarta-servletapi-5/src/share/javax/servlet/ServletResponseWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletResponseWrapper.java 16 Jul 2002 16:38:40 - 1.1
+++ ServletResponseWrapper.java 1 Aug 2002 17:22:05 - 1.2
@@ -74,7 +74,7 @@
*
* @author Various
* @version $Version$
- * @since v 2.3
+ * @sincev 2.3
*
* @see javax.servlet.ServletResponse
*
@@ -117,16 +117,25 @@
this.response = response;
}
- /**
- * The default behavior of this method is to return getCharacterEncoding()
+/**
+ * The default behavior of this method is to call setCharacterEncoding(String
charset)
* on the wrapped response object.
*/
+public void setCharacterEncoding(String charset) {
+ this.response.setCharacterEncoding(charset);
+}
+
+/**
+ * The default behavior of this method is to return getCharacterEncoding()
+ * on the wrapped response object.
+ */
public String getCharacterEncoding() {
return this.response.getCharacterEncoding();
}
+
/**
* The default behavior of this method is to return getOutputStream()
* on the wrapped response object.
@@ -162,6 +171,15 @@
public void setContentType(String type) {
this.response.setContentType(type);
+}
+
+/**
+ * The default behavior of this method is to return getContentType()
+ * on the wrapped response object.
+ */
+
+public String getContentType() {
+ return this.response.getContentType();
}
/**
1.2 +6 -0
jakarta-servletapi-5/src/share/javax/servlet/http/HttpServlet.java
Index: HttpServlet.java
===
RCS file:
/home/cvs/jakarta-servletapi-5/src/share/javax/servlet/http/HttpServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpServlet.java 16 Jul 2002 16:38:40 - 1.1
+++ HttpServlet.java 1 Aug 2002 17:22:06 - 1.2
@@ -890,8 +890,14 @@
didSetContentLength = true;
}
+public void setCharacterEncoding(String charset)
+ { resp.setCharacterEncoding(charset); }
+
public void setContentType(String type)
{ resp.setContentType(type); }
+
+public String
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector ResponseBase.java ResponseFacade.java
patrickl2002/08/01 10:21:41
Modified:catalina/src/share/org/apache/catalina/connector
ResponseBase.java ResponseFacade.java
Log:
Servlet 2.4 spec says that ServletResponse now gets two more methods, (from sections
5.4, 14.2.22) Namely;
String getContentType();
void setCharacterEncoding(String charset)
Submitted by: Bob Herrmann ([EMAIL PROTECTED])
Revision ChangesPath
1.2 +36 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ResponseBase.java
Index: ResponseBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResponseBase.java 18 Jul 2002 16:47:57 - 1.1
+++ ResponseBase.java 1 Aug 2002 17:21:41 - 1.2
@@ -877,6 +877,38 @@
}
+/*
+ * Overrides the name of the character encoding used in the body
+ * of the request. This method must be called prior to reading
+ * request parameters or reading input using getReader().
+ *
+ * @param charset String containing the name of the chararacter encoding.
+ */
+public void setCharacterEncoding(String charset) {
+
+if (isCommitted())
+return;
+
+if (included)
+return; // Ignore any call from an included servlet
+
+this.encoding = charset;
+
+int start = contentType.indexOf(charset=);
+if ( start != -1 ) {
+
+int end = contentType.indexOf(';', start+8);
+if (end = 0)
+contentType = contentType.substring(0,start+8)
++charset+contentType.substring(end-1);
+else
+contentType = contentType.substring(0,start+8)
++charset;
+
+}
+}
+
+
/**
* Set the Locale that is appropriate for this response, including
1.2 +18 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ResponseFacade.java
Index: ResponseFacade.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ResponseFacade.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResponseFacade.java 18 Jul 2002 16:47:57 - 1.1
+++ ResponseFacade.java 1 Aug 2002 17:21:41 - 1.2
@@ -188,6 +188,15 @@
}
+public void setCharacterEncoding(String charset) {
+
+if (isCommitted())
+return;
+
+response.setCharacterEncoding(charset);
+
+}
+
public void setContentType(String type) {
@@ -198,6 +207,11 @@
}
+public String getContentType() {
+
+return response.getContentType();
+
+}
public void setBufferSize(int size) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default
costin 2002/08/01 10:30:39
Modified:.build.properties.default
Log:
Add properties for log4j ( if you build in 1.3 ) and jaxen/saxpath.
The last 2 are needed by taglibs which is required by jasper2.
( the files are checked in taglibs )
Revision ChangesPath
1.14 +14 -1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.properties.default 1 Aug 2002 14:30:36 - 1.13
+++ build.properties.default 1 Aug 2002 17:30:39 - 1.14
@@ -39,6 +39,7 @@
# - Default Base Path for Dependent Packages -
+#base.path=/usr/share/java
base.path=/usr/local
@@ -119,6 +120,18 @@
activation.home=${base.path}/jaf-1.0.1
activation.lib=${activation.home}
activation.jar=${activation.lib}/activation.jar
+
+# - Log4j -
+log4j.home=${base.path}/log4j
+log4j.jar=${log4j.home}/log4j.jar
+
+# - Jaxen ( required by taglibs/standard required by jasper ) -
+jaxen.home=${base.path}/jaxen-1.0-FCS
+jaxen.jar=${jaxen.home}/jaxen-full.jar
+
+# - Saxpath ( required by taglibs/standard required by jasper ) -
+saxpath.home=${base.path}/saxpath-1.0-FCS
+saxpath.jar=${saxpath.home}/saxpath.jar
# - Commons DBCP, version 20011030 or later -
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/08/01 10:35:12
Added: .build2.xml
Log:
I am totally lost with all the directories/build.properties/depenencies/jars.
I don't know if everyone else is as stupid as I am, but if so this
build file might help.
It builds everything that it can from source - with minimal indirections
and overhead.
Om my system ( 900MHz linux ) it builds all files ( 1058 ) in 19 secs
( using jikes ).
There are 11 jars that it needs.
Revision ChangesPath
1.1 jakarta-tomcat-5/build2.xml
Index: build2.xml
===
project name=Tomcat 5.0-nobin default=all basedir=.
!--
Build 5.0 from sources. No apache binary is used.
--
!-- See build.properties.sample in the top level directory for all --
!-- property values you must customize for successful building!!!--
property file=${user.home}/build.properties/
property file=build.properties/
property file=build.properties.default/
property name=basedir location=. /
!-- Source dependencies --
property name=api.home
value=${basedir}/../jakarta-servletapi-5/
property name=taglibs.home
value=${basedir}/../jakarta-taglibs/
property name=commons.home
value=${basedir}/../jakarta-commons/
property name=catalina.home
value=${basedir}/../jakarta-tomcat-catalina/
property name=jasper.home
value=${basedir}/../jakarta-tomcat-jasper-5/jasper2/
property name=jtc.home
value=${basedir}/../jakarta-tomcat-connectors/
property name=build.dir value=${basedir}/build/tomcat5/
property name=log4j.jar value=${base.path}/log4j/log4j.jar/
path id=alljars
pathelement location=${jmx.jar}/
pathelement location=${mail.jar}/
pathelement location=${regexp.jar}/
pathelement location=${jsse.jar}/
pathelement location=${jnet.jar}/
pathelement location=${jcert.jar}/
pathelement location=${activation.jar}/
pathelement location=${jta.jar}/
pathelement location=${log4j.jar}/
pathelement location=${jaxen.jar}/
pathelement location=${saxpath.jar}/
/path
!-- === DETECT: Display configuration == --
target name=detect
description=Display configuration and conditional compilation flags
echo message=Path: ${toString:alljars}/
/target
!-- == COMBO: Clean All Directories --
target name=clean
description=Clean all components
delete dir=${build.dir}/
/target
!-- === COMBO: Build All Components --
target name=all
description=Clean, build, and deploy all components
depends=detect
mkdir dir=${build.dir}/classes /
javac destdir=${build.dir}/classes
optimize=off
debug=on
classpathref=alljars
src
path location=${api.home}/src/share /
path location=${jasper.home}/src/share /
path location=${taglibs.home}/standard/src /
path location=${catalina.home}/catalina/src/share /
path location=${jtc.home}/util/java /
path location=${jtc.home}/coyote/src/java /
path location=${jtc.home}/jk/java /
path location=${jtc.home}/http11/src/java /
path location=${commons.home}/modeler/src/java /
path location=${commons.home}/digester/src/java /
path location=${commons.home}/collections/src/java /
path location=${commons.home}/beanutils/src/java /
path location=${commons.home}/logging/src/java /
/src
exclude name=org/apache/coyote/tomcat3/** /
exclude name=org/apache/ajp/** /
exclude name=org/apache/tomcat/util/net/PureTLS* /
exclude name=org/apache/naming/factory/Tyrex* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
exclude name=org/apache/taglibs/standard/tag/common/xml/** /
exclude name=org/apache/commons/modeler/Modeler.java /
exclude name=org/apache/catalina/startup/BootstrapService.java /
exclude name=org/apache/taglibs/standard/lang/jstl/test/** /
exclude
name=org/apache/taglibs/standard/lang/jstl/parser/jsp20/ELParser.java /
/javac
/target
/project
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
Craig summed it up well in his e-mail. The attribute change listeners are explicitly required by the proposed servlet 2.4 spec. I need to modify the ServletRequest instance which happens to be present in Coyote. Both Costin and Remy brought up issues related to as well as good solutions to branching. I like Remy's idea of creating a Tomcat 5 adapter which would be consistent with the Tomcat 3 4 adapters. (The javax.servlet API changes I made to jakarta-servletapi-5 will not affect whether Coyote builds or not. These are additions with no modification to the existing API's. I submitted a patch for these additions a couple of days ago but since there's no implementation you won't see any changes to the behavior.) Justy Patrick Luby wrote: Justy, I verified that Tomcat 5 builds and runs and most of the servlet tests in Watchdog pass with the current Coyote connector. Of course, I don't think any of the changes in the proposed 2.4 spec have been implemented yet. Are there any changes to Coyote that are explicitly or implicitly required by the spec? Or is the problem that API changes to the javax/servlet classes that are required by the new spec will cause Coyote to not build? Thanks, Patrick [EMAIL PROTECTED] wrote: On Wed, 31 Jul 2002, Peter Lin wrote: Justyna Horwat wrote:I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. What kind of changes ? Coyote should be independent of servlet, if you need to add something you can add it to the main branch. 2.4 should be backward compatible - so it shouldn't change any behavior. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] [jakarta-servletapi-5]
Hi, this include a modified version of xml.xsd (from W3c) were the DOCTYPE element is removed (commented). Xerces 2.0.1 seems to have problem with this entity when schema is used and the parser is running inside a firewall, using a local copy of the xml.xsd. Thanks, -- Jeanfrancois Index: xml.xsd === RCS file: /home/cvspublic/jakarta-servletapi-5/src/share/dtd/xml.xsd,v retrieving revision 1.1 diff -u -r1.1 xml.xsd --- xml.xsd 1 Aug 2002 00:12:24 - 1.1 +++ xml.xsd 1 Aug 2002 17:40:35 - @@ -1,5 +1,7 @@ ?xml version='1.0'? +!-- Xerces 2.0.1 bug when trying to resolve the systemID locally !DOCTYPE xs:schema PUBLIC -//W3C//DTD XMLSCHEMA 200102//EN XMLSchema.dtd +-- xs:schema targetNamespace=http://www.w3.org/XML/1998/namespace; xmlns:xs=http://www.w3.org/2001/XMLSchema; xml:lang=en xs:annotation -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
Justy, You'll also need to change coyote.Request - since it is the real attribute store. As I mentioned, you'll need to add 2 ActionCodes. That's the correct implementation IMHO ( independent of where you put the CoyoyteRequest ). If it can wait a bit - I can help. Costin On Thu, 1 Aug 2002, Justyna Horwat wrote: Craig summed it up well in his e-mail. The attribute change listeners are explicitly required by the proposed servlet 2.4 spec. I need to modify the ServletRequest instance which happens to be present in Coyote. Both Costin and Remy brought up issues related to as well as good solutions to branching. I like Remy's idea of creating a Tomcat 5 adapter which would be consistent with the Tomcat 3 4 adapters. (The javax.servlet API changes I made to jakarta-servletapi-5 will not affect whether Coyote builds or not. These are additions with no modification to the existing API's. I submitted a patch for these additions a couple of days ago but since there's no implementation you won't see any changes to the behavior.) Justy Patrick Luby wrote: Justy, I verified that Tomcat 5 builds and runs and most of the servlet tests in Watchdog pass with the current Coyote connector. Of course, I don't think any of the changes in the proposed 2.4 spec have been implemented yet. Are there any changes to Coyote that are explicitly or implicitly required by the spec? Or is the problem that API changes to the javax/servlet classes that are required by the new spec will cause Coyote to not build? Thanks, Patrick [EMAIL PROTECTED] wrote: On Wed, 31 Jul 2002, Peter Lin wrote: Justyna Horwat wrote:I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. What kind of changes ? Coyote should be independent of servlet, if you need to add something you can add it to the main branch. 2.4 should be backward compatible - so it shouldn't change any behavior. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/bin jspc.bat jspc.sh jasper.bat jasper.sh
patrickl2002/08/01 10:55:51 Modified:jasper2/src/bin jspc.bat jspc.sh Removed: jasper2/src/bin jasper.bat jasper.sh Log: Convert jspc.* scripts to use commons-launcher and remove jasper.* scripts since it was hard coded to be a support script for the jspc.* scripts only. Revision ChangesPath 1.2 +21 -22jakarta-tomcat-jasper/jasper2/src/bin/jspc.bat Index: jspc.bat === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/bin/jspc.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jspc.bat 28 Mar 2002 18:46:15 - 1.1 +++ jspc.bat 1 Aug 2002 17:55:51 - 1.2 @@ -1,33 +1,31 @@ @echo off if %OS% == Windows_NT setlocal + rem --- -rem Script to run the Jasper offline JSP compiler rem -rem $Id$ +rem Script for running JSPC compiler using the Launcher +rem rem --- -rem Guess JASPER_HOME if not defined -if not %JASPER_HOME% == goto gotHome -set JASPER_HOME=. -if exist %JASPER_HOME%\bin\jspc.bat goto okHome -set JASPER_HOME=.. -:gotHome -if exist %JASPER_HOME%\bin\jspc.bat goto okHome -echo The JASPER_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -goto end -:okHome - -set EXECUTABLE=%JASPER_HOME%\bin\jasper.bat +rem Get standard environment variables +set PRG=%0 +if exist %PRG%\..\setenv.bat goto gotCmdPath +rem %0 must have been found by DOS using the %PATH% so we assume that +rem setenv.bat will also be found in the %PATH% +call setenv.bat +goto doneSetenv +:gotCmdPath +call %PRG%\..\setenv.bat +:doneSetenv -rem Check that target executable exists -if exist %EXECUTABLE% goto okExec -echo Cannot find %EXECUTABLE% -echo This file is needed to run this program +rem Make sure prerequisite environment variables are set +if not %JAVA_HOME% == goto gotJavaHome +echo The JAVA_HOME environment variable is not defined +echo This environment variable is needed to run this program goto end -:okExec +:gotJavaHome -rem Get remaining unshifted command line arguments and save them in the +rem Get command line arguments and save them with the proper quoting set CMD_LINE_ARGS= :setArgs if %1== goto doneSetArgs @@ -36,6 +34,7 @@ goto setArgs :doneSetArgs -call %EXECUTABLE% jspc %CMD_LINE_ARGS% +rem Execute the Launcher using the jspc target +%JAVA_HOME%\bin\java.exe -classpath %PRG%\..;%PATH% LauncherBootstrap -launchfile jasper.xml -verbose jspc %CMD_LINE_ARGS% :end 1.2 +11 -13jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh Index: jspc.sh === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jspc.sh 28 Mar 2002 18:46:15 - 1.1 +++ jspc.sh 1 Aug 2002 17:55:51 - 1.2 @@ -1,14 +1,15 @@ #!/bin/sh + # - -# Script to run the Jasper offline JSP compiler # -# $Id$ +# Script for running JSPC compiler using the Launcher +# # - -# resolve links - $0 may be a softlink +# Resolve links - $0 may be a softlink PRG=$0 -while [ -h $PRG ] ; do +while [ -h $PRG ]; do ls=`ls -ld $PRG` link=`expr $ls : '.*- \(.*\)$'` if expr $link : '.*/.*' /dev/null; then @@ -17,15 +18,12 @@ PRG=`dirname $PRG`/$link fi done - -PRGDIR=`dirname $PRG` -EXECUTABLE=jasper.sh -# Check that target executable exists -if [ ! -x $PRGDIR/$EXECUTABLE ]; then - echo Cannot find $PRGDIR/$EXECUTABLE - echo This file is needed to run this program - exit 1 +# Get standard environment variables +PRGDIR=`dirname $PRG` +if [ -r $PRGDIR/setenv.sh ]; then + . $PRGDIR/setenv.sh fi -exec $PRGDIR/$EXECUTABLE jspc $@ +# Execute the Launcher using the jspc target +exec $JAVA_HOME/bin/java -classpath $PRGDIR LauncherBootstrap -launchfile jasper.xml -verbose jspc $@ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: webapp/apr cvs tags?
Neil, I have no problem with it. My config. is almost the same as yours. I use mod_webapp and apr from cvs, apache 1.3.26 from source distribution. Punky = [localhost:~] punkytse% telnet punknix 80 Trying 192.168.1.101... Connected to punknix. Escape character is '^]'. HEAD / HTTP/1.0 HTTP/1.1 200 OK Date: Thu, 01 Aug 2002 17:23:18 GMT Server: Apache/1.3.26 (Unix) mod_webapp/1.2.0-dev Content-Location: index.html.en Vary: negotiate,accept-language,accept-charset TCN: choice Last-Modified: Fri, 04 May 2001 00:00:38 GMT ETag: 50c0e-5b0-3af1f126;3d4965c6 Accept-Ranges: bytes Content-Length: 1456 Connection: close Content-Type: text/html Content-Language: en Expires: Thu, 01 Aug 2002 17:23:18 GMT Connection closed by foreign host. = Punky Tse wrote: Neil, I will try tonight if I encounter the same problem. BTW, if you can choose, why not move to httpd 2.0? At least Pier and me support it! ;-) Punky Neil Cronin wrote: I'm trying to build mod_webapp for apache 1.3.26. I grabbed webapp and apr from cvs.apache.org. it seems to build fine: # ./configure --with-apr=../apr/ --with-apxs (configure output) # make (make output) Coonfiguration details: module version: mod_webapp/1.2.0-dev httpd version: Apache/1.3.26 (Unix) host machine/os: i686-pc-linux-gnu cration date:Tue Jul 30 04:58:30 PDT 2002 All done... # cp apache-1.3/mod_webapp.so /etc/apache/modules # /usr/sbin/apache Syntax error on line 63 of /etc/apache/conf/apache.conf: Cannot load /etc/apache/modules/mod_webapp.so into server: /etc/apache/modules/mod_webapp.so: undefined symbol: apr_thread_mutex_lock I've tried mod_webapp 1.0.1 with similar results. is this a known issue? is there a 1.1 branch of webapp that I can try? or another version of apr? thanks, neil -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2 build.xml
patrickl2002/08/01 10:57:25
Modified:jasper2 build.xml
Log:
Remove jasper.sh references since the file is now obsolete.
Revision ChangesPath
1.13 +10 -3 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 26 Jul 2002 15:29:04 - 1.12
+++ build.xml 1 Aug 2002 17:57:25 - 1.13
@@ -24,24 +24,29 @@
!-- Construct Jasper classpath --
path id=jasper.classpath
+pathelement location=${ant.jar}/
pathelement location=${servlet.jar}/
pathelement location=${tools.jar}/
pathelement location=${xerces.jar}/
pathelement location=${xercesImpl.jar}/
pathelement location=${xmlParserAPIs.jar}/
pathelement location=${commons-collections.jar}/
+pathelement location=${commons-daemon-launcher.jar}/
pathelement location=${jasper.build}/shared/classes/
pathelement location=${jsp20el.jar}/
/path
!-- Construct unit tests classpath --
path id=test.classpath
+pathelement location=${ant.jar}/
pathelement location=${junit.jar}/
pathelement location=${servlet.jar}/
pathelement location=${tools.jar}/
pathelement location=${xerces.jar}/
pathelement location=${xercesImpl.jar}/
pathelement location=${xmlParserAPIs.jar}/
+pathelement location=${commons-collections.jar}/
+pathelement location=${commons-launcher.jar}/
pathelement location=${jasper.build}/shared/classes/
pathelement location=${jasper.build}/tests/
/path
@@ -65,13 +70,17 @@
!-- === BUILD: Copy Static Files === --
target name=build-static depends=build-prepare
+!-- Copy the launcher classes --
+copy todir=${jasper.build}/common/lib file=${ant.jar}/
+copy todir=${jasper.build}/bin file=${commons-daemon-launcher.jar}/
+copy todir=${jasper.build}/bin
file=${commons-daemon-launcher-bootstrap.class}/
+
!-- Executable Commands --
copy todir=${jasper.build}/bin
fileset dir=src/bin /
/copy
fixcrlf srcdir=${jasper.build}/bin includes=*.sh eol=lf/
fixcrlf srcdir=${jasper.build}/bin includes=*.bat eol=crlf/
-chmod perm=+x file=${jasper.build}/bin/jasper.sh/
chmod perm=+x file=${jasper.build}/bin/jspc.sh/
/target
@@ -195,7 +204,6 @@
/copy
fixcrlf srcdir=${jasper.deploy}/bin includes=*.sh eol=lf/
fixcrlf srcdir=${jasper.deploy}/bin includes=*.bat eol=crlf/
-chmod perm=+x file=${jasper.deploy}/bin/jasper.sh/
chmod perm=+x file=${jasper.deploy}/bin/jspc.sh/
!-- Runtime Library --
@@ -235,7 +243,6 @@
/copy
fixcrlf srcdir=${jasper.dist}/bin includes=*.sh eol=lf/
fixcrlf srcdir=${jasper.dist}/bin includes=*.bat eol=crlf/
-chmod perm=+x file=${jasper.dist}/bin/jasper.sh/
chmod perm=+x file=${jasper.dist}/bin/jspc.sh/
!-- Jasper Compiler and Runtime JAR Files --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/bin jasper.xml
patrickl2002/08/01 10:58:53
Added: jasper2/src/bin jasper.xml
Log:
Convert jspc.* scripts to use commons-launcher
Revision ChangesPath
1.1 jakarta-tomcat-jasper/jasper2/src/bin/jasper.xml
Index: jasper.xml
===
!--
XML file for launching Jasper applications using the Launcher.
To run any of the applications in the JDB debugger, execute the Launcher with
a -Ddebug=true argument.
To run any of the applications in JPDA mode, execute the Launcher with a
-Djpda=true argument.
--
project name=Jasper Launcher default=jspc basedir=.
!-- Set the application home to the parent directory of this directory --
property name=jasper.home location=${basedir}/../
!-- Import the user's custom properties --
property file=${jasper.home}/bin/jasper.properties/
!-- Set user configurable properties --
property name=jasper.jvm.args value=/
property name=jasper.source.path
value=${jasper.home}/../../jakarta-servletapi-5/src/share:${jasper.home}/../../jakarta-tomcat-jasper/jasper2/src/share/
!-- Build the classpath relative to the application home --
path id=base.class.path
fileset dir=${jasper.home}/common/lib includes=*.jar/
fileset dir=${jasper.home}/common/endorsed includes=*.jar/
fileset dir=${jasper.home}/shared/lib includes=*.jar/
pathelement location=${jasper.home}/shared/classes/
/path
!-- Build the sysproperties relative to the application home --
syspropertyset id=base.sys.properties
sysproperty key=java.endorsed.dirs file=${jasper.home}/common/endorsed/
sysproperty key=jasper.home file=${jasper.home}/
/syspropertyset
!-- Build the standard jvmargs --
jvmargset id=base.jvm.args
jvmarg line=${jasper.jvm.args}/
jvmarg value=-Xdebug if=jpda.settings/
jvmarg value=-Xrunjdwp:${jpda.settings} if=jpda.settings/
jvmarg value=-sourcepath if=jdb/
jvmarg path=${jasper.source.path} if=jdb/
/jvmargset
!-- Target that sets JDB properties when the debug property is set --
target name=setjdb description=Set JDB properties if=debug
property name=jdb value=true/
/target
!-- Target that sets JPDA properties when the jpda property is set --
target name=setjpda description=Set JPDA properties if=jpda
condition property=jpda.transport value=dt_shmem
os family=windows/
/condition
condition property=jpda.transport value=dt_socket
not
os family=windows/
/not
/condition
condition property=jpda.address value=jdbconn
equals arg1=${jpda.transport} arg2=dt_shmem/
/condition
condition property=jpda.address value=8000
not
equals arg1=${jpda.transport} arg2=dt_shmem/
/not
/condition
property name=jpda.suspend value=y/
property name=jpda.settings
value=transport=${jpda.transport},address=${jpda.address},server=y,suspend=${jpda.suspend}/
/target
!-- Target that executes the JSPC compiler--
target name=jspc description=Execute JSPC compiler
depends=setjdb,setjpda
!-- Launch JSPC compiler --
launch classname=org.apache.jasper.JspC
debug=${jdb}
print=${print}
usesystemin=false
requiretools=true
jvmargset refid=base.jvm.args/
arg value=jspc/
syspropertyset refid=base.sys.properties/
classpath refid=base.class.path/
/launch
/target
/project
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.xml tool-wrapper.bat tool-wrapper.sh catalina.bat cpappend.bat digest.bat digest.sh setclasspath.bat setclasspath.sh
patrickl2002/08/01 11:02:07
Modified:catalina build.xml
catalina/src/bin catalina.xml tool-wrapper.bat
tool-wrapper.sh
Removed: catalina/src/bin catalina.bat cpappend.bat digest.bat
digest.sh setclasspath.bat setclasspath.sh
Log:
Convert tool-wrapper.* scripts to use commons-launcher and obsolete the digest.*
scripts since they are scripts that merely invoke the tool-wrapper.* scripts. Also,
the setclasspath.* and the cpappend.* scripts are no longer needed now that
catalina.xml handles the classpath settings.
Revision ChangesPath
1.8 +0 -3 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 1 Aug 2002 04:59:24 - 1.7
+++ build.xml 1 Aug 2002 18:02:07 - 1.8
@@ -711,7 +711,6 @@
/copy
fixcrlf srcdir=${catalina.build}/bin includes=*.sh eol=lf/
fixcrlf srcdir=${catalina.build}/bin includes=*.bat eol=crlf/
-chmod perm=+x file=${catalina.build}/bin/digest.sh/
chmod perm=+x file=${catalina.build}/bin/startup.sh/
chmod perm=+x file=${catalina.build}/bin/shutdown.sh/
chmod perm=+x file=${catalina.build}/bin/tool-wrapper.sh/
@@ -999,7 +998,6 @@
/copy
fixcrlf srcdir=${catalina.deploy}/bin includes=*.sh eol=lf/
fixcrlf srcdir=${catalina.deploy}/bin includes=*.bat eol=crlf/
-chmod perm=+x file=${catalina.deploy}/bin/digest.sh/
chmod perm=+x file=${catalina.deploy}/bin/startup.sh/
chmod perm=+x file=${catalina.deploy}/bin/shutdown.sh/
chmod perm=+x file=${catalina.deploy}/bin/tool-wrapper.sh/
@@ -1175,7 +1173,6 @@
/copy
fixcrlf srcdir=${catalina.dist}/bin includes=*.sh eol=lf/
fixcrlf srcdir=${catalina.dist}/bin includes=*.bat eol=crlf/
-chmod perm=+x file=${catalina.dist}/bin/digest.sh/
chmod perm=+x file=${catalina.dist}/bin/startup.sh/
chmod perm=+x file=${catalina.dist}/bin/shutdown.sh/
chmod perm=+x file=${catalina.dist}/bin/tool-wrapper.sh/
1.2 +29 -10jakarta-tomcat-catalina/catalina/src/bin/catalina.xml
Index: catalina.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalina.xml 1 Aug 2002 04:59:24 - 1.1
+++ catalina.xml 1 Aug 2002 18:02:07 - 1.2
@@ -13,30 +13,32 @@
project name=Catalina Launcher default=catalina basedir=.
!-- Set the application home to the parent directory of this directory --
- property name=app.home location=${basedir}/../
- property name=bootstrap.jar location=${app.home}/bin/bootstrap.jar/
+ property name=catalina.home location=${basedir}/../
+ property name=bootstrap.jar location=${catalina.home}/bin/bootstrap.jar/
!-- Import the user's custom properties --
- property file=${app.home}/bin/catalina.properties/
+ property file=${catalina.home}/bin/catalina.properties/
!-- Set user configurable properties --
- property name=catalina.base location=${app.home}/
- property name=catalina.tmpdir location=${app.home}/temp/
- property name=catalina.out location=${app.home}/logs/catalina.out/
- property name=catalina.policy location=${app.home}/conf/catalina.policy/
+ property name=jsse.home location=${catalina.home}/
+ property name=catalina.base location=${catalina.home}/
+ property name=catalina.tmpdir location=${catalina.home}/temp/
+ property name=catalina.out location=${catalina.home}/logs/catalina.out/
+ property name=catalina.policy
location=${catalina.home}/conf/catalina.policy/
property name=catalina.jvm.args value=/
- property name=catalina.source.path
value=${app.home}/../../jakarta-servletapi-5/src/share:${app.home}/../../jakarta-tomcat-jasper/jasper2/src/share:${app.home}/../../jakarta-tomcat-connectors/coyote/src/java:${app.home}/../../jakarta-tomcat-catalina/catalina/src/share/
+ property name=catalina.source.path
value=${catalina.home}/../../jakarta-servletapi-5/src/share:${catalina.home}/../../jakarta-tomcat-jasper/jasper2/src/share:${catalina.home}/../../jakarta-tomcat-connectors/coyote/src/java:${catalina.home}/../../jakarta-tomcat-catalina/catalina/src/share/
!-- Build the classpath relative to the application home --
path id=base.class.path
pathelement location=${bootstrap.jar}/
+pathelement
path=${jsse.home}/lib/jsse.jar:${jsse.home}/lib/jcert.jar:${jsse.home}/lib/jnet.jar/
/path
!-- Build the sysproperties relative to the application home --
syspropertyset id=base.sys.properties
-
Re: Diffie Hellman
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: Hi, does Tomcat support the Diffie-Hellman Key Agreement Method, when it is ssl enabled ? If not is it possible to make Tomcat-ssl use Diffie-Helman instead then RSA, so that Tomcat does not need a certificate when started in ssl mode ? I believe it depends on JSSI to do the cypher negotiation. Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 7227] - error-code directive don't work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7227.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7227
error-code directive don't work
--- Additional Comments From [EMAIL PROTECTED] 2002-08-01 18:31 ---
It should work for 500 errors if you explicitly call response.sendError(500),
however if an exception is allowed to propogate to container, it does not work.
There was another bug filed for this, however it was closed because one can
interpret the Servlet spec 2.3 to mean that the current behavior is acceptable.
Because there seem to be so many user questions about this, I don't think users
expect the server to respond the way it does. Re-routing on 'Exception' doesn't
work either, because it won't allow you to handle specific Exceptions
differently (NullPointerExceptions going to one page, ClassNotFoundException
going to another, etc.). All Exceptions that are thrown will be picked up by
the 'Exception' error page.
I've done some digging, and a fix for this is pretty simple. In the
ErrorDispatcherValve.throwable(request, response, throwable) method, it attempts
to get the error page location by the type of the throwable (and if throwable is
a ServletException, by testing against the root cause). If neither of these
match a registered error page, it then quits. What I think it's safe to assume
here is that we should then look to see if the user has registered an error page
to the error code 500. It ends up setting it to 500 later anyway, and this way,
at least we can handle it properly. The code is simple:
if(errorPage == null) {
errorPage =
context.findErrorPage(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
... and it even works... Now can someone give me some tips about how to get this
fix in?
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Daemon deps
Costin, Remy can probably comment on the commons-daemon.jar dependency. However, the commons-launcher.jar dependency is required for the scripts in the bin directory. Patrick [EMAIL PROTECTED] wrote: Would it be possible to remove the dependency on Daemon ? I see no reason why Daemon couldn't use introspection to call start/stop/destroy. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- Patrick Luby Email: [EMAIL PROTECTED] Sun Microsystems Phone: 408-276-7471 901 San Antonio Road, USCA14-303 Palo Alto, CA 94303-4900 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
HotSpot Virtual Machine Error : 11
Running on Solaris 2.8, using Tomcat4.0+apache1.3.26 tomcat will crash and give the error message below. It doesn't seem like this started happening until we switched to 64-bit mode, but i'm not entirely sure. Has anyone encountered this problem? Thanks Ed Unexpected Signal : 11 occurred at PC=0x7D27CBF4 Function=[Unknown. Nearest: JVM_GetMethodIxExceptionsCount+0x34F4] Library=/usr/j2se/jre/lib/sparcv9/server/libjvm.so Current Java thread: Dynamic libraries: 0x1 /usr/j2se/bin/sparcv9/java 0x7f20 /usr/lib/sparcv9/libthread.so.1 0x7f40 /usr/lib/sparcv9/libdl.so.1 0x7ef0 /usr/lib/sparcv9/libc.so.1 0x7f10 /usr/platform/SUNW,Sun-Fire-280R/lib/sparcv9/libc_psr.so .1 0x7d00 /usr/j2se/jre/lib/sparcv9/server/libjvm.so 0x7ce0 /usr/lib/64/libCrun.so.1 0x7cc0 /usr/lib/64/libsocket.so.1 0x7ca0 /usr/lib/64/libnsl.so.1 0x7c80 /usr/lib/64/libm.so.1 0x7da0 /usr/lib/64/libw.so.1 0x7c50 /usr/lib/64/libmp.so.2 0x7c10 /usr/j2se/jre/lib/sparcv9/native_threads/libhpi.so 0x7bf0 /usr/j2se/jre/lib/sparcv9/libverify.so 0x7bc0 /usr/j2se/jre/lib/sparcv9/libjava.so 0x7ba0 /usr/j2se/jre/lib/sparcv9/libzip.so 0x1320 /usr/lib/64/nss_compat.so.1 0x0f60 /usr/j2se/jre/lib/sparcv9/libnet.so 0x0f20 /usr/lib/64/nss_files.so.1 0x0e50 /usr/j2se/jre/lib/sparcv9/librmi.so Local Time = Mon Jul 29 14:34:43 2002 Elapsed Time = 6877 # # HotSpot Virtual Machine Error : 11 # Error ID : 4F530E43505002D3 01 # Please report this error at # http://java.sun.com/cgi-bin/bugreport.cgi # # Java VM: Java HotSpot(TM) 64-Bit Server VM (1.4.0-b92 mixed mode) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java JspUtil.java
luehe 2002/08/01 11:47:28
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
JspUtil.java
Log:
more compilation error fixes for generated tag handler file
Revision ChangesPath
1.55 +33 -27
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Generator.java1 Aug 2002 02:12:05 - 1.54
+++ Generator.java1 Aug 2002 18:47:28 - 1.55
@@ -407,10 +407,8 @@
out.println();
}
-// Static data for EL function maps:
+// Static data for EL function and prefix maps:
generateELFunctionMap();
-
-// Static data for EL function maps:
generatePrefixMap();
// Class variable declarations
@@ -736,6 +734,7 @@
private String parent;
private String simpleTagHandlerVar;
private boolean isSimpleTagHandler;
+ private boolean isTagFile;
private ServletWriter out;
private MethodsBuffer methodsBuffer;
private FragmentHelperClass fragmentHelperClass;
@@ -745,10 +744,12 @@
/**
* Constructor.
*/
- public GenerateVisitor(ServletWriter out,
+ public GenerateVisitor(boolean isTagFile,
+ServletWriter out,
MethodsBuffer methodsBuffer,
FragmentHelperClass fragmentHelperClass,
TagInfo tagInfo) {
+ this.isTagFile = isTagFile;
this.out = out;
this.methodsBuffer = methodsBuffer;
this.fragmentHelperClass = fragmentHelperClass;
@@ -783,9 +784,9 @@
if (attr.isExpression() || attr.isELInterpreterInput()) {
if (attr.isELInterpreterInput()) {
- v = JspUtil.interpreterCall( attr.getValue(),
-expectedType, _jspx_prefix_map, _jspx_fnmap,
- defaultPrefix );
+ v = JspUtil.interpreterCall(this.isTagFile,
+ attr.getValue(), expectedType, _jspx_prefix_map,
+ _jspx_fnmap, defaultPrefix );
}
if (encode) {
return java.net.URLEncoder.encode( + v + );
@@ -861,9 +862,9 @@
if ( true /*isELEnabled*/ ) {
out.printil(
out.write(
- + JspUtil.interpreterCall(
- ${ + new String(n.getText()) + }, String.class,
- _jspx_prefix_map, _jspx_fnmap, null )
+ + JspUtil.interpreterCall(this.isTagFile,
+${ + new String(n.getText()) + }, String.class,
+ _jspx_prefix_map, _jspx_fnmap, null )
+ ););
} else {
out.printil(out.write( +
@@ -2392,8 +2393,8 @@
// Do nothing
} else if (attrs[i].isELInterpreterInput()) {
// run attrValue through the expression interpreter
-attrValue = JspUtil.interpreterCall( attrValue,
-c[0], _jspx_prefix_map, _jspx_fnmap,
+attrValue = JspUtil.interpreterCall(this.isTagFile,
+attrValue, c[0], _jspx_prefix_map, _jspx_fnmap,
n.getPrefix() );
} else {
attrValue = convertString(
@@ -2729,20 +2730,21 @@
if (gen.ctxt.isTagFile()) {
TagInfo tagInfo = gen.ctxt.getTagInfo();
gen.generateTagHandlerPreamble(tagInfo);
- page.visit(gen.new GenerateVisitor(out, gen.methodsBuffer, null,
-tagInfo));
+ page.visit(gen.new GenerateVisitor(gen.ctxt.isTagFile(), out,
+gen.methodsBuffer, null,
+tagInfo));
gen.generateTagHandlerPostamble();
- return;
- }
-
- if (gen.ctxt.getOptions().isPoolingEnabled()) {
- gen.compileTagHandlerPoolList(page);
+ } else {
+ if (gen.ctxt.getOptions().isPoolingEnabled()) {
+ gen.compileTagHandlerPoolList(page);
+ }
+ gen.generatePreamble(page);
+ gen.fragmentHelperClass.generatePreamble();
+ page.visit(gen.new GenerateVisitor(gen.ctxt.isTagFile(), out,
+gen.methodsBuffer,
+gen.fragmentHelperClass, null));
Re: cvs commit: jakarta-tomcat-5 build.properties.default
Costin,
If these are required, shouldn't they be added to the BUILDING.txt
instructions and the build.xml's download task as well?
BTW, I just did a clean build without your 3 new dependencies and ran
watchdog against it (11 JSP test fail). I noticed that the
jakarta-tomcat-jasper/jasper2 build does not complain that these
dependencies are not available. If they are really required dependencies
of JSP, shouldn't the jasper2 build check for them and put them in its
build output?
Patrick
[EMAIL PROTECTED] wrote:
costin 2002/08/01 10:30:39
Modified:.build.properties.default
Log:
Add properties for log4j ( if you build in 1.3 ) and jaxen/saxpath.
The last 2 are needed by taglibs which is required by jasper2.
( the files are checked in taglibs )
Revision ChangesPath
1.14 +14 -1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.properties.default1 Aug 2002 14:30:36 - 1.13
+++ build.properties.default1 Aug 2002 17:30:39 - 1.14
@@ -39,6 +39,7 @@
# - Default Base Path for Dependent Packages -
+#base.path=/usr/share/java
base.path=/usr/local
@@ -119,6 +120,18 @@
activation.home=${base.path}/jaf-1.0.1
activation.lib=${activation.home}
activation.jar=${activation.lib}/activation.jar
+
+# - Log4j -
+log4j.home=${base.path}/log4j
+log4j.jar=${log4j.home}/log4j.jar
+
+# - Jaxen ( required by taglibs/standard required by jasper ) -
+jaxen.home=${base.path}/jaxen-1.0-FCS
+jaxen.jar=${jaxen.home}/jaxen-full.jar
+
+# - Saxpath ( required by taglibs/standard required by jasper ) -
+saxpath.home=${base.path}/saxpath-1.0-FCS
+saxpath.jar=${saxpath.home}/saxpath.jar
# - Commons DBCP, version 20011030 or later -
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
--
Patrick Luby Email: [EMAIL PROTECTED]
Sun Microsystems Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-servletapi-5/src/share/dtd xml.xsd
patrickl2002/08/01 11:55:51 Modified:src/share/dtd xml.xsd Log: Include a modified version of xml.xsd (from W3c) were the DOCTYPE element is removed (commented). Xerces 2.0.1 seems to have problem with this entity when schema is used and the parser is running inside a firewall, using a local copy of the xml.xsd. Submitted by: Jean-Francois Arcand ([EMAIL PROTECTED]) Revision ChangesPath 1.2 +2 -0 jakarta-servletapi-5/src/share/dtd/xml.xsd Index: xml.xsd === RCS file: /home/cvs/jakarta-servletapi-5/src/share/dtd/xml.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xml.xsd 1 Aug 2002 00:12:24 - 1.1 +++ xml.xsd 1 Aug 2002 18:55:51 - 1.2 @@ -1,5 +1,7 @@ ?xml version='1.0'? +!-- Xerces 2.0.1 bug when trying to resolve the systemID locally !DOCTYPE xs:schema PUBLIC -//W3C//DTD XMLSCHEMA 200102//EN XMLSchema.dtd +-- xs:schema targetNamespace=http://www.w3.org/XML/1998/namespace; xmlns:xs=http://www.w3.org/2001/XMLSchema; xml:lang=en xs:annotation -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Tomcat and Naming
What is the role of Naming (org.apache.naming packeage) in Tomcat? Is it an essential part of Tomcat? Can the servlet container work without it? If it can be taken off, what I have to sacrifice. Thanks! --Zhenxin Wang DoCoMo Labs USA
Re: Daemon deps
On Thu, 1 Aug 2002, Patrick Luby wrote: Costin, Remy can probably comment on the commons-daemon.jar dependency. However, the commons-launcher.jar dependency is required for the scripts in the bin directory. Can you expand a bit ? Catalina itself should't depend on any of those - it should be possible to start it ( or embed it ) by just calling main(). If we want to use commons-daemon or launcher - that's fine, but that shouldn't require deps - launcher or daemon can use introspection. My 'favorite' method of starting will be JMX - I know one application that will use ant tasks to start tomcat, etc. I see no reason to have hard deps on any of those. Costin Patrick [EMAIL PROTECTED] wrote: Would it be possible to remove the dependency on Daemon ? I see no reason why Daemon couldn't use introspection to call start/stop/destroy. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 BUILDING.txt
patrickl2002/08/01 12:19:42 Modified:.BUILDING.txt Log: Correct URL for commons-digester nightly builds Revision ChangesPath 1.10 +2 -2 jakarta-tomcat-5/BUILDING.txt Index: BUILDING.txt === RCS file: /home/cvs/jakarta-tomcat-5/BUILDING.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BUILDING.txt 1 Aug 2002 14:30:36 - 1.9 +++ BUILDING.txt 1 Aug 2002 19:19:41 - 1.10 @@ -209,7 +209,7 @@ * Download a binary distribution (nightly build 20020801 or later) from: -http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester +http://jakarta.apache.org/builds/jakarta-commons/nightly/ On a Windows platform, you will need: commons-digester-MMDD.zip -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 BUILDING.txt
patrickl2002/08/01 12:21:18 Modified:.BUILDING.txt Log: Xerces 2.0.1 is no longer optional for JDK 1.4 since the JDK 1.4 parser does not handle XML schemas properly. Revision ChangesPath 1.11 +1 -3 jakarta-tomcat-5/BUILDING.txt Index: BUILDING.txt === RCS file: /home/cvs/jakarta-tomcat-5/BUILDING.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BUILDING.txt 1 Aug 2002 19:19:41 - 1.10 +++ BUILDING.txt 1 Aug 2002 19:21:18 - 1.11 @@ -100,8 +100,6 @@ distribution resides in its own directory (conventionally named xerces-x_y_z). -* This is optional with JDK 1.4 or later. - (5) Download and Install Subproject Source Code -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Diffie Hellman
Pier Fumagalli [EMAIL PROTECTED] writes: [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: Hi, does Tomcat support the Diffie-Hellman Key Agreement Method, when it is ssl enabled ? If not is it possible to make Tomcat-ssl use Diffie-Helman instead then RSA, so that Tomcat does not need a certificate when started in ssl mode ? I believe it depends on JSSI to do the cypher negotiation. Both JSSE and PureTLS have support for normal DH. JSSE has support for anonymous DH but PureTLS does not yet. That said, you're probably better off using self-signed RSA certificates since a fair number of SSL/TLS implementations do not support anonymous DH (e.g. almost no browsers do.) -Ekr -- [Eric Rescorla [EMAIL PROTECTED]] http://www.rtfm.com/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Daemon deps
Costin, You can invoke Tomcat's main() directly. commons-launcher.jar is only required for the Launcher. The Launcher is really only a substitute for the old shell scripts. Ultimately, the Launcher uses reflection to invoke Tomcat's main() method. So, commons-launcher.jar is only a dependency if you want to distribute the catalina.[sh|bat] scripts in that are in the bin directory. If you are embedding Tomcat 5 (like Sun does with J2EE), you do not need commons-launcher.jar at all. Or, if you want to ship Tomcat with your own customized scripts (like Sun does with JWSDP), you do not need commons-launcher.jar either. Hope that clears things up, Patrick [EMAIL PROTECTED] wrote: On Thu, 1 Aug 2002, Patrick Luby wrote: Costin, Remy can probably comment on the commons-daemon.jar dependency. However, the commons-launcher.jar dependency is required for the scripts in the bin directory. Can you expand a bit ? Catalina itself should't depend on any of those - it should be possible to start it ( or embed it ) by just calling main(). If we want to use commons-daemon or launcher - that's fine, but that shouldn't require deps - launcher or daemon can use introspection. My 'favorite' method of starting will be JMX - I know one application that will use ant tasks to start tomcat, etc. I see no reason to have hard deps on any of those. Costin Patrick [EMAIL PROTECTED] wrote: Would it be possible to remove the dependency on Daemon ? I see no reason why Daemon couldn't use introspection to call start/stop/destroy. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- Patrick Luby Email: [EMAIL PROTECTED] Sun Microsystems Phone: 408-276-7471 901 San Antonio Road, USCA14-303 Palo Alto, CA 94303-4900 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Daemon deps
Costin, After my last e-mail, I realized that there is one build dependency on commons-launcher.jar in jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/CatalinaLaunchFilter.java. The good news is that Tomcat's main() has no runtime dependency on this class. It only has a build dependency because of the source directory that I put it in. I will move the CatalinaLaunchFilter class to its own separate package so that it can be easily excluded from the build if you are not using the Launcher in your distribution. Patrick [EMAIL PROTECTED] wrote: On Thu, 1 Aug 2002, Patrick Luby wrote: Costin, Remy can probably comment on the commons-daemon.jar dependency. However, the commons-launcher.jar dependency is required for the scripts in the bin directory. Can you expand a bit ? Catalina itself should't depend on any of those - it should be possible to start it ( or embed it ) by just calling main(). If we want to use commons-daemon or launcher - that's fine, but that shouldn't require deps - launcher or daemon can use introspection. My 'favorite' method of starting will be JMX - I know one application that will use ant tasks to start tomcat, etc. I see no reason to have hard deps on any of those. Costin Patrick [EMAIL PROTECTED] wrote: Would it be possible to remove the dependency on Daemon ? I see no reason why Daemon couldn't use introspection to call start/stop/destroy. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- Patrick Luby Email: [EMAIL PROTECTED] Sun Microsystems Phone: 408-276-7471 901 San Antonio Road, USCA14-303 Palo Alto, CA 94303-4900 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 11379] New: - Jasper performs parallel compilations of same JSP.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11379. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11379 Jasper performs parallel compilations of same JSP. Summary: Jasper performs parallel compilations of same JSP. Product: Tomcat 4 Version: 4.0.4 Final Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Jasper 2 AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] If multiple requests are received for the same uncompiled JSP, then mulitple compiles are initiated for the same JSP file. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: HotSpot Virtual Machine Error : 11
Ed Borkmann [EMAIL PROTECTED] wrote: # Please report this error at # http://java.sun.com/cgi-bin/bugreport.cgi Can't you read what you post? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup CatalinaLaunchFilter.java
patrickl2002/08/01 13:29:20
Modified:catalina build.xml
catalina/src/bin catalina.xml
Added: catalina/src/share/org/apache/catalina/launcher
CatalinaLaunchFilter.java
Removed: catalina/src/share/org/apache/catalina/startup
CatalinaLaunchFilter.java
Log:
Move CatalinaLaunchFilter to a separate package since it forces a compile-time
dependency on commons-launcher.jar.
Revision ChangesPath
1.9 +2 -2 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 1 Aug 2002 18:02:07 - 1.8
+++ build.xml 1 Aug 2002 20:29:20 - 1.9
@@ -1038,13 +1038,13 @@
fileset dir=${catalina.build}/server/classes
include name=org/apache/catalina/startup/Bootstrap.class /
include name=org/apache/catalina/startup/BootstrapService.class /
-include name=org/apache/catalina/startup/CatalinaLaunchFilter.class /
include name=org/apache/catalina/startup/ClassLoaderFactory.class /
include name=org/apache/catalina/startup/Tool.class /
include name=org/apache/catalina/loader/StandardClassLoader*.class /
include name=org/apache/catalina/loader/Extension.class /
include name=org/apache/catalina/loader/Reloader.class /
include name=org/apache/catalina/startup/SecurityClassLoad.class /
+include name=org/apache/catalina/launcher/CatalinaLaunchFilter.class /
include name=org/apache/naming/JndiPermission.class /
/fileset
/jar
@@ -1053,10 +1053,10 @@
jar jarfile=${catalina.deploy}/server/lib/catalina.jar
fileset dir=${catalina.build}/server/classes
exclude name=org/apache/catalina/ant/** /
+exclude name=org/apache/catalina/launcher/** /
exclude name=org/apache/naming/** /
exclude name=org/apache/catalina/startup/Bootstrap.class /
exclude name=org/apache/catalina/startup/BootstrapService.class /
-exclude name=org/apache/catalina/startup/CatalinaLaunchFilter.class /
exclude name=org/apache/catalina/startup/ClassLoaderFactory.class /
exclude name=org/apache/catalina/startup/Tool.class /
exclude name=org/apache/catalina/loader/StandardClassLoader*.class /
1.3 +1 -1 jakarta-tomcat-catalina/catalina/src/bin/catalina.xml
Index: catalina.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalina.xml 1 Aug 2002 18:02:07 - 1.2
+++ catalina.xml 1 Aug 2002 20:29:20 - 1.3
@@ -98,7 +98,7 @@
waitforchild=${wait}
debug=${jdb}
print=${print}
- filterclassname=org.apache.catalina.startup.CatalinaLaunchFilter
+ filterclassname=org.apache.catalina.launcher.CatalinaLaunchFilter
filterclasspath=${bootstrap.jar}
usesystemin=false
requiretools=true
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/launcher/CatalinaLaunchFilter.java
Index: CatalinaLaunchFilter.java
===
/*
* $Header:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/launcher/CatalinaLaunchFilter.java,v
1.1 2002/08/01 20:29:20 patrickl Exp $
* $Revision: 1.1 $
* $Date: 2002/08/01 20:29:20 $
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally
cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/08/01 13:31:15
Modified:.build2.xml
Log:
Ok, split it in 3 ( utils, tomcat, jasper ).
Add a jdepend target.
The main reason for having multiple targets each building a small
component is to keep dependencies under control. JDepend will
at least display those deps - while the build system can be used
for building..
Note that I also added the 3.3 core into the mix - I'll try to
port few things ( the Mapper, the random generator, etc ) and
work on the adapter. You can exclude it if you want.
Revision ChangesPath
1.2 +89 -14jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build2.xml1 Aug 2002 17:35:12 - 1.1
+++ build2.xml1 Aug 2002 20:31:15 - 1.2
@@ -19,6 +19,8 @@
value=${basedir}/../jakarta-taglibs/
property name=commons.home
value=${basedir}/../jakarta-commons/
+ property name=tomcat.home
+ value=${basedir}/../jakarta-tomcat/
property name=catalina.home
value=${basedir}/../jakarta-tomcat-catalina/
property name=jasper.home
@@ -41,13 +43,17 @@
pathelement location=${activation.jar}/
pathelement location=${jta.jar}/
pathelement location=${log4j.jar}/
+ /path
+
+ path id=jasperjars
pathelement location=${jaxen.jar}/
pathelement location=${saxpath.jar}/
/path
!-- === DETECT: Display configuration == --
- target name=detect
+ target name=init
description=Display configuration and conditional compilation flags
+mkdir dir=${build.dir}/classes /
echo message=Path: ${toString:alljars}/
/target
@@ -61,38 +67,107 @@
!-- === COMBO: Build All Components --
target name=all
description=Clean, build, and deploy all components
- depends=detect
-mkdir dir=${build.dir}/classes /
+ depends=init,utils,tomcat,jasper /
+
+ target name=utils
+ description=Utils build
+
javac destdir=${build.dir}/classes
optimize=off
debug=on
classpathref=alljars
src
-path location=${api.home}/src/share /
-path location=${jasper.home}/src/share /
-path location=${taglibs.home}/standard/src /
-path location=${catalina.home}/catalina/src/share /
path location=${jtc.home}/util/java /
-path location=${jtc.home}/coyote/src/java /
-path location=${jtc.home}/jk/java /
-path location=${jtc.home}/http11/src/java /
path location=${commons.home}/modeler/src/java /
path location=${commons.home}/digester/src/java /
path location=${commons.home}/collections/src/java /
path location=${commons.home}/beanutils/src/java /
path location=${commons.home}/logging/src/java /
/src
- exclude name=org/apache/coyote/tomcat3/** /
- exclude name=org/apache/ajp/** /
exclude name=org/apache/tomcat/util/net/PureTLS* /
- exclude name=org/apache/naming/factory/Tyrex* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
- exclude name=org/apache/taglibs/standard/tag/common/xml/** /
exclude name=org/apache/commons/modeler/Modeler.java /
+/javac
+ /target
+
+ target name=tomcat
+ description=Tomcat build
+
+javac destdir=${build.dir}/classes
+ optimize=off
+ debug=on
+ classpathref=alljars
+ src
+path location=${api.home}/src/share /
+path location=${catalina.home}/catalina/src/share /
+path location=${jtc.home}/coyote/src/java /
+path location=${jtc.home}/jk/java /
+path location=${jtc.home}/http11/src/java /
+path location=${tomcat.home}/src/share /
+ /src
+ exclude name=org/apache/ajp/** /
+ exclude name=org/apache/jasper/** /
+ exclude name=org/apache/naming/factory/Tyrex* /
+ exclude name=org/apache/tomcat/ant/Tomcat3Precompiler.java /
exclude name=org/apache/catalina/startup/BootstrapService.java /
+/javac
+ /target
+
+
+ target name=jasper
+ description=Jasper build
+javac destdir=${build.dir}/classes
+ optimize=off
+ debug=on
+ classpathref=alljars
+ classpath refid=jasperjars/
+ src
+path location=${jasper.home}/src/share /
+path location=${taglibs.home}/standard/src /
+ /src
+ exclude name=org/apache/taglibs/standard/tag/common/xml/** /
exclude
Re: HotSpot Virtual Machine Error : 11
Its already been reported many times. I don't see any solutions though. Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm List-Unsubscribe: mailto:[EMAIL PROTECTED] List-Subscribe: mailto:[EMAIL PROTECTED] List-Help: mailto:[EMAIL PROTECTED] List-Post: mailto:[EMAIL PROTECTED] List-Id: Tomcat Developers List tomcat-dev.jakarta.apache.org Delivered-To: mailing list [EMAIL PROTECTED] X-Antivirus: nagoya (v4198 created Apr 24 2002) User-Agent: Microsoft-Entourage/10.1.0.2006 Date: Thu, 01 Aug 2002 13:25:58 -0700 Subject: Re: HotSpot Virtual Machine Error : 11 From: Pier Fumagalli [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Mime-version: 1.0 Content-transfer-encoding: 7bit X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N Ed Borkmann [EMAIL PROTECTED] wrote: # Please report this error at # http://java.sun.com/cgi-bin/bugreport.cgi Can't you read what you post? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[5] Removing some deps in o.a.catalina
This has been discussed long ago ( the MinTC thread, etc ). Curently o.a.catalina package depends on o.a.c.cluster, deploy, net, util. I would like to reduce/eliminate those dependencies. Craig, Remy - what do you think ? Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Parser.java
kinman 2002/08/01 13:55:04
Modified:jasper2/src/share/org/apache/jasper/compiler Parser.java
Log:
- Fixed failures in watch dog tests.
Revision ChangesPath
1.18 +4 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Parser.java 31 Jul 2002 21:42:27 - 1.17
+++ Parser.java 1 Aug 2002 20:55:04 - 1.18
@@ -1060,6 +1060,7 @@
if (reader.matches(/)) {
new Node.CustomTag(attrs, start, tagName, prefix, shortTagName,
tagInfo, tagFileInfo, tagHandlerClass, parent);
+ return true;
}
// Now we parse one of 'CustomActionTagDependent',
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
On Thu, 1 Aug 2002 [EMAIL PROTECTED] wrote: Date: Thu, 1 Aug 2002 09:51:09 -0700 (PDT) From: [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Re: New coyote branch On Thu, 1 Aug 2002, Craig R. McClanahan wrote: Justyna Horwat wrote:I looked in jakarta-tomcat-connectors and it doesn't look like jakarta-tomcat-connectors has been branched yet. I checked the archives and saw the vote results where it was decided that the HEAD of jakarta-tomcat-connectors will be used for Tomcat 5 and Coyote 1.0 would be branched. I'd like to request that this branch be created. Remy? The reason I ask is that I'm working on a servlet 2.4 servlet request events implementation which involves modifying CoyoteRequest.java. What kind of changes ? Coyote should be independent of servlet, if you need to add something you can add it to the main branch. 2.4 should be backward compatible - so it shouldn't change any behavior. Servlet 2.4 introduces attribute change listeners on the ServletRequest interface, analogous to the ones on sessions and contexts. The implementation of these features has to be in the concrete ServletRequest instance's removeAttribute() and setAttribute() methods. See the public draft spec for details. In the current Catalina archtecture, the connector provides this concrete class -- and in the case at hand, it's CoyoteRequest. Few alternatives to branching: - move CoyoteRequest to jakarta-catalina ( we could also move Tomcat33 classes in tomcat33 cvs ). We agreed that tomcat depends on coyote, not the reverse. - create a tomcat5 dir with the new methods. One important note: if the spec wants notification for _all_ request attribute changes, we'll also need to implement this in coyote.Request. Currently that require 2 new ActionCodes. o.a.coyote.Request doesn't have setAttribute() or replaceAttribute() methods, so I don't see why it would be affected -- only the Servlet 2.4 version of CoyoteRequest would seem to matter. We should also add an ActionCode for _get_ attribute, to support 'lazy' evaluation of some attributes. 3.3 uses a get/setInfo hook - it works for both Request and Context attributes. I don't understand what these have to do with the ServletRequest.removeAttribute() and ServletRequest.setAttribute() method implementations. Costin Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RUNNING.txt build.xml
patrickl2002/08/01 14:00:18
Modified:.build.xml
Added: .RUNNING.txt
Log:
Added initial startup and shutdown instructions. Still need to enumerate the various
-Dname=value arguments that can be used with the Launcher-based scripts. However, I
have included the -Dcatalina.base=... argument in the instructions.
Revision ChangesPath
1.16 +5 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 1 Aug 2002 14:30:36 - 1.15
+++ build.xml 1 Aug 2002 21:00:18 - 1.16
@@ -86,6 +86,11 @@
property name=catalina.home value=${tomcat.build}/
/ant
+!-- Correct permissions and line endings on bin scripts --
+fixcrlf srcdir=${tomcat.build}/bin includes=*.sh eol=lf/
+fixcrlf srcdir=${tomcat.build}/bin includes=*.bat eol=crlf/
+chmod dir=${tomcat.build}/bin includes=*.sh perm=+x/
+
/target
1.1 jakarta-tomcat-5/RUNNING.txt
Index: RUNNING.txt
===
$Id: RUNNING.txt,v 1.1 2002/08/01 21:00:18 patrickl Exp $
Running The Tomcat 5 Servlet/JSP Container
==
This subproject contains Tomcat 5, a server that implements the Servlet 2.4
and JSP 2.0 specifications from the Java Community Process
(http://www.jcp.org). In order to install and run this container, you must do
the following:
(0) Download and Install a Java Development Kit
* Download a Java Development Kit (JDK) release (version 1.2 or later) from:
http://java.sun.com/j2se/
* Install the JDK according to the instructions included with the release.
* Set an environment variable JAVA_HOME to the pathname of the directory
into which you installed the JDK release.
(1) Download and Install the Tomcat 5 Binary Distribution
NOTE: As an alternative to downloading a binary distribution, you can create
your own from the Tomcat source repository, as described in BUILDING.txt.
If you do this, the value to use for ${catalina.home} will be the dist
subdirectory of your source distribution.
* Download a binary distribution of Tomcat from:
http://jakarta.apache.org/builds/jakarta-tomcat-5/nightly/
On a Windows platform, you will need:
jakarta-tomcat-5-MMDD.zip
On a Unix platform, you will need:
jakarta-tomcat-5-MMDD.zip
* Unpack the binary distribution into a convenient location so that the
distribution resides in its own directory (conventionally named
jakarta-tomcat-5). For the purposes of the remainder of this document,
the symbolic name CATALINA_HOME is used to refer to the full
pathname of the release directory.
(2) Start Up Tomcat 5
Tomcat 5 can be started by executing the following commands:
CATALINA_HOME\bin\startup.bat (Windows)
CATALINA_HOME/bin/startup.sh (Unix)
After startup, the default web applications included with Tomcat 5 will be
available by browsing:
http://localhost:8080/
Further information about configuring and running Tomcat 5 can be found in
the documentation included here, as well as on the Tomcat web site:
http://jakarta.apache.org/tomcat/
(3) Shut Down Tomcat 5
Tomcat 5 can be shut down by executing the following command:
CATALINA_HOME\bin\shutdown(Windows)
CATALINA_HOME/bin/shutdown.sh (Unix)
(4) Advanced Configuration - Multiple Tomcat 5 Instances
In many circumstances, it is desirable to have a single copy of a Tomcat 5
binary distribution shared among multiple users on the same server. To make
this possible, you must pass a -Dcatalina.base=CATALINA_BASE argument when
executing the to the startup command (see (2)). In this
-Dcatalina.base=CATALINA_BASE argument, replace CATALINA_BASE with the
directory that contains the files unique to your Tomcat 5 instance.
When you use this -Dcatalina.base=CATALINA_BASE argument, Tomcat 5 will
calculate all relative references for files in the following directories based
on the value of CATALINA_BASE instead of CATALINA_HOME:
* conf - Server configuration files (including server.xml)
* logs - Log and output files
* webapps - Automatically loaded web applications
* work - Temporary working directories for web applications
* temp - Directory used by the JVM for temporary files (java.io.tmpdir)
If you do not pass the -Dcatalina.base=CATALINA_BASE argument to the startup
command, CATALINA_BASE will default to the same value as CATALINA_HOME (which
Re: Tomcat and Naming
On Thu, 1 Aug 2002, Zhenxin wang wrote: Date: Thu, 1 Aug 2002 12:11:25 -0700 From: Zhenxin wang [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Tomcat and Naming What is the role of Naming (org.apache.naming packeage) in Tomcat? It is used for two things: * To provide the JNDI naming context to web applications (per the J2EE platform spec requirements). This enables all the stuff described in the jndi-resources-howto.html page of the Tomcat docs. * To represent the static resources of a web application so that static file serving (for Tomcat standalone) and servlet API calls like ServletContext.getResource() and getResourceAsStream() will work. Is it an essential part of Tomcat? Yes (for the standard implementation in org.apache.catalina.core). This is primarily in terms of the second usage listed above -- the first one is pretty separable. Can the servlet container work without it? No (for the standard implementation in org.apache.catalina.core). If it can be taken off, what I have to sacrifice. I suspect that this is one of the places that MinTC did things differently, because it probably implemented its own version of the Catalina components. Thanks! --Zhenxin Wang DoCoMo Labs USA Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [5] Removing some deps in o.a.catalina
On Thu, 1 Aug 2002 [EMAIL PROTECTED] wrote: Date: Thu, 1 Aug 2002 13:45:34 -0700 (PDT) From: [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: List Tomcat-Dev [EMAIL PROTECTED] Subject: [5] Removing some deps in o.a.catalina This has been discussed long ago ( the MinTC thread, etc ). Curently o.a.catalina package depends on o.a.c.cluster, deploy, net, util. I would like to reduce/eliminate those dependencies. Craig, Remy - what do you think ? In 5.0 these should definitely be factored out of the top level o.a.catalina package. Costin Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
possible JDBCRealm bug?
org.apache.tomcat.aaa.JDBCRealm opens a database connection and never closes the connection. Would not a more correct behaviour be to open/close the connection before/after verifying credentials? When the connection is kept open, the corresponding database is held up. For example, when using postgres, one cannot shutdown and restart the db server without first shutting down tomcat. thought? opinions? -Tony Chao -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: possible JDBCRealm bug?
On Thu, 1 Aug 2002 [EMAIL PROTECTED] wrote: Date: Thu, 1 Aug 2002 17:09:11 -0400 From: [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: possible JDBCRealm bug? org.apache.tomcat.aaa.JDBCRealm opens a database connection and never closes the connection. Would not a more correct behaviour be to open/close the connection before/after verifying credentials? Doing this would make authentication horrendously slow on many databases, where establishing a connection can take many seconds. A better approach would be to use a connection pool (because you could then support multiple simultaneous authenications) -- but that doesn't solve your open connections issue. When the connection is kept open, the corresponding database is held up. For example, when using postgres, one cannot shutdown and restart the db server without first shutting down tomcat. thought? opinions? IMHO this is going to be the case for any web application that uses a connection pool anyway. However, one thing that many connection pools let you do is define a validation query or ping query that must succeed before the connection is returned to the user -- this would cause all the bad connections in the pool to get thrown away without impacting the app (other than the longer than usual time to establish a new replacement connection). Modifying JDBCRealm to use such a connection pool would seem like the best course of action. -Tony Chao Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages_es.properties messages_ja.properties
luehe 2002/08/01 14:17:58
Modified:jasper2/src/share/org/apache/jasper/compiler
PageDataImpl.java TagLibraryInfoImpl.java
Validator.java
jasper2/src/share/org/apache/jasper/resources
messages_es.properties messages_ja.properties
Log:
Implemented taglib directive changes:
- 'uri' attribute is no longer considered mandatory.
- Use new 'tagdir' attribute if present.
Revision ChangesPath
1.6 +9 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java
Index: PageDataImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PageDataImpl.java 22 Jul 2002 23:02:55 - 1.5
+++ PageDataImpl.java 1 Aug 2002 21:17:58 - 1.6
@@ -209,10 +209,14 @@
public void visit(Node.TaglibDirective n) throws JasperException {
Attributes attrs = n.getAttributes();
if (attrs != null) {
- String uri = attrs.getValue(uri);
+ String location = attrs.getValue(uri);
+ if (location == null) {
+ // JSP 2.0 CLARIFICATION NEEDED
+ location = attrs.getValue(tagdir);
+ }
String prefix = attrs.getValue(prefix);
rootAttrs.addAttribute(, , xmlns: + prefix, CDATA,
-uri);
+location);
}
}
}
1.9 +3 -23
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TagLibraryInfoImpl.java 31 Jul 2002 21:42:27 - 1.8
+++ TagLibraryInfoImpl.java 1 Aug 2002 21:17:58 - 1.9
@@ -467,7 +467,6 @@
}
TagAttributeInfo createAttribute(TreeNode elem) {
-//p(createAttribute\n + elem);
String name = null;
boolean required = false, rtexprvalue = false, reqTime = false;
String type = null;
@@ -500,8 +499,6 @@
}
}
-// p(name= + name + , required= + required + , type= + type +
-// , rtexprvalue= + rtexprvalue);
return new TagAttributeInfo(name, required, type, rtexprvalue);
}
@@ -642,7 +639,6 @@
Class tlvClass =
ctxt.getClassLoader().loadClass(validatorClass);
tlv = (TagLibraryValidator)tlvClass.newInstance();
- //p(got validator class: + tlv);
} catch (Exception ex) {
Constants.message(jsp.warning.tlvclass.is.null,
new Object[] {
@@ -712,18 +708,6 @@
return new FunctionInfo(name, klass, signature);
}
-/*
-static void copy(InputStream in, String fileName)
-throws IOException, FileNotFoundException
-{
-byte[] buf = new byte[1024];
-
-FileOutputStream out = new FileOutputStream(fileName);
-int nRead;
-while ((nRead = in.read(buf, 0, buf.length)) != -1)
-out.write(buf, 0, nRead);
-}
-*/
//*
// Until javax.servlet.jsp.tagext.TagLibraryInfo is fixed
@@ -753,8 +737,4 @@
}
protected TagLibraryValidator tagLibraryValidator;
-
-private void p(String s) {
- System.out.println([TagLibraryInfoImpl] + s);
-}
}
1.17 +12 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Validator.java31 Jul 2002 21:42:27 - 1.16
+++ Validator.java1 Aug 2002 21:17:58 - 1.17
@@ -334,7 +334,8 @@
new JspUtil.ValidAttribute(file, true) };
private static final JspUtil.ValidAttribute[] taglibDirectiveAttrs = {
- new JspUtil.ValidAttribute(uri, true),
+ new JspUtil.ValidAttribute(uri),
+ new JspUtil.ValidAttribute(tagdir),
new JspUtil.ValidAttribute(prefix, true) };
private static final JspUtil.ValidAttribute[]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties
luehe 2002/08/01 14:19:09
Modified:jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
Implemented taglib directive changes:
- 'uri' attribute is no longer considered mandatory.
- Use new 'tagdir' attribute if present.
Revision ChangesPath
1.21 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- messages.properties 31 Jul 2002 21:42:27 - 1.20
+++ messages.properties 1 Aug 2002 21:19:09 - 1.21
@@ -245,6 +245,7 @@
tld.error.variableNotAllowed=It is an error for a tag that has one or more variable
subelements to have a TagExtraInfo class that returns a non-null object.
jsp.error.tldInWebDotXmlNotFound=Could not locate TLD {1} for URI {0} specified in
web.xml
jsp.error.taglibDirective.absUriCannotBeResolved=This absolute uri ({0}) cannot be
resolved in either web.xml or the jar files deployed with this application
+jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir' attribute
specified in taglib directive
jsp.error.invalid.tagdir=Tag file directory {0} does not start with
\/WEB-INF/tags\
jsp.error.unterminated.user.tag=Unterminated user-defined tag: ending tag {0} not
found or incorrectly nested
#jspx.error.templateDataNotInJspCdata=Validation Error: Element lt;{0}gt; cannot
have template data. Template data must be encapsulated within a lt;jsp:cdatagt;
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 11383] New: - Manager: cannot load remote jar or war file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11383. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11383 Manager: cannot load remote jar or war file Summary: Manager: cannot load remote jar or war file Product: Tomcat 4 Version: 4.1.7 Platform: Sun OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Webapps:Administration AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Docs say an remote file should work (manager commands), but it does not appear to work. works:: http://db02:8080/manager/install? path=/mw_testwar=jar:file:/export/home/adlmw/mw_webclient-0.91-dev.war!/ fails:: http://db02:8080/manager/install? path=/mw_webclientwar=jar:http://moonstone.sdc.ucsb.edu/mw_webclient-0.91- dev.war!/ FAIL - Encountered exception java.lang.IllegalArgumentException: Invalid URL for web application archive: http://moonstone.sdc.ucsb.edu/mw_webclient-0.91- dev.war URL is correct. Browser offers to download file. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina build.xml
patrickl2002/08/01 14:31:13
Modified:catalina build.xml
Log:
Remove conditional copying of Xerces 2 as Xerces 2.0.1 is always required (even with
JDK 1.4) to handle XML schemas
Revision ChangesPath
1.10 +1 -17 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 1 Aug 2002 20:29:20 - 1.9
+++ build.xml 1 Aug 2002 21:31:13 - 1.10
@@ -499,22 +499,6 @@
/or
/and
/condition
-condition property=copy.xerces2.jars
- and
-not
- equals arg1=${light.dist} arg2=on /
-/not
-and
- equals arg1=${xerces2.jars.present} arg2=true /
- or
-equals arg1=${full.dist} arg2=on /
-not
- equals arg1=${jdk.1.4.present} arg2=true /
-/not
- /or
-/and
- /and
-/condition
/target
@@ -690,7 +674,7 @@
copy todir=${catalina.build}/common/lib file=../lib/tyrex.license/
--
/target
- target name=copy-xerces2.jars if=copy.xerces2.jars
+ target name=copy-xerces2.jars
copy todir=${catalina.build}/common/endorsed file=${xercesImpl.jar}/
copy todir=${catalina.build}/common/endorsed file=${xmlParserAPIs.jar}/
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
On Thu, 1 Aug 2002, Craig R. McClanahan wrote: o.a.coyote.Request doesn't have setAttribute() or replaceAttribute() methods, so I don't see why it would be affected -- only the Servlet 2.4 version of CoyoteRequest would seem to matter. ??? Are we talking about the same thing ? j-t-c/coyote/src/java/org/apache/coyote/Request.java does have setAttribute(). The request attributes are set by the connector - SSL stuff. For lazy evaluation we also need a getAttribute callback. I don't think coyote or connectors will replace attributes - at least the attributes in 2.3 are only set once ( and in theory before the request is served ). I don't understand what these have to do with the ServletRequest.removeAttribute() and ServletRequest.setAttribute() method implementations. If you want to be notified when an attribute is added to the request - it's not only ServletRequest.setAttribute that does that. Again, if the spec requires notifications _only_ for attribute changes initiated by a servlet - then it's fine to implement this only in ServletRequest.setAttribute(). Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspCompilationContext.java
kinman 2002/08/01 14:49:58
Modified:jasper2/src/share/org/apache/jasper
JspCompilationContext.java
Log:
- For a tag file, sure that the file name is the same as the class name.
Revision ChangesPath
1.12 +9 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JspCompilationContext.java31 Jul 2002 21:42:27 - 1.11
+++ JspCompilationContext.java1 Aug 2002 21:49:58 - 1.12
@@ -270,9 +270,15 @@
* generated class.
*/
public String getServletClassName() {
+
+ if (isTagFile) {
+ return tagInfo.getTagName();
+ }
+
if (servletClassName != null) {
return servletClassName;
}
+
int iSep = jspUri.lastIndexOf('/') + 1;
int iEnd = jspUri.length();
StringBuffer modifiedClassName =
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
On Thu, 1 Aug 2002 [EMAIL PROTECTED] wrote: Date: Thu, 1 Aug 2002 14:40:33 -0700 (PDT) From: [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Re: New coyote branch On Thu, 1 Aug 2002, Craig R. McClanahan wrote: o.a.coyote.Request doesn't have setAttribute() or replaceAttribute() methods, so I don't see why it would be affected -- only the Servlet 2.4 version of CoyoteRequest would seem to matter. ??? Are we talking about the same thing ? j-t-c/coyote/src/java/org/apache/coyote/Request.java does have setAttribute(). Well it does now ... it didn't in the version I had checked out (with a sticky tag so I wasn't seeing all he recent changes) :-). I see what you're talking about now -- but I'd bet you can still isolate the changes into CoyoteRequest by putting some stuff into setCoyoteRequest() to fire the event notifications. The request attributes are set by the connector - SSL stuff. For lazy evaluation we also need a getAttribute callback. I don't think coyote or connectors will replace attributes - at least the attributes in 2.3 are only set once ( and in theory before the request is served ). That makes sense. I don't understand what these have to do with the ServletRequest.removeAttribute() and ServletRequest.setAttribute() method implementations. If you want to be notified when an attribute is added to the request - it's not only ServletRequest.setAttribute that does that. Again, if the spec requires notifications _only_ for attribute changes initiated by a servlet - then it's fine to implement this only in ServletRequest.setAttribute(). Costin Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler TagFileProcessor.java
luehe 2002/08/01 15:26:50
Modified:jasper2/src/share/org/apache/jasper/compiler
TagFileProcessor.java
Log:
Added 'dynamic-attributes' to list of valid tag directive attributes
Revision ChangesPath
1.7 +4 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TagFileProcessor.java 31 Jul 2002 23:45:50 - 1.6
+++ TagFileProcessor.java 1 Aug 2002 22:26:50 - 1.7
@@ -106,8 +106,9 @@
private static final JspUtil.ValidAttribute[] tagDirectiveAttrs = {
new JspUtil.ValidAttribute(name),
-new JspUtil.ValidAttribute(dispaly-name),
+new JspUtil.ValidAttribute(display-name),
new JspUtil.ValidAttribute(body-content),
+new JspUtil.ValidAttribute(dynamic-attributes),
new JspUtil.ValidAttribute(small-icon),
new JspUtil.ValidAttribute(large-icon),
new JspUtil.ValidAttribute(description),
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: New coyote branch
What about this: - make the changes in CoyoteRequest - after we cleanup/enhance the ActionCode and hooking in coyote - we use it instead ( and support connector attributes and lazy eval ) BTW, it would be quite interesting to have this 'close' to the semantics of JMX notifications. It is nice to have all requests as mbeans - not for admin but for instrumentation ( what requests are active at each moment, statistical data, etc - eventually some methods like interrupt ). Attribute changes ( at context/session level ) could be bridged into jmx notifications. Costin On Thu, 1 Aug 2002, Craig R. McClanahan wrote: On Thu, 1 Aug 2002 [EMAIL PROTECTED] wrote: Date: Thu, 1 Aug 2002 14:40:33 -0700 (PDT) From: [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Subject: Re: New coyote branch On Thu, 1 Aug 2002, Craig R. McClanahan wrote: o.a.coyote.Request doesn't have setAttribute() or replaceAttribute() methods, so I don't see why it would be affected -- only the Servlet 2.4 version of CoyoteRequest would seem to matter. ??? Are we talking about the same thing ? j-t-c/coyote/src/java/org/apache/coyote/Request.java does have setAttribute(). Well it does now ... it didn't in the version I had checked out (with a sticky tag so I wasn't seeing all he recent changes) :-). I see what you're talking about now -- but I'd bet you can still isolate the changes into CoyoteRequest by putting some stuff into setCoyoteRequest() to fire the event notifications. The request attributes are set by the connector - SSL stuff. For lazy evaluation we also need a getAttribute callback. I don't think coyote or connectors will replace attributes - at least the attributes in 2.3 are only set once ( and in theory before the request is served ). That makes sense. I don't understand what these have to do with the ServletRequest.removeAttribute() and ServletRequest.setAttribute() method implementations. If you want to be notified when an attribute is added to the request - it's not only ServletRequest.setAttribute that does that. Again, if the spec requires notifications _only_ for attribute changes initiated by a servlet - then it's fine to implement this only in ServletRequest.setAttribute(). Costin Craig -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
luehe 2002/08/01 15:44:54
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
In generated doTag() method, catch IOException and rethrow as JspException
Revision ChangesPath
1.56 +7 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Generator.java1 Aug 2002 18:47:28 - 1.55
+++ Generator.java1 Aug 2002 22:44:54 - 1.56
@@ -2792,6 +2792,10 @@
private void generateTagHandlerPostamble() {
out.popIndent();
+out.printil(} catch (java.io.IOException ioe) {);
+ out.pushIndent();
+ out.printil(throw new javax.servlet.jsp.JspException(ioe););
+ out.popIndent();
out.printil(} finally {);
out.pushIndent();
out.printil(getJspContext().popPageScope(););
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet JspServletWrapper.java
kinman 2002/08/01 16:29:36
Modified:jasper2/src/share/org/apache/jasper
JspCompilationContext.java
jasper2/src/share/org/apache/jasper/servlet
JspServletWrapper.java
Log:
- Don't wrap JasperException's so error from compiling tag file got displayed.
Revision ChangesPath
1.13 +5 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspCompilationContext.java1 Aug 2002 21:49:58 - 1.12
+++ JspCompilationContext.java1 Aug 2002 23:29:36 - 1.13
@@ -512,6 +512,8 @@
try {
jspCompiler.compile();
reload = true;
+} catch (JasperException ex) {
+throw ex;
} catch (Exception ex) {
throw new JasperException(
Constants.getString(jsp.error.unable.compile),ex);
1.10 +4 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Index: JspServletWrapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JspServletWrapper.java1 Aug 2002 17:17:27 - 1.9
+++ JspServletWrapper.java1 Aug 2002 23:29:36 - 1.10
@@ -195,9 +195,7 @@
}
}
} catch (FileNotFoundException ex) {
-throw new JasperException(ex);
-} catch (JasperException ex) {
-throw ex;
+throw new JasperException(ex);
}
return tagHandlerClass;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
kinman 2002/08/01 18:19:26
Modified:jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
Log:
- Allows paths relative to TLD for tag files
Revision ChangesPath
1.10 +10 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TagLibraryInfoImpl.java 1 Aug 2002 21:17:58 - 1.9
+++ TagLibraryInfoImpl.java 2 Aug 2002 01:19:26 - 1.10
@@ -286,7 +286,7 @@
else if (tag.equals(tname))
tagVector.addElement(createTagInfo(element));
else if (tag-file.equals(tname))
-tagFileVector.addElement(createTagFileInfo(element));
+tagFileVector.addElement(createTagFileInfo(element, uri));
else if (function.equals(tname)) // JSP2.0
functionVector.addElement(createFunctionInfo(element));
else if (display-name.equals(tname) ||// Ignored elements
@@ -438,7 +438,7 @@
*
* @return TagInfo correspoding to tag file directives
*/
-private TagFileInfo createTagFileInfo(TreeNode elem)
+private TagFileInfo createTagFileInfo(TreeNode elem, String uri)
throws JasperException {
String name = null;
@@ -460,6 +460,11 @@
}
}
+path = path.replace('\\', '/');
+ if (!path.startsWith(/)) {
+ // relative to uri of TLD file
+path = uri.substring(0, uri.lastIndexOf(/) + 1) + path;
+ }
TagInfo tagInfo = TagFileProcessor.parseTagFile(parserController,
name, path,
this);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
luehe 2002/08/01 18:31:08
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Added package declaration to generated tag handler file
Revision ChangesPath
1.57 +11 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Generator.java1 Aug 2002 22:44:54 - 1.56
+++ Generator.java2 Aug 2002 01:31:08 - 1.57
@@ -2753,6 +2753,14 @@
private void generateTagHandlerPreamble(TagInfo tagInfo)
throws JasperException {
+ // Generate package declaration
+ String className = tagInfo.getTagClassName();
+ String pkgName = className.substring(0, className.lastIndexOf(.));
+ out.printin(package );
+ out.print(pkgName);
+ out.println(;);
+ out.println();
+
// Generate class declaration
out.printin(public class );
out.print(tagInfo.getTagName());
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardHostDeployer.java StandardServer.java
amyroh 2002/08/01 18:37:43
Modified:catalina/src/share/org/apache/catalina Context.java
catalina/src/share/org/apache/catalina/core
StandardContext.java StandardHostDeployer.java
StandardServer.java
Log:
Add install method where you can specify the configuration file to save the
Context information.
Revision ChangesPath
1.2 +20 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java
Index: Context.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Context.java 18 Jul 2002 16:47:37 - 1.1
+++ Context.java 2 Aug 2002 01:37:42 - 1.2
@@ -166,6 +166,20 @@
/**
+ * Return the path to a file to save this Context information.
+ */
+public String getConfigFile();
+
+
+/**
+ * Set the path to a file to save this Context information.
+ *
+ * @param configFile The path to a file to save this Context information.
+ */
+public void setConfigFile(String configFile);
+
+
+/**
* Return the correctly configured flag for this Context.
*/
public boolean getConfigured();
@@ -275,7 +289,7 @@
/**
* Set the naming resources for this web application.
- *
+ *
* @param namingResources The new naming resources
*/
public void setNamingResources(NamingResources namingResources);
@@ -347,7 +361,7 @@
/**
* Set the privileged flag for this web application.
- *
+ *
* @param privileged The new privileged flag
*/
public void setPrivileged(boolean privileged);
1.2 +39 -13
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardContext.java 18 Jul 2002 16:48:09 - 1.1
+++ StandardContext.java 2 Aug 2002 01:37:43 - 1.2
@@ -214,6 +214,12 @@
/**
+ * The path to a file to save this Context information.
+ */
+private String configFile = null;
+
+
+/**
* The correctly configured flag for this Context.
*/
private boolean configured = false;
@@ -378,7 +384,7 @@
* Should the next call to codeaddWelcomeFile()/code cause replacement
* of any existing welcome files? This will be set before processing the
* web application's deployment descriptor, so that application specified
- * choices strongreplace/strong, rather than append to, those defined
+ * choices strongreplace/strong, rather than append to, those defined
* in the global descriptor.
*/
private boolean replaceWelcomeFiles = false;
@@ -618,6 +624,26 @@
}
+/**
+ * Return the path to a file to save this Context information.
+ */
+public String getConfigFile() {
+
+return (this.configFile);
+
+}
+
+
+/**
+ * Set the path to a file to save this Context information.
+ *
+ * @param configFile The path to a file to save this Context information.
+ */
+public void setConfigFile(String configFile) {
+
+this.configFile = configFile;
+}
+
/**
* Return the correctly configured flag for this Context.
@@ -864,7 +890,7 @@
/**
* Set the naming resources for this web application.
- *
+ *
* @param namingResources The new naming resources
*/
public void setNamingResources(NamingResources namingResources) {
@@ -965,7 +991,7 @@
/**
* Set the privileged flag for this web application.
- *
+ *
* @param privileged The new privileged flag
*/
public void setPrivileged(boolean privileged) {
@@ -3342,9 +3368,9 @@
ok = false;
}
if (ok) {
-DirContext dirContext =
+DirContext dirContext =
((ProxyDirContext) resources).getDirContext();
-if ((dirContext != null)
+if ((dirContext != null)
(dirContext instanceof BaseDirContext)) {
((BaseDirContext) dirContext).allocate();
}
@@ -3436,7 +3462,7 @@
((Lifecycle) children[i]).start();
}
cvs commit: jakarta-tomcat-catalina/catalina/src/bin startup.bat
amyroh 2002/08/01 18:38:14 Modified:catalina/src/bin startup.bat Log: Shoudln't call setenv.bat if it doesn't exist. Revision ChangesPath 1.3 +0 -1 jakarta-tomcat-catalina/catalina/src/bin/startup.bat Index: startup.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/startup.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- startup.bat 1 Aug 2002 04:59:24 - 1.2 +++ startup.bat 2 Aug 2002 01:38:14 - 1.3 @@ -12,7 +12,6 @@ if exist %PRG%\..\setenv.bat goto gotCmdPath rem %0 must have been found by DOS using the %PATH% so we assume that rem setenv.bat will also be found in the %PATH% -call setenv.bat goto doneSetenv :gotCmdPath call %PRG%\..\setenv.bat -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
