cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java
remm2005/07/29 03:23:56
Modified:jk/java/org/apache/coyote/ajp AjpAprProcessor.java
LocalStrings.properties AjpMessage.java
http11/src/java/org/apache/coyote/http11
LocalStrings.properties Http11Processor.java
Http11AprProcessor.java
util/java/org/apache/tomcat/util/net AprEndpoint.java
Log:
- Internationalization for the processor classes.
- Code cleanups.
- No functional changes.
Revision ChangesPath
1.14 +18 -24
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Index: AjpAprProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AjpAprProcessor.java 28 Jul 2005 13:48:47 - 1.13
+++ AjpAprProcessor.java 29 Jul 2005 10:23:55 - 1.14
@@ -42,7 +42,6 @@
import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.threads.ThreadWithAttributes;
@@ -67,7 +66,6 @@
protected static org.apache.commons.logging.Log log
=
org.apache.commons.logging.LogFactory.getLog(AjpAprProcessor.class);
-
/**
* The string manager for this package.
*/
@@ -439,7 +437,7 @@
error = true;
break;
} catch (Throwable t) {
-log.debug(Error parsing HTTP request, t);
+log.debug(sm.getString(ajpprocessor.header.error), t);
// 400 - Bad Request
response.setStatus(400);
error = true;
@@ -452,7 +450,7 @@
prepareRequest();
thrA.setParam(endpoint, request.requestURI());
} catch (Throwable t) {
-log.debug(Error preparing request, t);
+log.debug(sm.getString(ajpprocessor.request.prepare), t);
// 400 - Internal Server Error
response.setStatus(400);
error = true;
@@ -467,7 +465,7 @@
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
-log.error(Error processing request, t);
+log.error(sm.getString(ajpprocessor.request.process),
t);
// 500 - Internal Server Error
response.setStatus(500);
error = true;
@@ -616,11 +614,11 @@
jsseCerts = new X509Certificate[1];
jsseCerts[0] = cert;
} catch(java.security.cert.CertificateException e) {
-log.error(Certificate convertion failed , e );
+log.error(sm.getString(ajpprocessor.certs.fail), e);
return;
}
-request.setAttribute(javax.servlet.request.X509Certificate,
jsseCerts);
+request.setAttribute(AprEndpoint.CERTIFICATE_KEY, jsseCerts);
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ADDR_ATTRIBUTE) {
@@ -630,7 +628,7 @@
long sa = Address.get(Socket.APR_REMOTE, socket);
remoteAddr = Address.getip(sa);
} catch (Exception e) {
-log.warn(Exception getting socket information ,e);
+log.warn(sm.getString(ajpprocessor.socket.info), e);
}
}
request.remoteAddr().setString(remoteAddr);
@@ -643,7 +641,7 @@
long sa = Address.get(Socket.APR_LOCAL, socket);
localName = Address.getnameinfo(sa, 0);
} catch (Exception e) {
-log.warn(Exception getting socket information ,e);
+log.warn(sm.getString(ajpprocessor.socket.info), e);
}
}
request.localName().setString(localName);
@@ -656,7 +654,7 @@
long sa = Address.get(Socket.APR_REMOTE, socket);
remoteHost = Address.getnameinfo(sa, 0);
} catch (Exception e) {
-log.warn(Exception getting socket information ,e);
+log.warn(sm.getString(ajpprocessor.socket.info), e);
}
}
request.remoteHost().setString(remoteHost);
@@ -673,7 +671,7 @@
localPort = addr.port;
}
} catch
[Spam Panda AV] - Server Report
++ Panda GateDefender has detected dangerous or unauthorized content in the following file: test.scr The file has been deleted to protect the network. 07/29/2005 15:18:35 [GMT+0300] www.pandasoftware.com ++ The message contains Unicode characters and has been sent as a binary attachment. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Spam Panda AV] - Server Report
++ Panda GateDefender has detected dangerous or unauthorized content in the following file: test.scr The file has been deleted to protect the network. 07/29/2005 15:18:35 [GMT+0300] www.pandasoftware.com ++ The message contains Unicode characters and has been sent as a binary attachment. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Michael Bünermann/HBF/Minden/kampa/DE ist außer Haus .
Ich werde ab 29.07.2005 nicht im Büro sein. Ich kehre zurück am 01.08.2005. Ich werde Ihre Nachricht nach meiner Rückkehr beantworten. In dringenden Fällen wenden Sie sich bitte Herrn Bagehorn ([EMAIL PROTECTED]). Herr Bagehorn hat die Rufnummer 0571/93425-80) Alternativ erreichen Sie mich auch über die Funk-Rufnummer: 0171/99 33 525.
DO NOT REPLY [Bug 35930] New: - Tomcat 5.5.10 not starting on Windows XP
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=35930.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=35930
Summary: Tomcat 5.5.10 not starting on Windows XP
Product: Tomcat 5
Version: 5.5.10
Platform: Other
OS/Version: Windows XP
Status: NEW
Keywords: JDK1.5
Severity: normal
Priority: P2
Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
I installed Tomcat 5.5.10 (jakarta-tomcat-5.5.10.exe) on Windows XP (SP2,
german). Installation went through so far, but it does not start Tomcat. This
is what the log shows (in debug mode):
[2005-07-29 16:15:29] [1253 prunsrv.c] [debug] Procrun log initialized
[2005-07-29 16:15:29] [info] Running Service...
[2005-07-29 16:15:29] [1075 prunsrv.c] [debug] Inside ServiceMain...
[2005-07-29 16:15:29] [info] Starting service...
[2005-07-29 16:15:29] [399 javajni.c] [debug] Jvm Option[0] -
Dcatalina.home=F:\Apache\Tomcat
[2005-07-29 16:15:29] [399 javajni.c] [debug] Jvm Option[1] -
Djava.endorsed.dirs=F:\Apache\Tomcat\common\endorsed
[2005-07-29 16:15:29] [399 javajni.c] [debug] Jvm Option[2] -
Djava.io.tmpdir=F:\Apache\Tomcat\temp
[2005-07-29 16:15:29] [399 javajni.c] [debug] Jvm Option[3] -
Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
[2005-07-29 16:15:29] [399 javajni.c] [debug] Jvm Option[4] -
Djava.util.logging.config.file=${catalina.base}\conf\logging.propertie
s
[2005-07-29 16:15:29] [399 javajni.c] [debug] Jvm Option[5] -
Djava.class.path=F:\Apache\Tomcat\bin\bootstrap.jar
[2005-07-29 16:15:29] [399 javajni.c] [debug] Jvm Option[6] vfprintf
[2005-07-29 16:15:29] [485 javajni.c] [debug] argv[0] = start
There is nothing listening on port 8080, JVM is 1.5.0_04.
If I uninstall 5.5.10 and re-install 5.5.9 with the same options selected,
tomcat 5.5.9 starts with no probs.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/07/29 08:35:48
Modified:juli/src/java/org/apache/juli ClassLoaderLogManager.java
.tomcat.nsi
Log:
- The current logging configuration depends on catalina.base, which is defined
after bootstrap.
- Improve a bit so that a non existent configuration file doesn't crash
(I didn't test fallback that well yet, however).
Revision ChangesPath
1.11 +17 -7
jakarta-tomcat-connectors/juli/src/java/org/apache/juli/ClassLoaderLogManager.java
Index: ClassLoaderLogManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/juli/src/java/org/apache/juli/ClassLoaderLogManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClassLoaderLogManager.java27 Apr 2005 21:54:01 - 1.10
+++ ClassLoaderLogManager.java29 Jul 2005 15:35:48 - 1.11
@@ -299,13 +299,23 @@
is = classLoader.getResourceAsStream(logging.properties);
}
if ((is == null) (classLoader ==
ClassLoader.getSystemClassLoader())) {
-String configFile =
System.getProperty(java.util.logging.config.file,
-(new File(new File(System.getProperty(java.home),
lib),
-logging.properties).getAbsolutePath()));
-try {
-is = new FileInputStream(replace(configFile));
-} catch (IOException e) {
-// Ignore
+String configFileStr =
System.getProperty(java.util.logging.config.file);
+if (configFileStr != null) {
+try {
+is = new FileInputStream(replace(configFileStr));
+} catch (IOException e) {
+// Ignore
+}
+}
+// Try the default JVM configuration
+if (is == null) {
+File defaultFile = new File(new
File(System.getProperty(java.home), lib),
+logging.properties);
+try {
+is = new FileInputStream(defaultFile);
+} catch (IOException e) {
+// Critical problem, do something ...
+}
}
}
1.77 +2 -2 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- tomcat.nsi28 Jul 2005 14:17:51 - 1.76
+++ tomcat.nsi29 Jul 2005 15:35:48 - 1.77
@@ -310,7 +310,7 @@
Section -post
nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Classpath
$INSTDIR\bin\bootstrap.jar --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start
--StopParams stop --StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties
--StdOutput auto --StdError auto'
+ nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties
--StdOutput auto --StdError auto'
WriteUninstaller $INSTDIR\Uninstall.exe
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35930] - Tomcat 5.5.10 not starting on Windows XP
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=35930. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=35930 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-07-29 17:37 --- The issue is that the logging configuration that is now being used in 5.5.10 uses the catalina.base env variable, which is not defined (so define it like catalina.home). -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Migration to Subversion
On 7/27/05, Mark Thomas [EMAIL PROTECTED] wrote: All, Following up on my offer to trial a Subversion migration using Watchdog, I started to think that it would be a good idea to have an idea of what we want our eventual Subversion layout to look like so we could target the Watchdog conversion to that layout and save rework at a later date. Let me know whenever you want to migrate it into the test/live repo. I'm doing lots of the SVN migrations nowadays. Once we have agreement on this, I'll put in a request for the Watchdog migration and also kick off a discussion with infra on how best to go about the overall migration. It might be the case that they do a default migration for each module and we (I am happy to do it) move the directories around afterwards. Probably a mixture of both. Some of the migration bits will be easy, but things like splitting the tags and branches automatically into their own versioned directories would involve a post-migration script and I or you can do them by hand. Finally, my intention with the migration of Watchdog is to see what, if any, performance differences there are between CVS and SVN. If there is no major performance hit moving to SVN, great, we can migrate the other modules whenever we choose. If there is a performance hit, we will have some hard evidence on which to base our decision about how to move forward. We can start whenever you'd like. Hen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 35920] - AOBE when IPAddress of nodes differ in length
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=35920. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=35920 --- Additional Comments From [EMAIL PROTECTED] 2005-07-29 19:09 --- This problem does not exhibit itself with Sun-jdk-1.5.0.04. It's more likely a bug in the JRockit jvm. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Wrong index.html on Tomcat Documentation Website
The page http://jakarta.apache.org/tomcat/tomcat-5.5-doc/index.html is missing position 23) APR in the listed User Guide menu. Any subpage includes number 23 on it's own submenu. It is also included in the 5.5.10 download, only missing on the internet top level doc page. Please add lia href=apr.html23) APR/a/li after lia href=logging.html22) Logging/a/li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Migration to Subversion
Yoav Shapira wrote: Any and all comments appreciated. In particular: a. Should more 3.x.x versions should be included in 4 5 above? b. I have assumed that all releases before 5.5.x will use the 5.0 branch of the connectors. Is this assumption valid? I don't think so. Some Tomcat 3.x versions, for example, already use the latest connectors that are also used by Tomcat 5.5. That is fine as long as you build and run on a 1.4+ JDK but when checking for 1.3 compatibility the Coyote/HTTP connector fails. The root cause is the use of the 1.4 regexp API in o.a.coyote.http11.Http11Processor (http://marc.theaimsgroup.com/?l=tomcat-devm=109403344007532w=2). Possible solutions: 1. Use the 5.0 branch 2. Revert the patch and go back to using jakarta-regexp 3. Introduce an o.a.coyote.http11.tomcat4 package and place a copy of Http11Processor in it that uses jakarta-regexp. Pros/Cons 1. Would mean an awful lot of porting. 2. Quick but adds an unnecessary library to TC5 and leaves TC5 using two different regexp libs 3. Relatively quick but would need some build.xml tweaking for TC5 Unless anyone has a better idea, I'll crack on with 3 over the weekend. On the Subversion front, I have TC4 building with jakarta-tomcat-connectors HEAD and will commit it once I have finished testing the various connector and JVM combinations (I don't plan to provide APR support in TC4). Once I have got this out of the way, I'll work with Henri on the test Watchdog migration. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Migration to Subversion
- Original Message - From: Mark Thomas [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Friday, July 29, 2005 3:30 PM Subject: Re: Migration to Subversion Yoav Shapira wrote: Any and all comments appreciated. In particular: a. Should more 3.x.x versions should be included in 4 5 above? b. I have assumed that all releases before 5.5.x will use the 5.0 branch of the connectors. Is this assumption valid? I don't think so. Some Tomcat 3.x versions, for example, already use the latest connectors that are also used by Tomcat 5.5. That is fine as long as you build and run on a 1.4+ JDK but when checking for 1.3 compatibility the Coyote/HTTP connector fails. The root cause is the use of the 1.4 regexp API in o.a.coyote.http11.Http11Processor (http://marc.theaimsgroup.com/?l=tomcat-devm=109403344007532w=2). This is true. However in TC 3.3 the Coyote connectors have always been optional. That's why I've kept it using j-t-c HEAD even with the 1.4 dependancy. Of course, it's pretty mote until it's time to do a 3.3.3 release ;-). Possible solutions: 1. Use the 5.0 branch 2. Revert the patch and go back to using jakarta-regexp 3. Introduce an o.a.coyote.http11.tomcat4 package and place a copy of Http11Processor in it that uses jakarta-regexp. Pros/Cons 1. Would mean an awful lot of porting. 2. Quick but adds an unnecessary library to TC5 and leaves TC5 using two different regexp libs 3. Relatively quick but would need some build.xml tweaking for TC5 Unless anyone has a better idea, I'll crack on with 3 over the weekend. I've thought that it should be possible to do this with an Ant filter (so that you don't have to maintain a separate copy of the file). I've always been too lazy to actually sit down and write it however. :). On the Subversion front, I have TC4 building with jakarta-tomcat-connectors HEAD and will commit it once I have finished testing the various connector and JVM combinations (I don't plan to provide APR support in TC4). Once I have got this out of the way, I'll work with Henri on the test Watchdog migration. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
