UTF-8 characters
When a response to the browser is in UTF-8 encoding form responses from said page are giving UTF-8 characters when req.getParameter is called. i.e. instead of getting é, I get the UTF-8 encoding é returned to our servlet. Surely the getParameter method should return é as it does with other encodings. Is this a bug? Dave. This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk
RE: UTF-8 characters
try this code, Dave. String str = new String(request.getParameter(key).getBytes(ISO-8859-1), UTF-8); -Original Message- From: Oxley, David [mailto:[EMAIL PROTECTED] Sent: Tuesday, March 04, 2003 5:30 PM To: '[EMAIL PROTECTED]' Subject: UTF-8 characters When a response to the browser is in UTF-8 encoding form responses from said page are giving UTF-8 characters when req.getParameter is called. i.e. instead of getting é, I get the UTF-8 encoding é returned to our servlet. Surely the getParameter method should return é as it does with other encodings. Is this a bug? Dave. This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk --- Incoming mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: UTF-8 characters
Cheers, Worked a treat. Should this code be done automatically by Tomcat? Dave. -Original Message- From: Kent Degrano [mailto:[EMAIL PROTECTED] Sent: 04 March 2003 09:59 To: Tomcat Developers List Subject: RE: UTF-8 characters try this code, Dave. String str = new String(request.getParameter(key).getBytes(ISO-8859- 1), UTF-8); -Original Message- From: Oxley, David [mailto:[EMAIL PROTECTED] Sent: Tuesday, March 04, 2003 5:30 PM To: '[EMAIL PROTECTED]' Subject: UTF-8 characters When a response to the browser is in UTF-8 encoding form responses from said page are giving UTF-8 characters when req.getParameter is called. i.e. instead of getting é, I get the UTF-8 encoding é returned to our servlet. Surely the getParameter method should return é as it does with other encodings. Is this a bug? Dave. This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk --- Incoming mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk
[GUMP] Build Failure - jakarta-tomcat-5
This email is autogenerated from the output from: http://cvs.apache.org/builds/gump/2003-03-04/jakarta-tomcat-5.html Buildfile: build.xml prepare-release: [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release/v5.0 [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release/v5.0/bin [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/release/v5.0/src init: [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build/classes [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build/server/lib [mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-5/build/common/lib deploy-static: deploy: [echo] Target: Servlet API - Dist ... prepare: static: compile: examples: javadoc: jar: [copy] Copying 1 file to /home/rubys/jakarta/jakarta-servletapi-5/jsr154/build dist: [echo] Target: JSP API - Dist ... prepare: static: compile: examples: javadoc: jar: [copy] Copying 1 file to /home/rubys/jakarta/jakarta-servletapi-5/jsr152/build dist: [echo] Target: Modeler - Dist ... BUILD FAILED file:///home/rubys/jakarta/jakarta-tomcat-5/build.xml:577: Basedir /usr/local/commons-modeler-1.1dev does not exist Total time: 7 seconds - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[4.1.22] Tag later this week
I plan to tag 4.1.22 later this week. The idea is to allow getting some reports on the stability of 4.1.21, and port the last JSPC patch from TC 5 (for mangling). And then we'll have our next stable release for 4.1.x :) Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
jspc packaging fails?
Hello,
I'm trying the 'packaged jsp' of jspc. And I hope I understand it well.
Using ant 1.5.2 and Tomcat 4.1.21:
jspcsrcdir=${dstdir.home}
destdir=${tempdir.home}/jspc/java
uriroot=${dstdir.home}
classpath refid=local.classpath /
/jspc
javac srcdir=${tempdir.home}/jspc/java/
destdir=${tempdir.home}/jspc/classes/
classpath refid=local.classpath /
/javac
While http-getting /progs/broker/searchobject.jsp I get the next error:
javax.servlet.ServletException: org/apache/jsp/searchobject_jsp (wrong
name: progs/broker/searchobject_jsp)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:249)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:853)
ROOT CAUSE:
java.lang.NoClassDefFoundError: org/apache/jsp/searchobject_jsp (wrong
name: progs/broker/searchobject_jsp)
at java.lang.ClassLoader.defineClass0(Native Method)
at java.lang.ClassLoader.defineClass(ClassLoader.java:502)
at java.lang.ClassLoader.defineClass(ClassLoader.java:431)
at org.apache.jasper.servlet.JasperLoader.loadClass(JasperLoader.java:215)
Do I understand that this new jspc compiles the jsp's in there own
package and that tomcat can handle this?
Or does the packaged jsp in the RELEASE NOTES mean something else?
I also tried it with the jspc.bat from tomcat, but got the same error.
How do other people do this and do they have succes with it?
Greetings,
Ronald.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2 build.xml
larryi 2003/03/04 06:46:46
Modified:jasper2 build.xml
Log:
Fix the dist target. It's looking like Gump will need it.
Revision ChangesPath
1.21 +1 -1 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 5 Feb 2003 08:43:02 - 1.20
+++ build.xml 4 Mar 2003 14:46:46 - 1.21
@@ -254,7 +254,7 @@
!-- Executable commands --
mkdir dir=${jasper.dist}/bin/
-copy dest=${jasper.dist}/bin
+copy todir=${jasper.dist}/bin
fileset dir=${jasper.build}/bin /
/copy
fixcrlf srcdir=${jasper.dist}/bin includes=*.sh eol=lf/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2 build.xml
larryi 2003/03/04 06:47:41
Modified:jasper2 Tag: tomcat_4_branch build.xml
Log:
Port patch from HEAD for dist target.
Revision ChangesPath
No revision
No revision
1.7.2.2 +1 -1 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- build.xml 30 Aug 2002 11:40:34 - 1.7.2.1
+++ build.xml 4 Mar 2003 14:47:41 - 1.7.2.2
@@ -215,7 +215,7 @@
!-- Executable commands --
mkdir dir=${jasper.dist}/bin/
-copy dest=${jasper.dist}/bin
+copy todir=${jasper.dist}/bin
fileset dir=${jasper.build}/bin /
/copy
fixcrlf srcdir=${jasper.dist}/bin includes=*.sh eol=lf/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17638] New: - Spellingmisstake in the RELEASE-NOTES-4.1
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=17638. 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=17638 Spellingmisstake in the RELEASE-NOTES-4.1 Summary: Spellingmisstake in the RELEASE-NOTES-4.1 Product: Tomcat 4 Version: 4.1.21 Platform: All OS/Version: All Status: NEW Severity: Minor Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Below is a diff that corrects the spellingmisstake. Index: RELEASE-NOTES-4.1.txt === RCS file: /home/cvspublic/jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt,v retrieving revision 1.58 diff -u -r1.58 RELEASE-NOTES-4.1.txt --- RELEASE-NOTES-4.1.txt 4 Mar 2003 04:09:17 - 1.58 +++ RELEASE-NOTES-4.1.txt 4 Mar 2003 16:04:30 - @@ -1361,9 +1361,9 @@ (Jasper 2), as it has much higher performance and scalability than Jasper 1. -Administrartion web application: +-- +Administration web application: +-- The administration web application should currently be considered beta quality code, but is supported as an official component of Tomcat 4.1. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.1.txt
remm2003/03/04 08:15:26 Modified:.RELEASE-NOTES-4.1.txt Log: - No longer beta. Revision ChangesPath 1.59 +1 -11 jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt Index: RELEASE-NOTES-4.1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- RELEASE-NOTES-4.1.txt 4 Mar 2003 04:09:17 - 1.58 +++ RELEASE-NOTES-4.1.txt 4 Mar 2003 16:15:26 - 1.59 @@ -1361,16 +1361,6 @@ (Jasper 2), as it has much higher performance and scalability than Jasper 1. -Administrartion web application: - -The administration web application should currently be considered beta quality -code, but is supported as an official component of Tomcat 4.1. - -A finalized version will be delivered in an upcoming Tomcat 4.1 release. - - --- Symlinking static resources: --- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
JSP Tag spec question
I have a bodytag that extends BodyTagSupport If I call that tag without a body the doAfterBody() method never gets invoked. ie tag:test attr1=1/ does not work but tag:test attr1=1!-- some comment here --/tag:test does work tag:test attr1=1/tag:test does not work tag:test attr1=1 /tag:test does work (note the space between the tags) I tried to see what the spec says about this and from reading it I think this is not working correctly. Please let me know John - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Apache-Tomcat modules status
Hello all, I would like to know, which of the following modules do you recommend as Apache-Tomcat connector, w.r.to the criteria that I have mentioned below: 1. mod_webapp (It seems that this module is not active with in Tomcat community and not actively developed by the dev team for various reasons, please confirm the same). stability support performance suitability for production environment load balancing scalability 2. mod_jk2 (I am already using mod_jk and am fine with it. But, to leverage some of the mod_jk2 features, I am planning to go for mod_jk2 also). stability support performance suitability for production environment load balancing scalability Please advise me asap in this regard. Thanks in advance, Selva - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 LocalStrings_ja.properties
remm2003/03/04 09:14:47 Added: coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10 LocalStrings_ja.properties coyote/src/java/org/apache/coyote/tomcat5 Tag: coyote_10 LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath No revision No revision 1.1.2.1 +38 -0 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/Attic/LocalStrings_ja.properties No revision No revision 1.1.2.1 +41 -0 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/Attic/LocalStrings_ja.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 LocalStrings_ja.properties
remm2003/03/04 09:15:28 Added: http11/src/java/org/apache/coyote/http11 Tag: coyote_10 LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath No revision No revision 1.1.2.1 +33 -0 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Attic/LocalStrings_ja.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res LocalStrings_ja.properties
remm2003/03/04 09:19:55 Added: util/java/org/apache/tomcat/util/net/res Tag: coyote_10 LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath No revision No revision 1.1.2.1 +5 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/Attic/LocalStrings_ja.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: RE: UTF-8 characters
+1 to that Original Message From: Oxley, David [EMAIL PROTECTED] Sent: 2003-03-04 To: 'Tomcat Developers List' [EMAIL PROTECTED] Subject: RE: UTF-8 characters Cheers, Worked a treat. Should this code be done automatically by Tomcat? Dave. -Original Message- From: Kent Degrano [mailto:[EMAIL PROTECTED] Sent: 04 March 2003 09:59 To: Tomcat Developers List Subject: RE: UTF-8 characters try this code, Dave. String str = new String(request.getParameter(key).getBytes(ISO-8859- 1), UTF-8); -Original Message- From: Oxley, David [mailto:[EMAIL PROTECTED] Sent: Tuesday, March 04, 2003 5:30 PM To: '[EMAIL PROTECTED]' Subject: UTF-8 characters When a response to the browser is in UTF-8 encoding form responses from said page are giving UTF-8 characters when req.getParameter is called. i.e. instead of getting é, I get the UTF-8 encoding é returned to our servlet. Surely the getParameter method should return é as it does with other encodings. Is this a bug? Dave. This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk --- Incoming mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources LocalStrings_ja.properties
remm2003/03/04 09:25:30 Modified:catalina/src/share/org/apache/catalina/authenticator LocalStrings_ja.properties catalina/src/share/org/apache/catalina/core LocalStrings_ja.properties catalina/src/share/org/apache/catalina/loader LocalStrings_ja.properties catalina/src/share/org/apache/catalina/realm LocalStrings_ja.properties catalina/src/share/org/apache/catalina/servlets LocalStrings_ja.properties catalina/src/share/org/apache/catalina/session LocalStrings_ja.properties catalina/src/share/org/apache/catalina/startup LocalStrings_ja.properties catalina/src/share/org/apache/naming LocalStrings_ja.properties catalina/src/share/org/apache/naming/resources LocalStrings_ja.properties Added: catalina/src/share/org/apache/catalina/users LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath 1.2 +7 -6 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_ja.properties Index: LocalStrings_ja.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_ja.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LocalStrings_ja.properties18 Jul 2002 16:48:02 - 1.1 +++ LocalStrings_ja.properties4 Mar 2003 17:25:29 - 1.2 @@ -1,11 +1,12 @@ authenticator.alreadyStarted=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 authenticator.certificates=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u306f\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c\u30c1\u30a7\u30fc\u30f3\u304c\u3042\u308a\u307e\u305b\u3093 authenticator.forbidden=\u30ea\u30af\u30a8\u30b9\u30c8\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f -authenticator.invalid=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c\u30c1\u30a7\u30fc\u30f3\u306f\u7121\u52b9\u3067\u3059 -authenticator.keystore=\u30ad\u30fc\u30b9\u30c8\u30a2\u3092\u30ed\u30fc\u30c9\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f -authenticator.manager=\u30c8\u30e9\u30b9\u30c8\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u521d\u671f\u5316\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f -authenticator.notAuthenticated=\u8a2d\u5b9a\u30a8\u30e9\u30fc: \u8a3c\u660e\u3055\u308c\u305f\u4e3b\u4f53\u306a\u3057\u306b\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093 -authenticator.notContext=\u8a2d\u5b9a\u30a8\u30e9\u30fc: \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30a2\u30bf\u30c3\u30c1\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 +authenticator.formlogin=\u30d5\u30a9\u30fc\u30e0\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u3078\u306e\u7121\u52b9\u306a\u76f4\u63a5\u53c2\u7167\u3067\u3059 +authenticator.invalid=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u7121\u52b9\u306a\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c\u30c1\u30a7\u30fc\u30f3\u3067\u3059 +authenticator.keystore=\u30ad\u30fc\u30b9\u30c8\u30a2\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059 +authenticator.manager=\u30c8\u30e9\u30b9\u30c8\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u521d\u671f\u5316\u4e2d\u306e\u4f8b\u5916\u3067\u3059 +authenticator.notAuthenticated=\u8a2d\u5b9a\u30a8\u30e9\u30fc: \u8a8d\u8a3c\u3055\u308c\u305f\u4e3b\u4f53\u306a\u3057\u306b\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093 +authenticator.notContext=\u8a2d\u5b9a\u30a8\u30e9\u30fc: \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30a2\u30bf\u30c3\u30c1\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093 authenticator.notStarted=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 -authenticator.unauthorized=\u7528\u610f\u3055\u308c\u305f\u8a3c\u660e\u66f8\u3067\u8a8d\u8a3c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093 +authenticator.unauthorized=\u63d0\u4f9b\u3055\u308c\u305f\u8a3c\u660e\u66f8\u3067\u8a8d\u8a3c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 LocalStrings_ja.properties
remm2003/03/04 09:26:32 Added: coyote/src/java/org/apache/coyote/tomcat4 LocalStrings_ja.properties coyote/src/java/org/apache/coyote/tomcat5 LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath 1.2 +38 -0 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/LocalStrings_ja.properties 1.2 +41 -0 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/LocalStrings_ja.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 LocalStrings_ja.properties
remm2003/03/04 09:27:30 Added: http11/src/java/org/apache/coyote/http11 LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath 1.2 +33 -0 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/LocalStrings_ja.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4 LocalStrings_ja.properties
remm2003/03/04 09:29:30 Added: jk/java/org/apache/ajp/tomcat4 LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath 1.2 +22 -0 jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/LocalStrings_ja.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/res LocalStrings_ja.properties
remm2003/03/04 09:29:49
Modified:naming/src/org/apache/naming/res LocalStrings_ja.properties
Log:
- Add some Japanese translations contributed
by Kazuhiro Kazama kazama at ingrid.org
Revision ChangesPath
1.2 +23 -2
jakarta-tomcat-connectors/naming/src/org/apache/naming/res/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/res/LocalStrings_ja.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalStrings_ja.properties1 Oct 2002 18:49:49 - 1.1
+++ LocalStrings_ja.properties4 Mar 2003 17:29:49 - 1.2
@@ -1,6 +1,6 @@
contextBindings.unknownContext=\u672a\u77e5\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u540d\u3067\u3059
: {0}
-contextBindings.noContextBoundToThread=\u3053\u306e\u30b9\u30ec\u30c3\u30c9\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u308b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u306f\u540d\u524d\u304c\u3042\u308a\u307e\u305b\u3093
-contextBindings.noContextBoundToCL=\u3053\u306e\u30af\u30e9\u30b9\u30ed\u30fc\u30c0\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u308b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u306f\u540d\u524d\u304c\u3042\u308a\u307e\u305b\u3093
+contextBindings.noContextBoundToThread=\u540d\u524d\u4ed8\u3051\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u3053\u306e\u30b9\u30ec\u30c3\u30c9\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+contextBindings.noContextBoundToCL=\u540d\u524d\u4ed8\u3051\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u3053\u306e\u30af\u30e9\u30b9\u30ed\u30fc\u30c0\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
selectorContext.noJavaUrl=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306fjava:
URL\u3092\u7528\u3044\u3066\u30a2\u30af\u30bb\u30b9\u3055\u308c\u306d\u3070\u306a\u308a\u307e\u305b\u3093
namingContext.contextExpected=\u540d\u524d\u304c\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
namingContext.nameNotBound=\u540d\u524d {0}
\u306f\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
@@ -8,3 +8,24 @@
namingContext.invalidName=\u540d\u524d\u306f\u7121\u52b9\u3067\u3059
namingContext.alreadyBound=\u540d\u524d {0}
\u306f\u3059\u3067\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u3059
namingContext.noAbsoluteName=\u3053\u306e\u540d\u524d\u7a7a\u9593\u306b\u7d76\u5bfe\u540d\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093
+
+fileResources.base=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9 {0}
\u304c\u5b58\u5728\u3057\u306a\u3044\u3001\u307e\u305f\u306f\u8aad\u3081\u306a\u3044\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u3059
+warResources.notWar=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u306fWAR\u30d5\u30a1\u30a4\u30eb\u3092\u793a\u3055\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
+warResources.invalidWar=\u7121\u52b9\u307e\u305f\u306f\u8aad\u3081\u306a\u3044WAR\u30d5\u30a1\u30a4\u30eb\u3067\u3059
: {0}
+jarResources.syntax=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9 {0}
\u306f'jar:'\u3067\u59cb\u307e\u308a\u3001'!/'\u3067\u7d42\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
+resources.alreadyStarted=\u30ea\u30bd\u30fc\u30b9\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
+resources.connect=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9 {0}
\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093
+resources.input=\u30ea\u30bd\u30fc\u30b9 {0}
\u306b\u5165\u529b\u30b9\u30c8\u30ea\u30fc\u30e0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093
+resources.notStarted=\u30ea\u30bd\u30fc\u30b9\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+resources.null=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u306fnull\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
+resources.notFound=\u30ea\u30bd\u30fc\u30b9 {0}
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
+resources.path=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u76f8\u5bfe\u30d1\u30b9 {0}
\u306f'/'\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
+resources.alreadyBound=\u540d\u524d {0}
\u306f\u3059\u3067\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u3059
+resources.bindFailed=\u30d0\u30a4\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
+resources.unbindFailed=\u30a2\u30f3\u30d0\u30a4\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
+standardResources.alreadyStarted=\u30ea\u30bd\u30fc\u30b9\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res LocalStrings_ja.properties
remm2003/03/04 09:30:13 Added: util/java/org/apache/tomcat/util/net/res LocalStrings_ja.properties Log: - Add some Japanese translations contributed by Kazuhiro Kazama kazama at ingrid.org Revision ChangesPath 1.2 +5 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages_ja.properties
remm2003/03/04 09:32:39
Modified:jasper2/src/share/org/apache/jasper/resources
messages_ja.properties
Log:
- Add some Japanese translations contributed
by Kazuhiro Kazama kazama at ingrid.org
Revision ChangesPath
1.37 +161 -100
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- messages_ja.properties28 Feb 2003 00:12:41 - 1.36
+++ messages_ja.properties4 Mar 2003 17:32:39 - 1.37
@@ -16,22 +16,23 @@
jsp.error.not.impl.declarations=\u5185\u90e8\u30a8\u30e9\u30fc:
Declarations\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.not.impl.expressions=\u5185\u90e8\u30a8\u30e9\u30fc:
Expressions\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.not.impl.scriptlets=\u5185\u90e8\u30a8\u30e9\u30fc:
Scriptlets\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.not.impl.useBean=\u5185\u90e8\u30a8\u30e9\u30fc:
useBean\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+jsp.error.not.impl.usebean=\u5185\u90e8\u30a8\u30e9\u30fc:
useBean\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.not.impl.getp=\u5185\u90e8\u30a8\u30e9\u30fc:
getProperty\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.not.impl.setp=\u5185\u90e8\u30a8\u30e9\u30fc:
setProperty\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.not.impl.plugin=\u5185\u90e8\u30a8\u30e9\u30fc:
plugin\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.not.impl.forward=\u5185\u90e8\u30a8\u30e9\u30fc:
forward\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.not.impl.include=\u5185\u90e8\u30a8\u30e9\u30fc:
include\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.useBean.missing.attribute=useBean:
id\u5c5e\u6027\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u30b9\u30da\u30eb\u30df\u30b9\u3067\u3059
-jsp.error.useBean.missing.type=useBean ({0}):
class\u5c5e\u6027\u304btype\u5c5e\u6027\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
-jsp.error.useBean.duplicate=useBean:
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
-jsp.error.useBean.prohibited.as.session=\u4ee5\u524d\u306b\u5b9a\u7fa9\u3057\u305fJSP\u6307\u793a\u5b50\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u3001session
bean {0} \u3068\u3057\u3066\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093:
-jsp.error.useBean.not.both=useBean:
class\u5c5e\u6027\u3068beanName\u5c5e\u6027\u306e\u4e21\u65b9\u3092\u540c\u6642\u306b\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093:
-jsp.error.useBean.bad.type.cast=useBean ({0}): type ({1}) \u306fclass ({2})
\u304b\u3089\u5272\u308a\u5f53\u3066\u3089\u308c\u307e\u305b\u3093
-jsp.error.useBean.invalid.scope=useBean: ({0}) \u4e2d\u306escope\u5c5e\u6027 ({1})
\u306f\u7121\u52b9\u3067\u3059
+jsp.error.unavailable=JSP\u306f\u5229\u7528\u4e0d\u53ef\u3068\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059
+jsp.error.usebean.missing.attribute=useBean:
id\u5c5e\u6027\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u30b9\u30da\u30eb\u30df\u30b9\u3067\u3059
+jsp.error.usebean.missing.type=useBean ({0}):
class\u5c5e\u6027\u304btype\u5c5e\u6027\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
+jsp.error.usebean.duplicate=useBean:
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
+jsp.error.usebean.prohibited.as.session=\u4ee5\u524d\u306b\u5b9a\u7fa9\u3057\u305fJSP\u6307\u793a\u5b50\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u3001session
bean {0} \u3068\u3057\u3066\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093:
+jsp.error.usebean.not.both=useBean:
class\u5c5e\u6027\u3068beanName\u5c5e\u6027\u306e\u4e21\u65b9\u3092\u540c\u6642\u306b\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093:
+jsp.error.usebean.bad.type.cast=useBean ({0}): type ({1}) \u306fclass ({2})
\u304b\u3089\u5272\u308a\u5f53\u3066\u3089\u308c\u307e\u305b\u3093
+jsp.error.invalid.scope='scope'\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
{0}
(\page\\u3001\request\\u3001\session\\u307e\u305f\u306f\application\\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.warning.bad.type=\u8b66\u544a:
.class\u30d5\u30a1\u30a4\u30eb\u4e2d\u306e\u578b\u304c\u9055\u3044\u307e\u3059
cvs commit: jakarta-tomcat-connectors/jk build.xml
costin 2003/03/04 10:12:49 Modified:jk build.xml Log: Exclude jkmx if JMX is not present Revision ChangesPath 1.65 +2 -2 jakarta-tomcat-connectors/jk/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- build.xml 26 Jan 2003 03:00:23 - 1.64 +++ build.xml 4 Mar 2003 18:12:49 - 1.65 @@ -175,9 +175,9 @@ verbose=off exclude name=org/apache/ajp/** if=tomcat5.detect/ exclude name=org/apache/ajp/tomcat4/** unless=tomcat40.detect/ -exclude name=org/apache/ajp/tomcat33/** - unless=tomcat33.detect/ +exclude name=org/apache/ajp/tomcat33/** unless=tomcat33.detect/ exclude name=org/apache/jk/common/JkMX.java unless=jmx.detect/ + exclude name=org/apache/jk/common/ModJkMX.java unless=jmx.detect/ exclude name=org/apache/jk/common/Shm14.java unless=jdk14.detect/ classpath path refid=xml-apis.classpath/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkMain.java
costin 2003/03/04 10:14:35 Modified:jk/java/org/apache/jk/server JkMain.java Log: Add the class name - for easier config Revision ChangesPath 1.35 +1 -0 jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java Index: JkMain.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- JkMain.java 20 Jan 2003 23:48:40 - 1.34 +++ JkMain.java 4 Mar 2003 18:14:34 - 1.35 @@ -127,6 +127,7 @@ modules.put(shm, org.apache.jk.common.Shm); modules.put(request,org.apache.jk.common.HandlerRequest); modules.put(container,org.apache.jk.common.HandlerRequest); +modules.put(modjk,org.apache.jk.common.ModJkMX); initHTTPSUrls(); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
costin 2003/03/04 10:20:36
Modified:util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
Reduce verbosity and add more info to the message
Revision ChangesPath
1.13 +7 -5
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PoolTcpEndpoint.java 10 Jan 2003 20:22:37 - 1.12
+++ PoolTcpEndpoint.java 4 Mar 2003 18:20:36 - 1.13
@@ -332,10 +332,12 @@
}
s.close();
} catch(Exception e) {
-log.error(Caught exception trying to unlock accept., e);
+log.error(Caught exception trying to unlock accept on + port
++ + e.toString());
}
try {
-serverSocket.close();
+if( serverSocket!=null)
+serverSocket.close();
} catch(Exception e) {
log.error(Caught exception trying to close socket., e);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log CommonLogHandler.java
costin 2003/03/04 10:21:47
Modified:util/java/org/apache/tomcat/util/log CommonLogHandler.java
Log:
This may look like a stupid commit - but this is the only piece of jtc that
didn't compile with gcj compiler.
Revision ChangesPath
1.2 +13 -26
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CommonLogHandler.java
Index: CommonLogHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CommonLogHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommonLogHandler.java 10 Apr 2002 22:57:22 - 1.1
+++ CommonLogHandler.java 4 Mar 2003 18:21:47 - 1.2
@@ -92,6 +92,7 @@
int verbosityLevel)
{
if( prefix==null ) prefix=tomcat;
+
org.apache.commons.logging.Log
l=(org.apache.commons.logging.Log)loggers.get( prefix );
if( l==null ) {
l=LogFactory.getLog( prefix );
@@ -101,41 +102,27 @@
if( verbosityLevel this.level ) return;
if( t==null ) {
-switch( verbosityLevel ) {
-case Log.FATAL:
-l.fatal( msg );
-break;
-case Log.ERROR:
+if( verbosityLevel == Log.FATAL )
+l.fatal(msg);
+else if( verbosityLevel == Log.ERROR )
l.error( msg );
-break;
-case Log.WARNING:
+else if( verbosityLevel == Log.WARNING )
l.warn( msg );
-break;
-case Log.INFORMATION:
+else if( verbosityLevel == Log.INFORMATION)
l.info( msg );
-break;
-case Log.DEBUG:
+else if( verbosityLevel == Log.DEBUG )
l.debug( msg );
-break;
-}
} else {
-switch( verbosityLevel ) {
-case Log.FATAL:
-l.fatal( msg, t );
-break;
-case Log.ERROR:
+if( verbosityLevel == Log.FATAL )
+l.fatal(msg, t);
+else if( verbosityLevel == Log.ERROR )
l.error( msg, t );
-break;
-case Log.WARNING:
+else if( verbosityLevel == Log.WARNING )
l.warn( msg, t );
-break;
-case Log.INFORMATION:
+else if( verbosityLevel == Log.INFORMATION)
l.info( msg, t );
-break;
-case Log.DEBUG:
+else if( verbosityLevel == Log.DEBUG )
l.debug( msg, t );
-break;
-}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [4.1.22] Tag later this week
Remy Maucherat wrote: I plan to tag 4.1.22 later this week. The idea is to allow getting some reports on the stability of 4.1.21, and port the last JSPC patch from TC 5 (for mangling). And then we'll have our next stable release for 4.1.x :) Remy Thanks for the info and all the effort! - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Tomcat 4.1.18 SocketException
Am I the only one getting this somewhat annoying exceptions all over the places when using the new coyote HTTP/1.1 connector ? Happened on all 4.1.x coyote HTTP connectors... Although it doesn't seem to be affecting sending response back to the browser... Any comment would be appreciated... Jindong. -Original Message- From: Jindong Li Sent: Monday, January 06, 2003 2:17 PM To: 'Tomcat Developers List' Subject:Tomcat 4.1.17 SocketException Here's another one when I'm trying Tomcat 4.1.x : Here's the exception I got: java.net.SocketException: Connection aborted by peer: socket write error at java.net.SocketOutputStream.socketWrite(Native Method) at java.net.SocketOutputStream.write(SocketOutputStream.java:83) at org.apache.catalina.connector.ResponseBase.flushBuffer(ResponseBase.java:675 ) at org.apache.catalina.connector.HttpResponseBase.doFlushBuffer(HttpResponseBas e.java:795) at org.apache.catalina.connector.HttpResponseBase.flushBuffer(HttpResponseBase. java:785) at org.apache.catalina.connector.ResponseBase.write(ResponseBase.java:648) at org.apache.catalina.connector.ResponseStream.write(ResponseStream.java:313) at org.apache.catalina.connector.http.HttpResponseStream.write(HttpResponseStre am.java:190) at org.apache.catalina.servlets.DefaultServlet.copyRange(DefaultServlet.java:19 96) at org.apache.catalina.servlets.DefaultServlet.copy(DefaultServlet.java:1745) at org.apache.catalina.servlets.DefaultServlet.serveResource(DefaultServlet.jav a:1073) at org.apache.catalina.servlets.DefaultServlet.doGet(DefaultServlet.java:506) at javax.servlet.http.HttpServlet.service(HttpServlet.java:740) at javax.servlet.http.HttpServlet.service(HttpServlet.java:853) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Application FilterChain.java:247) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterCh ain.java:193) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.ja va:260) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.ja va:191) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContext.invoke(StandardContext.java:2415) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:180 ) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.valves.ErrorDispatcherValve.invoke(ErrorDispatcherValve. java:170) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:641) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:172 ) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:641) at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:509) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:641) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java :174) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.connector.http.HttpProcessor.process(HttpProcessor.java: 1040) at org.apache.catalina.connector.http.HttpProcessor.run(HttpProcessor.java:1151 ) at java.lang.Thread.run(Thread.java:484) Any input would be greatly appreciated... Jindong. # This e-mail message has been scanned for Viruses and Content and cleared by MailMarshal #
RE: Tomcat 4.1.18 SocketException
The actual exception when using 4.1.18 with j2sdk1.4.1_02: 2003-03-04 13:51:02 StandardWrapperValve[default]: Servlet.service() for servlet default threw exception java.net.SocketException: Software caused connection abort: socket write error at java.net.SocketOutputStream.socketWrite0(Native Method) at java.net.SocketOutputStream.socketWrite(SocketOutputStream.java:92) at java.net.SocketOutputStream.write(SocketOutputStream.java:136) at org.apache.coyote.http11.InternalOutputBuffer$OutputStreamOutputBuffer.doWri te(InternalOutputBuffer.java:668) at org.apache.coyote.http11.filters.IdentityOutputFilter.doWrite(IdentityOutput Filter.java:160) at org.apache.coyote.http11.InternalOutputBuffer.doWrite(InternalOutputBuffer.j ava:523) at org.apache.coyote.Response.doWrite(Response.java:524) at org.apache.coyote.tomcat4.OutputBuffer.realWriteBytes(OutputBuffer.java:384) at org.apache.tomcat.util.buf.ByteChunk.flushBuffer(ByteChunk.java:360) at org.apache.tomcat.util.buf.ByteChunk.append(ByteChunk.java:338) at org.apache.coyote.tomcat4.OutputBuffer.writeBytes(OutputBuffer.java:411) at org.apache.coyote.tomcat4.OutputBuffer.write(OutputBuffer.java:398) at org.apache.coyote.tomcat4.CoyoteOutputStream.write(CoyoteOutputStream.java:1 10) at org.apache.catalina.servlets.DefaultServlet.copyRange(DefaultServlet.java:19 96) at org.apache.catalina.servlets.DefaultServlet.copy(DefaultServlet.java:1745) at org.apache.catalina.servlets.DefaultServlet.serveResource(DefaultServlet.jav a:1073) at org.apache.catalina.servlets.DefaultServlet.doGet(DefaultServlet.java:506) at javax.servlet.http.HttpServlet.service(HttpServlet.java:740) at javax.servlet.http.HttpServlet.service(HttpServlet.java:853) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Application FilterChain.java:247) at org.apache.catalina.core.ApplicationFilterChain.access$000(ApplicationFilter Chain.java:98) at org.apache.catalina.core.ApplicationFilterChain$1.run(ApplicationFilterChain .java:176) at java.security.AccessController.doPrivileged(Native Method) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterCh ain.java:172) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.ja va:260) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.ja va:191) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContext.invoke(StandardContext.java:2415) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:180 ) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.valves.ErrorDispatcherValve.invoke(ErrorDispatcherValve. java:170) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:641) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:172 ) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:641) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java :174) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invok eNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.coyote.tomcat4.CoyoteAdapter.service(CoyoteAdapter.java:223) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:432) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.processConne ction(Http11Protocol.java:386) at org.apache.tomcat.util.net.TcpWorkerThread.runIt(PoolTcpEndpoint.java:534) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.jav a:530) at java.lang.Thread.run(Thread.java:536) -Original Message- From: Jindong Li [mailto:[EMAIL PROTECTED] Sent: Tuesday,
cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.1.txt
amyroh 2003/03/04 12:35:14 Modified:.RELEASE-NOTES-4.1.txt Log: Fix minor spelling error. Revision ChangesPath 1.60 +2 -2 jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt Index: RELEASE-NOTES-4.1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.1.txt,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- RELEASE-NOTES-4.1.txt 4 Mar 2003 16:15:26 - 1.59 +++ RELEASE-NOTES-4.1.txt 4 Mar 2003 20:35:14 - 1.60 @@ -1184,7 +1184,7 @@ * Enabling SSI and CGI Support * Security manager URLs * Using Jasper 1 with Tomcat 4.1 -* Administrartion web application +* Administration web application * Symlinking static resources * Enabling invoker servlet - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17638] - Spellingmisstake in the RELEASE-NOTES-4.1
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=17638. 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=17638 Spellingmisstake in the RELEASE-NOTES-4.1 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-03-04 20:38 --- The sentence with the spelling error is removed with an update. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16285] - Japser (JSPC) can't generate appropriate package structure
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=16285. 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=16285 Japser (JSPC) can't generate appropriate package structure --- Additional Comments From [EMAIL PROTECTED] 2003-03-04 21:57 --- is this a dup of Bug #11891? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl When.java
kinman 2003/03/04 14:23:48
Modified:jasper2/src/share/org/apache/jasper/compiler/tagplugin
TagPluginContext.java
jasper2/src/share/org/apache/jasper/tagplugins/jstl
When.java
Log:
- In PluginContext, use setPluginAttribute instead of setAttribute to
avoid confusion and to make its function exmplicit. Same for getAttribute.
Revision ChangesPath
1.11 +9 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
Index: TagPluginContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/tagplugin/TagPluginContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TagPluginContext.java 15 Feb 2003 01:41:45 - 1.10
+++ TagPluginContext.java 4 Mar 2003 22:23:48 - 1.11
@@ -146,8 +146,8 @@
/**
* Get the PluginContext for the parent of this custom tag. NOTE:
* The operations available for PluginContext so obtained is limited
- * to getAttribute and setAttribute, and queries (e.g. isScriptless(),
- * There should be no generate*().
+ * to getPluginAttribute and setPluginAttribute, and queries (e.g.
+ * isScriptless(). There should be no calls to generate*().
* @return The pluginContext for the parent node.
* null if the parent is not a custom tag, or if the pluginConxt
* if not available (because useTagPlugin is false, e.g).
@@ -156,12 +156,14 @@
/**
* Associate the attribute with a value in the current tagplugin context.
+ * The plugin attributes can be used for communication among tags that
+ * must work together as a group. See c:when for an example.
*/
-void setAttribute(String attr, Object value);
+void setPluginAttribute(String attr, Object value);
/**
* Get the value of an attribute in the current tagplugin context.
*/
-Object getAttribute(String attr);
+Object getPluginAttribute(String attr);
}
1.2 +5 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/When.java
Index: When.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/When.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- When.java 15 Feb 2003 01:41:46 - 1.1
+++ When.java 4 Mar 2003 22:23:48 - 1.2
@@ -73,13 +73,13 @@
return;
}
- if (true.equals(parentContext.getAttribute(hasBeenHere))) {
+ if (true.equals(parentContext.getPluginAttribute(hasBeenHere))) {
ctxt.generateJavaSource(} else if();
// See comment below for the reason we generate the extra } here.
}
else {
ctxt.generateJavaSource(if();
- parentContext.setAttribute(hasBeenHere, true);
+ parentContext.setPluginAttribute(hasBeenHere, true);
}
ctxt.generateAttribute(test);
ctxt.generateJavaSource(){);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Validator.java
luehe 2003/03/04 14:34:26
Modified:jasper2/src/share/org/apache/jasper/compiler Validator.java
Log:
Fixed regression when checking that no invalid named attributes are present
Revision ChangesPath
1.89 +4 -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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Validator.java3 Mar 2003 18:19:59 - 1.88
+++ Validator.java4 Mar 2003 22:34:25 - 1.89
@@ -998,7 +998,7 @@
String attrPrefix = na.getPrefix();
if (na.getLocalName().equals(tldAttrs[j].getName())
(attrPrefix == null || attrPrefix.length() == 0
- || attrPrefix == n.getPrefix())) {
+ || attrPrefix.equals(n.getPrefix( {
jspAttrs[start + i] = new Node.JspAttribute(na, false);
NamedAttributeVisitor nav = null;
if (na.getBody() != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Validator.java
luehe 2003/03/04 14:41:13
Modified:jasper2/src/share/org/apache/jasper/compiler Validator.java
Log:
Fixed URI comparison when checking that no invalid XML-style attributes are present
Revision ChangesPath
1.90 +4 -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.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Validator.java4 Mar 2003 22:34:25 - 1.89
+++ Validator.java4 Mar 2003 22:41:12 - 1.90
@@ -891,7 +891,7 @@
if (attrs.getLocalName(i).equals(tldAttrs[j].getName())
(attrs.getURI(i) == null
|| attrs.getURI(i).length() == 0
- || attrs.getURI(i) == n.getURI())) {
+ || attrs.getURI(i).equals(n.getURI( {
if (tldAttrs[j].canBeRequestTime()) {
Class expectedType = String.class;
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: UTF-8 characters
It would be nice if Tomcat detected the encoding. I posted a similar question with no response. Here's how I think you should handle this. // call before getting anything from the reqest request.setCharacterEncoding(UTF-8); Then all strings will be pulled as UTF-8 which is equivalent to the work-around below. FYI, from the Servlet 2.3 specification: SRV.4.9 Request data encoding Currently, many browsers do not send a char encoding qualifier with the Content- Type header, leaving open the determination of the character encoding for reading HTTP requests. The default encoding of a request the container uses to create the request reader and parse POST data must be ISO-8859-1, if none has been specified by the client request. However, in order to indicate to the developer in this case the failure of the client to send a character encoding, the container returns null from the getCharacterEncoding method. If the client hasnt set character encoding and the request data is encoded with a different encoding than the default as described above, breakage can occur. To remedy this situation, a new method setCharacterEncoding(String enc) has been added to the ServletRequest interface. Developers can override the character encoding supplied by the container by calling this method. It must be called prior to parsing any post data or reading any input from the request. Calling this method once data has been read will not affect the encoding. What I don't understand is why Tomcat isn't detecting and using the Content-Type header when it IS specified. I have done tests to show that Content-Type is being set but I still am forced to do the request.setCharacterEncoding() to get things out correctly. ~Tom On Tuesday, March 4, 2003, at 03:03 AM, Oxley, David wrote: Cheers, Worked a treat. Should this code be done automatically by Tomcat? Dave. -Original Message- From: Kent Degrano [mailto:[EMAIL PROTECTED] Sent: 04 March 2003 09:59 To: Tomcat Developers List Subject: RE: UTF-8 characters try this code, Dave. String str = new String(request.getParameter(key).getBytes(ISO-8859- 1), UTF-8); -Original Message- From: Oxley, David [mailto:[EMAIL PROTECTED] Sent: Tuesday, March 04, 2003 5:30 PM To: '[EMAIL PROTECTED]' Subject: UTF-8 characters When a response to the browser is in UTF-8 encoding form responses from said page are giving UTF-8 characters when req.getParameter is called. i.e. instead of getting , I get the UTF-8 encoding returned to our servlet. Surely the getParameter method should return as it does with other encodings. Is this a bug? Dave. __ __ This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk __ __ --- Incoming mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.456 / Virus Database: 256 - Release Date: 2/18/2003 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ __ This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk __ __ ___ _ This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk ___ _
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c
costin 2003/03/04 15:55:35
Modified:jk/native2/common jk_channel_socket.c
Log:
Add graceful to channel - it's easier to config.
Revision ChangesPath
1.50 +5 -3 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- jk_channel_socket.c 1 Mar 2003 05:49:58 - 1.49
+++ jk_channel_socket.c 4 Mar 2003 23:55:35 - 1.50
@@ -113,9 +113,9 @@
static int JK_METHOD jk2_channel_socket_close(jk_env_t *env, jk_channel_t *ch,
jk_endpoint_t *endpoint);
-static char *jk2_channel_socket_getAttributeInfo[]={host, port, keepalive,
timeout, nodelay,
+static char *jk2_channel_socket_getAttributeInfo[]={host, port, keepalive,
timeout, nodelay, graceful,
debug, disabled, NULL };
-static char *jk2_channel_socket_setAttributeInfo[]={host, port, keepalive,
timeout, nodelay,
+static char *jk2_channel_socket_setAttributeInfo[]={host, port, keepalive,
timeout, nodelay, graceful,
debug, disabled, NULL };
static int JK_METHOD jk2_channel_socket_setAttribute(jk_env_t *env,
@@ -162,6 +162,8 @@
return jk2_env_itoa( env, socketInfo-keepalive );
} else if( strcmp( timeout, name ) == 0 ) {
return jk2_env_itoa( env, socketInfo-timeout );
+} else if( strcmp( graceful, name ) == 0 ) {
+return jk2_env_itoa( env, ch-worker-graceful );
} else if( strcmp( debug, name ) == 0 ) {
return jk2_env_itoa( env, ch-mbean-debug );
} else if( strcmp( disabled, name ) == 0 ) {
@@ -311,7 +313,7 @@
int sock;
int ret;
-
+
sock = socket(AF_INET, SOCK_STREAM, 0);
if(sock 0) {
#ifdef WIN32
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_un.c
costin 2003/03/04 15:56:37
Modified:jk/native2/common jk_channel_un.c
Log:
Added few visible attributes to channel_un
I still get some ocasional errors - can't reproduce it consistently, but
it happened twice in the last 3 days.
Revision ChangesPath
1.16 +27 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c
Index: jk_channel_un.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_channel_un.c 4 Feb 2003 07:39:59 - 1.15
+++ jk_channel_un.c 4 Mar 2003 23:56:37 - 1.16
@@ -103,8 +103,10 @@
jk_endpoint_t *endpoint);
static char *jk2_channel_un_multiValueInfo[]={group, NULL };
-static char *jk2_channel_un_setAttributeInfo[]={file, route, lb_factor,
+static char *jk2_channel_un_setAttributeInfo[]={file, soLinger, listen,
level, NULL };
+static char *jk2_channel_un_getAttributeInfo[]={file, soLinger,
+listen, NULL };
static int JK_METHOD jk2_channel_un_setAttribute(jk_env_t *env,
jk_bean_t *mbean,
@@ -128,6 +130,24 @@
return JK_OK;
}
+static void * JK_METHOD jk2_channel_un_getAttribute(jk_env_t *env,
+ jk_bean_t *mbean,
+ char *name)
+{
+jk_channel_t *ch=(jk_channel_t *)mbean-object;
+jk_channel_un_private_t *socketInfo=
+(jk_channel_un_private_t *)(ch-_privatePtr);
+
+if( strcmp( file, name ) == 0 ) {
+return socketInfo-file;
+} else if( strcmp( soLinger, name ) == 0 ) {
+return jk2_env_itoa( env, socketInfo-l_linger );
+} else if( strcmp( listen, name ) == 0 ) {
+return jk2_env_itoa( env, socketInfo-backlog );
+}
+return NULL;
+}
+
/** resolve the host IP ( jk_resolve ) and initialize the channel.
*/
static int JK_METHOD jk2_channel_un_init(jk_env_t *env,
@@ -139,6 +159,8 @@
int rc=JK_OK;
int omask;
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ channelUn.init(): init \n );
if( socketInfo-file==NULL ) {
char *localName=ch-mbean-localName;
jk_config_t *cfg=ch-workerEnv-config;
@@ -153,6 +175,8 @@
if (localName[0]=='/') {
ch-mbean-setAttribute( env, ch-mbean, file, localName );
}
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ channelUn.init(): extracted file from name %s\n,
socketInfo-file );
}
if (socketInfo-file!=NULL socketInfo-file[0]=='/') {
@@ -470,8 +494,10 @@
ch-serverSide=JK_FALSE;
result-setAttribute= jk2_channel_un_setAttribute;
+result-getAttribute= jk2_channel_un_getAttribute;
result-multiValueInfo=jk2_channel_un_multiValueInfo;
result-setAttributeInfo=jk2_channel_un_setAttributeInfo;
+result-getAttributeInfo=jk2_channel_un_getAttributeInfo;
result-invoke=jk2_channel_invoke;
ch-mbean=result;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_config.c
costin 2003/03/04 15:58:30
Modified:jk/native2/common jk_config.c
Log:
Move the recently added code to mirror what happens on the java side ( i.e.
all mbeans are configured, then init is called on new ones ).
Now adding channels at runtime works fine - it was broken.
Revision ChangesPath
1.31 +69 -37jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_config.c 4 Mar 2003 07:14:40 - 1.30
+++ jk_config.c 4 Mar 2003 23:58:30 - 1.31
@@ -394,23 +394,76 @@
{
int i;
int rc;
-
+
+/* Set the config
+ */
for( i=0; icfg-cfgData-size( env, cfg-cfgData ); i++ ) {
char *name=cfg-cfgData-nameAt(env, cfg-cfgData, i);
rc=cfg-processNode(env, cfg , name, firstTime);
}
+
+/* Init/stop components that need that. FirstTime will be handled by workerEnv,
since
+ some components don't support dynamic config and need a specific order.
+ */
+if( !firstTime ) {
+for( i=0; i env-_objects-size( env, env-_objects ); i++ ) {
+char *name=env-_objects-nameAt( env, env-_objects, i );
+jk_bean_t *mbean=env-_objects-valueAt( env, env-_objects, i );
+
+if( mbean==NULL ) continue;
+
+/* New state ( == not initialized ) and disabled==0,
+ try to reinit */
+if( mbean-state == JK_STATE_NEW
+mbean-disabled== 0 ) {
+int initOk=JK_OK;
+
+if( mbean-init != NULL ) {
+initOk=mbean-init(env, mbean);
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ config.update(): Starting %s %d\n, name, initOk
);
+}
+if( initOk==JK_OK ) {
+mbean-state=JK_STATE_INIT;
+}
+}
+
+/* Initialized state - and the config changed to disabled */
+if( mbean-state == JK_STATE_INIT
+mbean-disabled != 0 ) {
+int initOk=JK_OK;
+
+/* Stop */
+if( mbean-destroy ) {
+initOk=mbean-destroy(env, mbean);
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ config.update(): Stopping %s %d\n, name,
initOk );
+}
+if( initOk ) {
+mbean-state=JK_STATE_NEW;
+}
+}
+}
+}
return rc;
}
+/** This method will process one mbean configuration or reconfiguration.
+The special case for firstTime will be eventually removed - it is needed
because some
+components may still depend on a specific startup order.
+
+The goal is for each component to follow JMX patterns - you should be able to
add / remove
+jk components at runtime in any order.
+*/
int jk2_config_processNode(jk_env_t *env, jk_config_t *cfg, char *name, int
firstTime )
{
int j;
jk_map_t *prefNode=cfg-cfgData-get(env, cfg-cfgData, name);
jk_bean_t *bean;
-long ver;
+long ver=0;
char *verString;
-int oldDisabled=0;
+int newBean=0;
if( cfg-mbean-debug 5 )
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
@@ -423,6 +476,7 @@
config.setConfig(): Creating %s\n, name );
}
bean=env-createBean( env, cfg-pool, name );
+newBean=1;
}
if( bean == NULL ) {
@@ -432,28 +486,29 @@
return JK_ERR;
}
-oldDisabled=bean-disabled;
-
+/* Don't call setters on objects that have the same ver.
+ This is just a workaround for components that are not reconfigurable.
+ */
verString= prefNode-get( env, prefNode, ver );
if( !firstTime ) {
/* No ver option - assume it didn't change */
-if( verString == NULL ) {
+if( verString == NULL ! newBean ) {
return JK_OK;
}
-ver=atol( verString );
+if( verString != NULL ) {
+ver=atol( verString );
-if( ver == bean-ver) {
-/* Object didn't change
- */
-return JK_OK;
+if( ver == bean-ver ! newBean ) {
+/* Object didn't change and is not new
+ */
+return JK_OK;
+}
}
}
if( !firstTime )
env-l-jkLog(env, env-l,
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
costin 2003/03/04 15:59:23
Modified:jk/native2/common jk_worker_ajp13.c
Log:
If the route is not set - default to the local name.
Revision ChangesPath
1.46 +6 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- jk_worker_ajp13.c 4 Mar 2003 07:22:10 - 1.45
+++ jk_worker_ajp13.c 4 Mar 2003 23:59:23 - 1.46
@@ -737,9 +737,14 @@
if( ajp13-channel == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
ajp13.init(): No channel %s\n, ajp13-mbean-localName);
-return JK_ERR;
+/* That's ok - it may be added later */
+/* return JK_ERR; */
}
+if( ajp13-route==NULL ) {
+/* Default - eventually the naming convention should become mandatory */
+ajp13-route=bean-localName;
+}
/* Find the groups we are member on and add ourself in
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c
costin 2003/03/04 16:00:24
Modified:jk/native2/common jk_uriEnv.c
Log:
Add a normal init method.
Adding uris at runtime is not as important ( and it will only work for the slower
config ), but for consistency.
Revision ChangesPath
1.44 +24 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jk_uriEnv.c 1 Mar 2003 05:49:58 - 1.43
+++ jk_uriEnv.c 5 Mar 2003 00:00:23 - 1.44
@@ -284,6 +284,22 @@
}
+static int jk2_uriEnv_beanInit(jk_env_t *env, jk_bean_t *bean)
+{
+jk_uriEnv_t *uriEnv=bean-object;
+int res=JK_OK;
+
+if( bean-state == JK_STATE_INIT ) return JK_OK;
+
+if( uriEnv-init ) {
+res=uriEnv-init( env, uriEnv );
+}
+if( res==JK_OK ) {
+bean-state=JK_STATE_INIT;
+}
+return res;
+}
+
static int jk2_uriEnv_init(jk_env_t *env, jk_uriEnv_t *uriEnv)
{
/*int err; */
@@ -299,12 +315,16 @@
if( uriEnv-workerName == NULL ) {
/* The default worker */
uriEnv-workerName=uriEnv-uriMap-workerEnv-defaultWorker-mbean-name;;
+wname=uriEnv-workerName;
uriEnv-worker=uriEnv-uriMap-workerEnv-defaultWorker;
if( uriEnv-mbean-debug 0 )
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- uriEnv.init() map %s %s\n,
- uriEnv-uri,
uriEnv-uriMap-workerEnv-defaultWorker-mbean-name);
+ uriEnv.init() map %s %s %s\n,
+ uriEnv-uri,
uriEnv-uriMap-workerEnv-defaultWorker-mbean-name, uriEnv-workerName);
+if( uriEnv-workerName == NULL ) {
+uriEnv-workerName=lb:lb;
+}
}
/* No further init - will be called by uriMap.init() */
@@ -467,6 +487,7 @@
uriEnv-mbean-name, uriEnv-virtual, uriEnv-uri,
uriEnv-match_type, uriEnv-contextPath, uriEnv-prefix,
uriEnv-suffix );
+uriEnv-mbean-state=JK_STATE_INIT;
return JK_OK;
}
@@ -487,6 +508,7 @@
jk2_map_default_create(env, uriEnv-properties, uriPool);
+result-init = jk2_uriEnv_beanInit;
uriEnv-init = jk2_uriEnv_init;
result-setAttribute = jk2_uriEnv_setAttribute;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_mutex_thread.c
costin 2003/03/04 16:00:52
Modified:jk/native2/common jk_mutex_thread.c
Log:
Set the state.
Revision ChangesPath
1.8 +8 -0 jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c
Index: jk_mutex_thread.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_mutex_thread.c 4 Feb 2003 07:39:58 - 1.7
+++ jk_mutex_thread.c 5 Mar 2003 00:00:51 - 1.8
@@ -79,6 +79,7 @@
static int JK_METHOD jk2_mutex_thread_init(jk_env_t *env, jk_bean_t *mutexB)
{
jk_mutex_t *jkMutex=mutexB-object;
+mutexB-state=JK_STATE_INIT;
return apr_thread_mutex_create( jkMutex-threadMutex,
0,
@@ -90,6 +91,7 @@
{
jk_mutex_t *jkMutex=mutexB-object;
+mutexB-state=JK_STATE_NEW;
if( jkMutex==NULL || jkMutex-threadMutex==NULL ) return JK_ERR;
return apr_thread_mutex_destroy( jkMutex-threadMutex);
@@ -124,6 +126,7 @@
static int JK_METHOD jk2_mutex_thread_init(jk_env_t *env, jk_bean_t *mutexB)
{
jk_mutex_t *jkMutex=mutexB-object;
+mutexB-state=JK_STATE_INIT;
InitializeCriticalSection( jkMutex-threadMutex );
return JK_OK;
}
@@ -133,6 +136,7 @@
{
jk_mutex_t *jkMutex=mutexB-object;
+mutexB-state=JK_STATE_NEW;
if( jkMutex==NULL ) return JK_ERR;
DeleteCriticalSection( jkMutex-threadMutex );
return JK_OK;
@@ -167,6 +171,7 @@
static int JK_METHOD jk2_mutex_thread_init(jk_env_t *env, jk_bean_t *mutexB)
{
jk_mutex_t *jkMutex=mutexB-object;
+mutexB-state=JK_STATE_INIT;
return pthread_mutex_init( jkMutex-threadMutex, NULL );
}
@@ -175,6 +180,7 @@
jk2_mutex_thread_destroy(jk_env_t *env, jk_bean_t *mutexB)
{
jk_mutex_t *jkMutex=mutexB-object;
+mutexB-state=JK_STATE_NEW;
if( jkMutex==NULL ) return JK_ERR;
return pthread_mutex_destroy( jkMutex-threadMutex);
@@ -204,12 +210,14 @@
static int JK_METHOD jk2_mutex_thread_init(jk_env_t *env, jk_bean_t *mutexB)
{
+mutexB-state=JK_STATE_INIT;
return JK_OK;
}
static int JK_METHOD
jk2_mutex_thread_destroy(jk_env_t *env, jk_bean_t *mutexB)
{
+mutexB-state=JK_STATE_NEW;
return JK_OK;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_endpoint.c
costin 2003/03/04 16:01:49
Modified:jk/native2/common jk_endpoint.c
Log:
Set state.
Revision ChangesPath
1.24 +3 -1 jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
Index: jk_endpoint.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_endpoint.c 1 Mar 2003 05:49:58 - 1.23
+++ jk_endpoint.c 5 Mar 2003 00:01:49 - 1.24
@@ -123,7 +123,9 @@
ep-stats-totalTime=0;
#endif
- return JK_OK;
+bean-state=JK_STATE_INIT;
+
+return JK_OK;
}
static char *getAttInfo[]={ id, NULL };
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler TagPluginManager.java
kinman 2003/03/04 17:32:45
Modified:jasper2/src/share/org/apache/jasper/compiler
TagPluginManager.java
Log:
- Oops! Forgot this one.
Revision ChangesPath
1.16 +7 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagPluginManager.java
Index: TagPluginManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagPluginManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TagPluginManager.java 15 Feb 2003 01:41:43 - 1.15
+++ TagPluginManager.java 5 Mar 2003 01:32:45 - 1.16
@@ -82,7 +82,7 @@
private static final String TAG_PLUGINS_ROOT_ELEM = tag-plugins;
private boolean initialized = false;
-private Hashtable tagPlugins = null;
+private HashMap tagPlugins = null;
private ServletContext ctxt;
private PageInfo pageInfo;
@@ -129,7 +129,7 @@
TAG_PLUGINS_ROOT_ELEM);
}
- tagPlugins = new Hashtable();
+ tagPlugins = new HashMap();
Iterator pluginList = root.findChildren(tag-plugin);
while (pluginList.hasNext()) {
TreeNode pluginNode = (TreeNode) pluginList.next();
@@ -204,11 +204,11 @@
return ((Node.CustomTag) parent).getTagPluginContext();
}
- public void setAttribute(String key, Object value) {
+ public void setPluginAttribute(String key, Object value) {
pluginAttributes.put(key, value);
}
- public Object getAttribute(String key) {
+ public Object getPluginAttribute(String key) {
return pluginAttributes.get(key);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-servletapi-5/jsr154/src/share/javax/servlet ServletRequest.java ServletRequestWrapper.java
jfarcand2003/03/04 18:20:46
Modified:jsr154/src/share/javax/servlet ServletRequest.java
ServletRequestWrapper.java
Log:
Servlet 2.4 spec changes:
Adding the following methods in ServletRequest, SRV.14.2.16.1
===
Add the following methods in ServletRequest, SRV.14.2.16.1.
public int getRemotePort()
Returns the Internet Protocol (IP) source port of the client
or last proxy that sent the request.
public java.lang.String getLocalName()
Returns the host name of the Internet Protocol (IP) interface on
which the request was received.
public java.lang.String getLocalAddr()
Returns the Internet Protocol (IP) address of the interface on
which the request was received.
public int getLocalPort()
Returns the Internet Protocol (IP) port number of the interface
on which the request was received.
===
Revision ChangesPath
1.2 +26 -0
jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequest.java
Index: ServletRequest.java
===
RCS file:
/home/cvs/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletRequest.java 13 Aug 2002 16:21:43 - 1.1
+++ ServletRequest.java 5 Mar 2003 02:20:46 - 1.2
@@ -585,5 +585,31 @@
public String getRealPath(String path);
+/**
+ * Returns the Internet Protocol (IP) source port of the client
+ * or last proxy that sent the request.
+ */
+public int getRemotePort();
+
+
+/**
+ * Returns the host name of the Internet Protocol (IP) interface on
+ * which the request was received.
+ */
+public String getLocalName();
+
+/**
+ * Returns the Internet Protocol (IP) address of the interface on
+ * which the request was received.
+ */
+public String getLocalAddr();
+
+
+/**
+ * Returns the Internet Protocol (IP) port number of the interface
+ * on which the request was received.
+ */
+public int getLocalPort();
+
}
1.2 +33 -0
jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequestWrapper.java
Index: ServletRequestWrapper.java
===
RCS file:
/home/cvs/jakarta-servletapi-5/jsr154/src/share/javax/servlet/ServletRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletRequestWrapper.java13 Aug 2002 16:21:43 - 1.1
+++ ServletRequestWrapper.java5 Mar 2003 02:20:46 - 1.2
@@ -400,6 +400,39 @@
return this.request.getRealPath(path);
}
+/**
+ * Returns the Internet Protocol (IP) source port of the client
+ * or last proxy that sent the request.
+ */
+public int getRemotePort(){
+return this.request.getRemotePort();
+}
+
+
+/**
+ * Returns the host name of the Internet Protocol (IP) interface on
+ * which the request was received.
+ */
+public String getLocalName(){
+return this.request.getLocalName();
+}
+
+/**
+ * Returns the Internet Protocol (IP) address of the interface on
+ * which the request was received.
+ */
+public String getLocalAddr(){
+return this.request.getLocalAddr();
+}
+
+
+/**
+ * Returns the Internet Protocol (IP) port number of the interface
+ * on which the request was received.
+ */
+public int getLocalPort(){
+return this.request.getLocalPort();
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core DummyRequest.java
jfarcand2003/03/04 18:31:47
Modified:coyote/src/java/org/apache/coyote Request.java
coyote/src/java/org/apache/coyote/tomcat5 CoyoteRequest.java
http11/src/java/org/apache/coyote/http11
Http11Processor.java
catalina/src/share/org/apache/catalina/connector
RequestFacade.java
catalina/src/share/org/apache/catalina/core
DummyRequest.java
Log:
Servlet 2.4 new features:
===
Add the following methods in ServletRequest, SRV.14.2.16.1.
public int getRemotePort()
Returns the Internet Protocol (IP) source port of the client
or last proxy that sent the request.
public java.lang.String getLocalName()
Returns the host name of the Internet Protocol (IP) interface on
which the request was received.
public java.lang.String getLocalAddr()
Returns the Internet Protocol (IP) address of the interface on
which the request was received.
public int getLocalPort()
Returns the Internet Protocol (IP) port number of the interface
on which the request was received.
===
Please review the patch and let me know if it brokes other Connectors.
Specifically, is ActionCode.ACTION_REQ_HOST_ATTRIBUTE is an appropriate hook event
or should I create one specifically for localAddr and localPort?
Revision ChangesPath
1.19 +18 -2
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
Index: Request.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Request.java 20 Jan 2003 23:45:11 - 1.18
+++ Request.java 5 Mar 2003 02:31:47 - 1.19
@@ -134,6 +134,8 @@
private MessageBytes serverNameMB = new MessageBytes();
private String localHost;
+
+private int remotePort;
private MessageBytes schemeMB = new MessageBytes();
@@ -146,8 +148,10 @@
// remote address/host
private MessageBytes remoteAddrMB = new MessageBytes();
+private MessageBytes localAddr = new MessageBytes();
private MessageBytes remoteHostMB = new MessageBytes();
-
+private MessageBytes localAddrMB = new MessageBytes();
+
private MimeHeaders headers = new MimeHeaders();
private MessageBytes instanceId = new MessageBytes();
@@ -280,12 +284,24 @@
return remoteHostMB;
}
+public MessageBytes localAddr() {
+ return localAddrMB;
+}
+
public String getLocalHost() {
return localHost;
}
public void setLocalHost(String host) {
this.localHost = host;
+}
+
+public int getRemotePort(){
+return remotePort;
+}
+
+public void setRemotePort(int port){
+this.remotePort = port;
}
@@ -493,7 +509,7 @@
parameters.recycle();
unparsedURIMB.recycle();
-uriMB.recycle();
+uriMB.recycle();
decodedUriMB.recycle();
queryMB.recycle();
methodMB.recycle();
1.21 +70 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CoyoteRequest.java30 Jan 2003 18:22:58 - 1.20
+++ CoyoteRequest.java5 Mar 2003 02:31:47 - 1.21
@@ -374,7 +374,17 @@
*/
protected String remoteHost = null;
-
+
+/**
+ * Remote port
+ */
+protected int remotePort = -1;
+
+/**
+ * Local address
+ */
+protected String localAddr = null;
+
// - Public Methods
@@ -402,6 +412,8 @@
secure = false;
remoteAddr = null;
remoteHost = null;
+remotePort = -1;
+localAddr = null;
attributes.clear();
notes.clear();
@@ -622,6 +634,8 @@
this.socket = socket;
remoteHost = null;
remoteAddr = null;
+remotePort = -1;
+localAddr = null;
}
@@ -1172,7 +1186,58 @@
return remoteHost;
}
+/**
+ * Returns the Internet
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
jfarcand2003/03/04 18:38:43 Modified:http11/src/java/org/apache/coyote/http11 Http11Processor.java Log: Oups. Do not remove that line. Revision ChangesPath 1.60 +2 -1 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java Index: Http11Processor.java === RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- Http11Processor.java 5 Mar 2003 02:31:47 - 1.59 +++ Http11Processor.java 5 Mar 2003 02:38:43 - 1.60 @@ -244,7 +244,7 @@ /** - * + * The local Host address. */ protected String localAddr = null; @@ -1029,6 +1029,7 @@ InetAddress localAddress = socket.getLocalAddress(); // Setting the socket-related fields. The adapter doesn't know // about socket. +request.setLocalHost(localAddress.getHostName()); request.serverName().setString(localAddress.getHostName()); return; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Getting SunONE CE to recognize Tomcat
I recently installed Tomcat on my machine and I'm trying to figure out why my SunONE CE isn't recognizing it. When I try to configure my internal webservers it won't let me select 8080. It won't recognize it I guess. Does anybody here have any experience using CE with Tomcat? Barry = Barry W. Jones III [EMAIL PROTECTED] Life is like a dogsled team; if you ain't the lead dog, the scenery never changes. - Lewis Grizzard __ Do you Yahoo!? Yahoo! Tax Center - forms, calculators, tips, more http://taxes.yahoo.com/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java
jfarcand2003/03/04 21:01:07
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
When Tomcat is embedded, there are situations where appBase could be equals to null.
In that case, do not set the config file (or most important, do not died).
Revision ChangesPath
1.21 +7 -6
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StandardContext.java 3 Mar 2003 15:46:45 - 1.20
+++ StandardContext.java 5 Mar 2003 05:01:06 - 1.21
@@ -3738,8 +3738,9 @@
boolean ok = true;
// Set config file name
-if (getConfigFile() == null) {
-String appBase = getAppBase();
+String appBase = getAppBase();
+if (getConfigFile() == null appBase != null) {
+
String name = getName();
if (name.equals()) {
name = ROOT;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17656] New: - scheme and secure Connector server.xml configuration attributes ignored by CoyoteConnector HTTP/1.1
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=17656. 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=17656 scheme and secure Connector server.xml configuration attributes ignored by CoyoteConnector HTTP/1.1 Summary: scheme and secure Connector server.xml configuration attributes ignored by CoyoteConnector HTTP/1.1 Product: Tomcat 4 Version: 4.1.18 Platform: PC OS/Version: Linux Status: NEW Severity: Critical Priority: Other Component: Connector:Coyote HTTP/1.1 AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Overview Description: Use of the common scheme and secure attributes in Connector server.xml configuration for CoyoteConnector HTTP/1.1 is ignored in the released 4.1.18 build. This used to work as expected in 4.1.10, (see below). Our hosting architecture employs external SSL acceleration hardware in front of standalone Tomcat servers and needs to pass scheme and secure information to our webapps. To do this, we specify the following in the server.xml file: Connector className=org.apache.coyote.tomcat4.CoyoteConnector port=8543 minProcessors=8 maxProcessors=128 enableLookups=false acceptCount=64 debug=0 connectionTimeout=30 scheme=https secure=true useURIValidationHack=false disableUploadTimeout=true/ The specification of https and true no longer is effective in setting the standard Servlet 2.3 ServletRequest.getScheme() and ServletRequest.isSecure() return values. Instead, http and false are always returned, respectively. Because the static Connector configuration information is no longer propagated to our web application servlets, our application fails to run properly. Steps to Reproduce: 1. configure Tomcat 4.1.18 to use standalone CoyoteConnector. 2. specify Connector scheme attribute as something other than http and/or set secure attribute to false. 3. access the standard request getScheme() and/or isSecure() methods in a servlet registered to the Connector. Actual Results: ServletRequest.getScheme() will return http and ServletRequest.isSecure() will return false when accessed from the servlet. Expected Results: ServletRequest.getScheme() and ServletRequest.isSecure() should reflect what is specified in the Connector configuration. Additional Information: It appears that this problem was introduced in 4.1.13 while making the following change to coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java and other files: --- revision 1.10 date: 2002/09/29 17:07:44; author: nacho; state: Exp; lines: +9 -14 Bug#12998 HTTPS gets changed to HTTP://servername:443 Reported by marcus.kellermann at bentley.com The processor (HTTP11 or ajp13) should set the scheme and port prior to this point, in an ajp13 connection doesnt make sense to get the secure flag from the connector secure flag. --- In prior versions of this file, settings for the request scheme was always copied from the Connector/CoyoteConnector configuration. With this change, the Processor is now responsible for setting the request information correctly. In our case, the Http11Processor cannot know about the external hardware and fails to upgrade the logical connection to https/secure. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
