You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2005/04/28 14:32:05 UTC
cvs commit: jakarta-tomcat-catalina/webapps/docs default-servlet.xml changelog.xml
remm 2005/04/28 05:32:05
Modified: catalina/src/bin catalina.bat catalina.sh
. build.xml tomcat.nsi
catalina/src/conf web.xml
webapps/docs default-servlet.xml changelog.xml
Log:
- Add a little docs.
- Move default logging.properties to conf, as it's more consistent.
Revision Changes Path
1.13 +2 -2 jakarta-tomcat-catalina/catalina/src/bin/catalina.bat
Index: catalina.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- catalina.bat 3 Mar 2005 15:13:39 -0000 1.12
+++ catalina.bat 28 Apr 2005 12:32:05 -0000 1.13
@@ -78,7 +78,7 @@
:gotTmpdir
if not exist "%CATALINA_HOME%\bin\tomcat-juli.jar" goto noJuli
-set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file="${catalina.base}\conf\logging.properties"
:noJuli
rem ----- Execute The Requested Command ---------------------------------------
1.20 +6 -6 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
Index: catalina.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- catalina.sh 3 Mar 2005 15:13:39 -0000 1.19
+++ catalina.sh 28 Apr 2005 12:32:05 -0000 1.20
@@ -114,11 +114,6 @@
fi
fi
-# Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
- JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-fi
-
# Add on extra jar files to CLASSPATH
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
@@ -146,6 +141,11 @@
JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
fi
+# Set juli LogManager if it is present
+if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
+ JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+fi
+
# ----- Execute The Requested Command -----------------------------------------
echo "Using CATALINA_BASE: $CATALINA_BASE"
1.229 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- build.xml 14 Apr 2005 18:52:28 -0000 1.228
+++ build.xml 28 Apr 2005 12:32:05 -0000 1.229
@@ -334,7 +334,7 @@
</jar>
<copy file="${basedir}/resources/logging.properties"
- todir="${tomcat.build}/common/classes" />
+ todir="${tomcat.build}/conf" />
</target>
1.74 +2 -2 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- tomcat.nsi 28 Mar 2005 17:06:00 -0000 1.73
+++ tomcat.nsi 28 Apr 2005 12:32:05 -0000 1.74
@@ -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" --StdOutput auto --StdError auto'
+ 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'
WriteUninstaller "$INSTDIR\Uninstall.exe"
1.58 +5 -0 jakarta-tomcat-catalina/catalina/src/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- web.xml 23 Apr 2005 10:22:37 -0000 1.57
+++ web.xml 28 Apr 2005 12:32:05 -0000 1.58
@@ -46,6 +46,11 @@
<!-- readmeFile File name to display with the directory -->
<!-- contents. [null] -->
<!-- -->
+ <!-- sendfileSize If the connector used supports sendfile, this -->
+ <!-- represents the minimal file size in KB for -->
+ <!-- which sendfile will be used. Use a negative -->
+ <!-- value to always disable sendfile. [48] -->
+ <!-- -->
<!-- For directory listing customization. Checks localXsltFile, then -->
<!-- globalXsltFile, then defaults to original behavior. -->
<!-- -->
1.3 +8 -1 jakarta-tomcat-catalina/webapps/docs/default-servlet.xml
Index: default-servlet.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/default-servlet.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default-servlet.xml 18 Dec 2004 12:04:40 -0000 1.2
+++ default-servlet.xml 28 Apr 2005 12:32:05 -0000 1.3
@@ -151,7 +151,14 @@
[platform default]
</td>
</tr>
-
+ <tr>
+ <th valign='top'>sendfileSize</th>
+ <td valign='top'>
+ If the connector used supports sendfile, this represents the minimal
+ file size in KB for which sendfile will be used. Use a negative value
+ to always disable sendfile. [48]
+ </td>
+ </tr>
</table>
</section>
1.293 +15 -2 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- changelog.xml 23 Apr 2005 10:22:37 -0000 1.292
+++ changelog.xml 28 Apr 2005 12:32:05 -0000 1.293
@@ -57,6 +57,10 @@
<add>
Add Apache Portable Runtime JNI wrapper and helper API (mturk)
</add>
+ <update>
+ Update JULI to provide support for taking over java.util.logging bootstrap configuration,
+ and move the default properties file to ${catalina.base}/conf/logging.properties (remm)
+ </update>
</changelog>
</subsection>
@@ -103,6 +107,14 @@
Provide an ServletFilter implementation of Server Side Includes (SSI). This was
submitted by David Becker under <bug>33106</bug>. (markt)
</add>
+ <add>
+ Add sendfile support to default servlet, with a sendfileSize configuration attribute.
+ (remm)
+ </add>
+ <update>
+ If APR as well as Tomcat's JNI wrapper for APR are present, use APRized protocol handlers
+ instead of the regular ones (remm)
+ </update>
</changelog>
</subsection>
@@ -115,8 +127,9 @@
Add some Mbean attributes and operations to ChannelSocket (pero)
</update>
<add>
- Add Apache Portable Runtime based HTTP/1.1 protocol handler, without SSL support (remm)
- </add>
+ Add Apache Portable Runtime based HTTP/1.1 protocol handler, without SSL support, which
+ provides efficient worker thread usage (remm)
+ </add>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org