costin 01/06/28 00:29:11
Modified: src/share/org/apache/tomcat/modules/config
LoaderInterceptor11.java LogSetter.java
src/share/org/apache/tomcat/modules/loggers LogEvents.java
src/share/org/apache/tomcat/modules/server
Http10Interceptor.java
Log:
Small changes to make the code match the defaults in server.xml ( and
so EmebededTomcat to behave more closely to "main" tomcat ).
This should also make it easier to implement the "minimal" tomcat.
Revision Changes Path
1.13 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java
Index: LoaderInterceptor11.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LoaderInterceptor11.java 2001/06/17 18:09:15 1.12
+++ LoaderInterceptor11.java 2001/06/28 07:28:51 1.13
@@ -78,7 +78,7 @@
* @author [EMAIL PROTECTED]
*/
public class LoaderInterceptor11 extends BaseInterceptor {
- boolean useAL=false;
+ boolean useAL=true;
boolean useNoParent=false;
private int attributeInfo;
1.12 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java
Index: LogSetter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LogSetter.java 2001/04/21 18:23:54 1.11
+++ LogSetter.java 2001/06/28 07:28:54 1.12
@@ -139,7 +139,7 @@
public class LogSetter extends BaseInterceptor {
String name;
String path;
- String verbosityLevel;
+ String verbosityLevel="INFORMATION";
boolean servletLogger=false;
boolean timestamps=true;
String tsFormat=null;
1.4 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/LogEvents.java
Index: LogEvents.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/LogEvents.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogEvents.java 2001/02/11 02:26:24 1.3
+++ LogEvents.java 2001/06/28 07:29:03 1.4
@@ -87,7 +87,7 @@
+ enabled);
hooks.addModule( this );
}
- return DECLINED;
+ return OK;
}
// -------------------- Request notifications --------------------
1.17 +4 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java
Index: Http10Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Http10Interceptor.java 2001/03/22 09:58:28 1.16
+++ Http10Interceptor.java 2001/06/28 07:29:08 1.17
@@ -94,10 +94,12 @@
public class Http10Interceptor extends PoolTcpConnector
implements TcpConnectionHandler
{
- private int timeout = 300000; // 5 minutes as in Apache HTTPD server
+ private int timeout = 300000; // 5 minutes as in Apache HTTPD server
public Http10Interceptor() {
super();
+ // defaults:
+ this.setPort( 8080 );
}
// -------------------- PoolTcpConnector --------------------
@@ -108,7 +110,7 @@
// -------------------- Attributes --------------------
public void setTimeout( int timeouts ) {
- timeout = timeouts * 1000;
+ timeout = timeouts * 1000;
}
// -------------------- Handler implementation --------------------
