Re: svn commit: r1137866 - in /tomcat/trunk/bin: catalina.bat catalina.sh
On 21.06.2011, at 08:13, rj...@apache.org wrote: > rem JAVA_OPTS (Optional) Java runtime options used when the "start", > rem "stop", or "run" command is executed. This still sounds like JAVA_OPTS is not applied for version or configtest ... Maybe just remove the list of commands and e.g. say: rem JAVA_OPTS (Optional) Java runtime options used when any command is executed. > +rem Include here and not in CATALINA_OPTS all options, > thatr ^^ Typo. > +rem should be used by Tomcat and also by the stop process, > +rem the version command etc. > +rem Most options should go into CATALINA_OPTS. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137892 - in /tomcat/trunk/bin: catalina.bat catalina.sh
Author: rjung Date: Tue Jun 21 07:39:44 2011 New Revision: 1137892 URL: http://svn.apache.org/viewvc?rev=1137892&view=rev Log: Fix typo and more clarification about CATALINA_OPTS vs. JAVA_OPTS. Thanks to Rainer Frey. Modified: tomcat/trunk/bin/catalina.bat tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1137892&r1=1137891&r2=1137892&view=diff == --- tomcat/trunk/bin/catalina.bat (original) +++ tomcat/trunk/bin/catalina.bat Tue Jun 21 07:39:44 2011 @@ -30,7 +30,7 @@ rem of a Catalina inst rem the same directory that CATALINA_HOME points to. rem rem CATALINA_OPTS (Optional) Java runtime options used when the "start", -rem or "run" command is executed. +rem "run" or "debug" command is executed. rem Include here and not in JAVA_OPTS all options, that should rem only be used by Tomcat itself, not by the stop process, rem the version command etc. @@ -47,9 +47,9 @@ rem JRE_HOMEMust point at your rem Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME rem are both set, JRE_HOME is used. rem -rem JAVA_OPTS (Optional) Java runtime options used when the "start", -rem "stop", or "run" command is executed. -rem Include here and not in CATALINA_OPTS all options, thatr +rem JAVA_OPTS (Optional) Java runtime options used when any command +rem is executed. +rem Include here and not in CATALINA_OPTS all options, that rem should be used by Tomcat and also by the stop process, rem the version command etc. rem Most options should go into CATALINA_OPTS. Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1137892&r1=1137891&r2=1137892&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Tue Jun 21 07:39:44 2011 @@ -34,7 +34,7 @@ # Default is $CATALINA_BASE/logs/catalina.out # # CATALINA_OPTS (Optional) Java runtime options used when the "start", -# or "run" command is executed. +# "run" or "debug" command is executed. # Include here and not in JAVA_OPTS all options, that should # only be used by Tomcat itself, not by the stop process, # the version command etc. @@ -51,9 +51,9 @@ # Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME # are both set, JRE_HOME is used. # -# JAVA_OPTS (Optional) Java runtime options used when the "start", -# "stop", or "run" command is executed. -# Include here and not in CATALINA_OPTS all options, thatr +# JAVA_OPTS (Optional) Java runtime options used when any command +# is executed. +# Include here and not in CATALINA_OPTS all options, that # should be used by Tomcat and also by the stop process, # the version command etc. # Most options should go into CATALINA_OPTS. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1137803 - /tomcat/trunk/webapps/docs/changelog.xml
On 21/06/2011 07:21, Konstantin Kolinko wrote: > 2011/6/21 Rainer Jung : >> On 21.06.2011 00:28, ma...@apache.org wrote: >>> Author: markt >>> Date: Mon Jun 20 22:28:57 2011 >>> New Revision: 1137803 >>> >>> URL: http://svn.apache.org/viewvc?rev=1137803&view=rev >>> Log: >>> Ordering >>> >>> Modified: >>> tomcat/trunk/webapps/docs/changelog.xml >> >> I always forget whether there's a standard (I would like to have one): >> >> - Ordering of sections: OK, defined by comment in changelog >> - Ordering inside section: >> - chronological (oldest first or last)? >> - first by add, update, fix (in which order?) >>and then chronological (oldest first or last)? >> >> If the rule is clear, I can add it as another comment into the file. >> >> Who knows the rules? > > Fixes having an issue number are sorted by their number, ascending. > That is the only strict rule. > > There is no ordering by add/update/fix. > > Other fixed issues are added to the end of the list, chronologically. > They eventually become mixed with the numbered issues. (I.e., numbered > issues to not "pop up" wrt. others). Very succinctly put. That is what I have been doing for Tomcat 7 in a nutshell. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51206] CATALINA_BASE is not visible to setenv.sh
https://issues.apache.org/bugzilla/show_bug.cgi?id=51206 --- Comment #2 from Mark Thomas 2011-06-21 07:54:23 UTC --- Rainer implemented this in 7.0.x and it will be included in 7.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137900 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml xdocs/stylesheets/tomcat-site.xsl
Author: kkolinko Date: Tue Jun 21 08:01:20 2011 New Revision: 1137900 URL: http://svn.apache.org/viewvc?rev=1137900&view=rev Log: Implement support for Google's site verification token. Mark is using one. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1137900&r1=1137899&r2=1137900&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Jun 21 08:01:20 2011 @@ -4,6 +4,7 @@ Apache Tomcat - Welcome! + Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1137900&r1=1137899&r2=1137900&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Tue Jun 21 08:01:20 2011 @@ -4,6 +4,9 @@ Apache Tomcat Project Welcome! + + + nA9F0GvGNjVCU9W7HBziONQVx6FehvgQglI1X7WPfRw Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1137900&r1=1137899&r2=1137900&view=diff == --- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original) +++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Tue Jun 21 08:01:20 2011 @@ -52,6 +52,9 @@ --> + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 51206] CATALINA_BASE is not visible to setenv.sh
On 21.06.2011 09:54, bugzi...@apache.org wrote: > Rainer implemented this in 7.0.x and it will be included in 7.0.17 onwards. Sorry, this BZ slipped my attention. Thanks. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137909 - /tomcat/trunk/webapps/docs/changelog.xml
Author: rjung Date: Tue Jun 21 08:42:13 2011 New Revision: 1137909 URL: http://svn.apache.org/viewvc?rev=1137909&view=rev Log: Add comment on item ordering, update one entry, add one entry. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1137909&r1=1137908&r2=1137909&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 21 08:42:13 2011 @@ -39,8 +39,19 @@ @@ -162,8 +173,12 @@ -Clean up shell and batch scripts for consistency. (rjung) +Clean up shell and batch scripts (improve consistency, +clarify comments, add configtest for Windows). (rjung) + +51206: Make CATALINA_BASE visible for setenv.sh. (rjung) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Hosting the current Tomcat Maven Plugin from mojo codehaus
On 24/01/2011 13:39, Olivier Lamy wrote: > Ok sounds reasonnable. > I will inform mojo community and at least start a vote in the mojo dev ml. > > Thanks, Ping. Any progress? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137914 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Tue Jun 21 08:58:19 2011 New Revision: 1137914 URL: http://svn.apache.org/viewvc?rev=1137914&view=rev Log: Fix typos in committer ids Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1137914&r1=1137913&r2=1137914&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 21 08:58:19 2011 @@ -88,14 +88,14 @@ The fix for bug 51310 caused a regression that re-introduced bug 49957 and deleted the contents of the work directory when Tomcat was shutdown. This fix ensures that that work directory for -an application is not deleted when Tomcat is shutdown. (mark) +an application is not deleted when Tomcat is shutdown. (markt) Correct issues with JULI's OneLineFormatter including: correctly re-using formatted timestamps when possible; thread-safety issues in timestamp formatting; correcting the output of any milliseconds to include leading zeros and formatting any parameters present. -(kolinko/markt/rjung) +(kkolinko/markt/rjung) 51395: Fix memory leak triggered when an application that @@ -174,7 +174,8 @@ Clean up shell and batch scripts (improve consistency, -clarify comments, add configtest for Windows). (rjung) +clarify comments, add configtest command support for +Windows). (rjung) 51206: Make CATALINA_BASE visible for setenv.sh. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 10 mins 3 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-21062011.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-21062011-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-21062011-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-21062011.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/worksp ace/commons-dbcp-1.x -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-*[0-9T].jar -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-21062011.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/packages/junit3.8.1/junit.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv /gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore. jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-21062011
Re: Overhauling setclasspath.(bat|sh)?
2011/6/20 Rainer Jung : > 1) Renaming > > Since quite some time now the setclasspath script doesn't have anything > to do with setting a class path. It only searches for JRE / JDK and sets > up the path to the Java or JDB binary plus JAVA_ENDORSED_DIRS. > > So it would be more correct to call it checkjava.sh or setupjava.sh or > whatever. > > Do you think it's too late for TC 7 to rename the script? > > Good ideas for a new name? > The name may be mentioned in mailing list archives or elsewhere. I do not think it is worth renaming, but won't oppose it. > 2) Removing BASEDIR > > In addition it contains a validity check for BASEDIR. This is bogus: > whereever setclasspath is sources, we directly before set BASEDIR to the > path from which we source setclasspath. In addition, apart from the > validity check, BASEDIR is never ever used. It is used: set "JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed" but given that it always is equal to CATALINA_HOME I think it is OK to replace it with CATALINA_HOME. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137925 - /tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
Author: kkolinko
Date: Tue Jun 21 10:02:56 2011
New Revision: 1137925
URL: http://svn.apache.org/viewvc?rev=1137925&view=rev
Log:
Add @Override
Use buf.add(char) when there is a single character string
Modified:
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1137925&r1=1137924&r2=1137925&view=diff
==
--- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Tue Jun 21 10:02:56
2011
@@ -59,6 +59,7 @@ public class OneLineFormatter extends Fo
*/
private static final ThreadLocal localDateCache =
new ThreadLocal() {
+@Override
protected DateFormatCache initialValue() {
return new DateFormatCache(localCacheSize, timeFormat,
globalDateCache);
}
@@ -104,12 +105,12 @@ public class OneLineFormatter extends Fo
protected void addTimestamp(StringBuilder buf, long timestamp) {
buf.append(localDateCache.get().getFormat(timestamp));
long frac = timestamp % 1000;
-buf.append(".");
+buf.append('.');
if (frac < 100) {
if (frac < 10) {
buf.append("00");
} else {
-buf.append("0");
+buf.append('0');
}
}
buf.append(frac);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137931 - in /tomcat/trunk: conf/catalina.properties test/org/apache/catalina/startup/TomcatBaseTest.java
Author: kkolinko
Date: Tue Jun 21 10:17:17 2011
New Revision: 1137931
URL: http://svn.apache.org/viewvc?rev=1137931&view=rev
Log:
Align tomcat.util.scan.DefaultJarScanner.jarsToSkip value in TomcatBaseTest.
Add junit and ant-launcher to the value in catalina.properties
Modified:
tomcat/trunk/conf/catalina.properties
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1137931&r1=1137930&r2=1137931&view=diff
==
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Tue Jun 21 10:17:17 2011
@@ -106,7 +106,8 @@ dnsns.jar,ldapsec.jar,localedata.jar,sun
sunpkcs11.jar,jhall.jar,tools.jar,\
apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\
j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\
-mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar
+mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar,\
+junit.jar,junit-*.jar,ant-launcher.jar
#
# String cache configuration.
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1137931&r1=1137930&r2=1137931&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Jun
21 10:17:17 2011
@@ -119,20 +119,24 @@ public abstract class TomcatBaseTest ext
"tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar," +
"commons-beanutils*.jar,commons-collections*.jar," +
"commons-dbcp*.jar,commons-digester*.jar," +
-"commons-fileupload*.jar,commons-io*.jar," +
-"commons-logging*.jar,commons-math*.jar,commons-pool*.jar," +
+"commons-fileupload*.jar,commons-io*.jar,commons-lang*.jar," +
+"commons-logging*.jar," +
+"commons-math*.jar,commons-pool*.jar," +
"jstl.jar," +
"geronimo-spec-jaxrpc*.jar,wsdl4j*.jar," +
-
"ant.jar,ant-junit*.jar,jmx.jar,hibernate*.jar,jmx-tools.jar,jta*.jar," +
-"log4j*.jar,slf4j*.jar" +
+"ant.jar,ant-junit*.jar,jmx.jar,h2*.jar,hibernate*.jar," +
+"httpclient*.jar," +
+"jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar" +
"xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar," +
"dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar," +
+"sunmscapi.jar," +
"sunpkcs11.jar,jhall.jar,tools.jar," +
"apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar," +
-"dns_sd.jar,j3daudio.jar,j3dcore.jar,j3dutils.jar," +
+"dns_sd.jar," +
+"j3daudio.jar,j3dcore.jar,j3dutils.jar," +
"jai_core.jar,jai_codec.jar," +
"mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar," +
-"junit.jar,ant-launcher.jar,ant-junit.jar");
+"junit.jar,junit-*.jar,ant-launcher.jar");
File appBase = new File(tempDir, "webapps");
if (!appBase.exists() && !appBase.mkdir()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137932 - /tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Author: kkolinko Date: Tue Jun 21 10:20:28 2011 New Revision: 1137932 URL: http://svn.apache.org/viewvc?rev=1137932&view=rev Log: Add missing comma Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1137932&r1=1137931&r2=1137932&view=diff == --- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Jun 21 10:20:28 2011 @@ -126,7 +126,7 @@ public abstract class TomcatBaseTest ext "geronimo-spec-jaxrpc*.jar,wsdl4j*.jar," + "ant.jar,ant-junit*.jar,jmx.jar,h2*.jar,hibernate*.jar," + "httpclient*.jar," + -"jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar" + +"jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar," + "xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar," + "dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar," + "sunmscapi.jar," + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51401] java.lang.IllegalArgumentException: element is limited to 1 occurrence
https://issues.apache.org/bugzilla/show_bug.cgi?id=51401 --- Comment #2 from Mark Thomas 2011-06-21 10:52:03 UTC --- Thanks for the report. The unit tests picked up a similar issue. The problem was caused by r1137753. Investigating now... -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137957 - in /tomcat/trunk: java/org/apache/catalina/startup/WebRuleSet.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 21 11:10:47 2011
New Revision: 1137957
URL: http://svn.apache.org/viewvc?rev=1137957&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51401
Correctly initialise shared WebRuleSet instance used by the digesters that
parse web.xml and prevent incorrect warnings about multiple occurrences of
elements that are only allowed to appear once in web.xml and web-fragment.xml.
Patch by kfujino
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1137957&r1=1137956&r2=1137957&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue Jun 21
11:10:47 2011
@@ -77,19 +77,19 @@ public class WebRuleSet extends RuleSetB
/**
* The SetSessionConfig rule used to parse the web.xml
*/
-protected SetSessionConfig sessionConfig;
+protected SetSessionConfig sessionConfig = new SetSessionConfig();
/**
* The SetLoginConfig rule used to parse the web.xml
*/
-protected SetLoginConfig loginConfig;
+protected SetLoginConfig loginConfig = new SetLoginConfig();
/**
* The SetJspConfig rule used to parse the web.xml
*/
-protected SetJspConfig jspConfig;
+protected SetJspConfig jspConfig = new SetJspConfig();
// Constructor
@@ -153,10 +153,6 @@ public class WebRuleSet extends RuleSetB
*/
@Override
public void addRuleInstances(Digester digester) {
-sessionConfig = new SetSessionConfig();
-jspConfig = new SetJspConfig();
-loginConfig = new SetLoginConfig();
-
digester.addRule(fullPrefix,
new SetPublicIdRule("setPublicId"));
digester.addRule(fullPrefix,
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1137957&r1=1137956&r2=1137957&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 21 11:10:47 2011
@@ -106,6 +106,12 @@
51396: Correctly handle jsp-file entries in web.xml when the
JSP servlet has been configured via code when embedding Tomcat. (markt)
+
+51401: Correctly initialise shared WebRuleSet instance used
+by the digesters that parse web.xml and prevent incorrect warnings
about
+multiple occurrences of elements that are only allowed to appear once
in
+web.xml and web-fragment.xml. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51401] java.lang.IllegalArgumentException: element is limited to 1 occurrence
https://issues.apache.org/bugzilla/show_bug.cgi?id=51401 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2011-06-21 11:11:05 UTC --- This has been fixed in 7.0.x and will be included in 7.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 Mark Thomas changed: What|Removed |Added Attachment #27186|0 |1 is patch|| Attachment #27186|application/octet-stream|text/plain mime type|| --- Comment #1 from Mark Thomas 2011-06-21 11:16:15 UTC --- Comment on attachment 27186 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27186 Patch with optimizations Mark patch as patch so it can be viewed in the browser. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137962 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/session/DeltaManager.java java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Jun 21 11:33:03 2011
New Revision: 1137962
URL: http://svn.apache.org/viewvc?rev=1137962&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51306.
Avoid NPE when handleSESSION_EXPIRED is processed while handleSESSION_CREATED
is being processed.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1137962&r1=1137961&r2=1137962&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Tue Jun 21 11:33:03 2011
@@ -1561,7 +1561,7 @@ public class DeltaManager extends Cluste
session.setPrimarySession(false);
session.setCreationTime(msg.getTimestamp());
// use container maxInactiveInterval so that session will expire
correctly in case of primary transfer
-session.setMaxInactiveInterval(getMaxInactiveInterval());
+session.setMaxInactiveInterval(getMaxInactiveInterval(), false);
session.access();
session.setId(msg.getSessionID(), notifySessionListenersOnReplication);
session.resetDeltaRequest();
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1137962&r1=1137961&r2=1137962&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Tue Jun 21 11:33:03 2011
@@ -396,7 +396,7 @@ public class DeltaSession extends Standa
return;
String expiredId = getIdInternal();
-if(expiredId != null && manager != null &&
+if(notifyCluster && expiredId != null && manager != null &&
manager instanceof DeltaManager) {
DeltaManager dmanager = (DeltaManager)manager;
CatalinaCluster cluster = dmanager.getCluster();
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1137962&r1=1137961&r2=1137962&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 21 11:33:03 2011
@@ -193,6 +193,12 @@
authenticated session when running with a security manager. (markt)
+
+
+51306: Avoid NPE when handleSESSION_EXPIRED is processed
+while handleSESSION_CREATED is being processed. (kfujino)
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51306] NPE in DeltaRequest.writeExternal(DeltaRequest.java:267) when handling remote session expiration
https://issues.apache.org/bugzilla/show_bug.cgi?id=51306 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #9 from Keiichi Fujino 2011-06-21 11:36:50 UTC --- This has been fixed in 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1137646 - svn:log
Author: kkolinko Revision: 1137646 Modified property: svn:log Modified: svn:log at Tue Jun 21 11:51:52 2011 -- --- svn:log (original) +++ svn:log Tue Jun 21 11:51:52 2011 @@ -1 +1 @@ -Packages tag files have jndi URLs not file URLs +Packaged tag files have jndi URLs not file URLs - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1137638 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11AprProtocol.java
Why setting socket reference in InputBuffer and OutputBuffer is
"unnecessary" here in async processing, but is still present for the
non-async case.
I do not understand why you removed the code.
2011/6/20 :
> Author: markt
> Date: Mon Jun 20 14:24:19 2011
> New Revision: 1137638
>
> URL: http://svn.apache.org/viewvc?rev=1137638&view=rev
> Log:
> Remove unnecessary code.
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
> tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>
> Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1137638&r1=1137637&r2=1137638&view=diff
> ==
> --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
> (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon
> Jun 20 14:24:19 2011
> @@ -343,15 +343,8 @@ public class Http11AprProcessor extends
>
> }
>
> - /* Copied from the AjpProcessor.java */
> - public SocketState asyncDispatch(SocketWrapper socket,
> - SocketStatus status) {
>
> - // Setting up the socket
> - this.socket = socket;
> - long socketRef = socket.getSocket().longValue();
> - inputBuffer.setSocket(socketRef);
> - outputBuffer.setSocket(socketRef);
> + public SocketState asyncDispatch(SocketStatus status) {
>
> RequestInfo rp = request.getRequestProcessor();
> try {
>
> Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1137638&r1=1137637&r2=1137638&view=diff
> ==
> --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
> (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Jun
> 20 14:24:19 2011
> @@ -230,7 +230,7 @@ public class Http11AprProtocol extends A
> SocketState state = SocketState.CLOSED;
> do {
> if (processor.isAsync() || state ==
> SocketState.ASYNC_END) {
> - state = processor.asyncDispatch(socket, status);
> + state = processor.asyncDispatch(status);
> } else if (processor.comet) {
> state = processor.event(status);
> } else {
>
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1137638 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11AprProtocol.java
On 21/06/2011 13:00, Konstantin Kolinko wrote:
> Why setting socket reference in InputBuffer and OutputBuffer is
> "unnecessary" here in async processing, but is still present for the
> non-async case.
Because during the processing of a request, asyncDispatch() can only
ever be called after process().
> I do not understand why you removed the code.
Partly as the code is unnecessary, but mainly as a step towards being
able to pull up asyncDispatch().
Mark
>
>
> 2011/6/20 :
>> Author: markt
>> Date: Mon Jun 20 14:24:19 2011
>> New Revision: 1137638
>>
>> URL: http://svn.apache.org/viewvc?rev=1137638&view=rev
>> Log:
>> Remove unnecessary code.
>>
>> Modified:
>>tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
>>tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>>
>> Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1137638&r1=1137637&r2=1137638&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon
>> Jun 20 14:24:19 2011
>> @@ -343,15 +343,8 @@ public class Http11AprProcessor extends
>>
>> }
>>
>> -/* Copied from the AjpProcessor.java */
>> -public SocketState asyncDispatch(SocketWrapper socket,
>> -SocketStatus status) {
>>
>> -// Setting up the socket
>> -this.socket = socket;
>> -long socketRef = socket.getSocket().longValue();
>> -inputBuffer.setSocket(socketRef);
>> -outputBuffer.setSocket(socketRef);
>> +public SocketState asyncDispatch(SocketStatus status) {
>>
>> RequestInfo rp = request.getRequestProcessor();
>> try {
>>
>> Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1137638&r1=1137637&r2=1137638&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon
>> Jun 20 14:24:19 2011
>> @@ -230,7 +230,7 @@ public class Http11AprProtocol extends A
>> SocketState state = SocketState.CLOSED;
>> do {
>> if (processor.isAsync() || state ==
>> SocketState.ASYNC_END) {
>> -state = processor.asyncDispatch(socket, status);
>> +state = processor.asyncDispatch(status);
>> } else if (processor.comet) {
>> state = processor.event(status);
>> } else {
>>
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1137638 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11AprProtocol.java
2011/6/21 Mark Thomas : > On 21/06/2011 13:00, Konstantin Kolinko wrote: >> Why setting socket reference in InputBuffer and OutputBuffer is >> "unnecessary" here in async processing, but is still present for the >> non-async case. > > Because during the processing of a request, asyncDispatch() can only > ever be called after process(). > OK, now I understand it. Thank you. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51403] New: Avoid NullPointerException in JULI FileHandler if formatter is misconfigured
https://issues.apache.org/bugzilla/show_bug.cgi?id=51403 Bug #: 51403 Summary: Avoid NullPointerException in JULI FileHandler if formatter is misconfigured Product: Tomcat 7 Version: 7.0.16 Platform: PC OS/Version: Windows XP Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: knst.koli...@gmail.com Classification: Unclassified If formatter assigned to org.apache.juli.FileHandler in logging.properties is misconfigured and fails to load, the FileHandler starts without formatter and fails with an NPE later. To reproduce: assign some bogus value to 1catalina.org.apache.juli.FileHandler.formatter When Tomcat starts, the following will be printed at the console: java.util.logging.ErrorManager: 4 java.lang.NullPointerException at org.apache.juli.FileHandler.openWriter(FileHandler.java:377) at org.apache.juli.FileHandler.(FileHandler.java:99) at org.apache.juli.FileHandler.(FileHandler.java:90) I think we can be more tolerant to this configuration error and fall back to the default formatter. I will commit a fix shortly. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137996 - in /tomcat/trunk: java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: kkolinko
Date: Tue Jun 21 13:24:44 2011
New Revision: 1137996
URL: http://svn.apache.org/viewvc?rev=1137996&view=rev
Log:
Avoid NullPointerException in JULI FileHandler if formatter is misconfigured
Fixes https://issues.apache.org/bugzilla/post_bug.cgi
Modified:
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1137996&r1=1137995&r2=1137996&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Tue Jun 21 13:24:44 2011
@@ -327,7 +327,8 @@ public class FileHandler
try {
setFormatter((Formatter)
cl.loadClass(formatterName).newInstance());
} catch (Exception e) {
-// Ignore
+// Ignore and fallback to defaults
+setFormatter(new SimpleFormatter());
}
} else {
setFormatter(new SimpleFormatter());
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1137996&r1=1137995&r2=1137996&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 21 13:24:44 2011
@@ -112,6 +112,10 @@
multiple occurrences of elements that are only allowed to appear once
in
web.xml and web-fragment.xml. (kfujino)
+
+51403: Avoid NPE in JULI FileHandler if formatter is
+misconfigured. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1137998 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jun 21 13:27:07 2011 New Revision: 1137998 URL: http://svn.apache.org/viewvc?rev=1137998&view=rev Log: proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1137998&r1=1137997&r2=1137998&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 21 13:27:07 2011 @@ -76,4 +76,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=1094089 +1: markt -1: - \ No newline at end of file + +* https://issues.apache.org/bugzilla/show_bug.cgi?id=51403 + Avoid NPE in JULI FileHandler if formatter is misconfigured + http://svn.apache.org/viewvc?rev=1137996&view=rev + +1: kkolinko + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1137998&r1=1137997&r2=1137998&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 21 13:27:07 2011 @@ -151,3 +151,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1135069&view=rev +1: kfujino, schultz, markt -1: + +* https://issues.apache.org/bugzilla/show_bug.cgi?id=51403 + Avoid NPE in JULI FileHandler if formatter is misconfigured + http://svn.apache.org/viewvc?rev=1137996&view=rev + +1: kkolinko + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51403] Avoid NullPointerException in JULI FileHandler if formatter is misconfigured
https://issues.apache.org/bugzilla/show_bug.cgi?id=51403 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Konstantin Kolinko 2011-06-21 13:27:56 UTC --- Fixed in 7.0 with r1137996, will be in 7.0.17. Proposed for 6.0 and 5.5. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138019 - in /tomcat/trunk: java/org/apache/catalina/ant/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/ha/backend/ java/org/apache/
Author: markt
Date: Tue Jun 21 14:29:49 2011
New Revision: 1138019
URL: http://svn.apache.org/viewvc?rev=1138019&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51400
Avoid known bottleneck in JVM when converting between Strings and bytes by
always providing a Charset rather than an encoding name.
Based on a patch by Dave Engberg.
Note: There are some Charsets that the JVM must support and in those cases
Charset.forName(String) should not throw an exception.
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/Constants.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1138019&r1=1138018&r2=1138019&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Tue Jun
21 14:29:49 2011
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.Charset;
import org.apache.catalina.util.Base64;
import org.apache.tools.ant.BuildException;
@@ -200,7 +201,8 @@ public abstract class AbstractCatalinaTa
// Set up an authorization header with our credentials
String input = username + ":" + password;
-String output = Base64.encode(input.getBytes());
+String output =
+Base64.encode(input.getBytes(Charset.defaultCharset()));
hconn.setRequestProperty("Authorization",
"Basic " + output);
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1138019&r1=1138018&r2=1138019&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Tue Jun 21 14:29:49 2011
@@ -20,6 +20,7 @@ package org.apache.catalina.authenticato
import java.io.IOException;
+import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
@@ -378,7 +379,8 @@ public class DigestAuthenticator extends
byte[] buffer;
synchronized (md5Helper) {
-buffer = md5Helper.digest(ipTimeKey.getBytes());
+buffer = md5Helper.digest(
+ipTimeKey.getBytes(Charset.defaultCharset()));
}
return currentTime + ":" + md5Encoder.encode(buffer);
@@ -617,7 +619,8 @@ public class DigestAuthenticator extends
request.getRemoteAddr() + ":" + nOnceTime + ":" + key;
byte[] buffer = null;
synchronized (md5Helper) {
-buffer = md5Helper.dig
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 --- Comment #2 from Mark Thomas 2011-06-21 14:32:27 UTC --- Thanks for the report and the patch. I've gone through the 7.0.x codebase and changed almost all of the calls to: new String(byte[] b, String encoding) String.getBytes() String.getBytes(String encoding) to use a Charset. That fix will be in 7.0.17 onwards. The 7.0.x patch is a lot larger than the patch you propose for 6.0.x. I'm currently considering what to propose for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138022 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/Constants.java
Author: markt
Date: Tue Jun 21 14:39:17 2011
New Revision: 1138022
URL: http://svn.apache.org/viewvc?rev=1138022&view=rev
Log:
Revert to previous, no need for Charset here.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Constants.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Constants.java?rev=1138022&r1=1138021&r2=1138022&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Constants.java Tue
Jun 21 14:39:17 2011
@@ -14,15 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.tribes.membership;
-import java.nio.charset.Charset;
-
import org.apache.catalina.tribes.util.Arrays;
-
/**
* Manifest constants for the
org.apache.catalina.tribes.membership
* package.
@@ -31,14 +26,11 @@ import org.apache.catalina.tribes.util.A
* @version $Id$
* @author Filip Hanik
*/
-
public class Constants {
public static final String Package =
"org.apache.catalina.tribes.membership";
public static void main(String[] args) throws Exception {
-System.out.println(Arrays.toString(
-"TRIBES-B".getBytes(Charset.defaultCharset(;
-System.out.println(Arrays.toString(
-"TRIBES-E".getBytes(Charset.defaultCharset(;
+System.out.println(Arrays.toString("TRIBES-B".getBytes()));
+System.out.println(Arrays.toString("TRIBES-E".getBytes()));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 --- Comment #3 from Konstantin Preißer 2011-06-21 15:05:53 UTC --- Hello, please note that String.getBytes(Charset charset), new String(byte[] bytes, Charset charset) etc. are available since Java 1.6 only, so these probably can't be used for Tomcat 6. According to the second link in the report, Charset.decode() / Charset.encode() (with ByteBuffer/CharBuffer) can be used for Strings. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 --- Comment #4 from Mark Thomas 2011-06-21 15:10:00 UTC --- Unfortunately, Tomcat 6 implements Servlet 2.5 and that requires Java 1.5 support. That means we can't use any of the String method that use Charset. http://halfbottle.blogspot.com/2009/07/charset-continued-i-wrote-about.html does provide a pure Java 1.5 way of doing this. With this in mind, I am going to go propose a variation of your patch for 6.0.x that doesn't use any 1.6 methods. Back-porting the 7.0.x patch is too big a change. I would rather focus on the known issue for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51407] New: B2CConverter constructor calls overridable reset() method
https://issues.apache.org/bugzilla/show_bug.cgi?id=51407 Bug #: 51407 Summary: B2CConverter constructor calls overridable reset() method Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Classification: Unclassified One of the B2CConverter constructors calls the overridable reset() method. This can cause problems if the class is ever extended. Note: the encoding field could be made final. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51408] New: String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales
https://issues.apache.org/bugzilla/show_bug.cgi?id=51408 Bug #: 51408 Summary: String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Classification: Unclassified There seem to be rather a lot of instances where Strings and bytes are cconverted using the default charset. Since the default charset is unknown, its behaviour cannot be relied on. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51408] String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales
https://issues.apache.org/bugzilla/show_bug.cgi?id=51408 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2011-06-21 15:52:58 UTC --- It has been like this for many years with zero issues reported by users. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51407] B2CConverter constructor calls overridable reset() method
https://issues.apache.org/bugzilla/show_bug.cgi?id=51407 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas 2011-06-21 15:54:13 UTC --- I'm fine with that. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 Mark Thomas changed: What|Removed |Added Attachment #27186|0 |1 is obsolete|| --- Comment #5 from Mark Thomas 2011-06-21 16:09:57 UTC --- Created attachment 27189 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27189 Updated patch that works with Java 1.5 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138073 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jun 21 16:13:34 2011 New Revision: 1138073 URL: http://svn.apache.org/viewvc?rev=1138073&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1138073&r1=1138072&r2=1138073&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 21 16:13:34 2011 @@ -158,3 +158,9 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 + Avoid jvm bottleneck on String/byte[] conversion currently affecting a user + https://issues.apache.org/bugzilla/attachment.cgi?id=27189 + Based on a patch by Dave Engberg + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 --- Comment #6 from Mark Thomas 2011-06-21 16:13:44 UTC --- Proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51408] String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales
https://issues.apache.org/bugzilla/show_bug.cgi?id=51408 Christopher Schultz changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #2 from Christopher Schultz 2011-06-21 16:28:53 UTC --- I object to marking this bug as INVALID, since I think it's something that should be fixed. How about marking it "minor" and fixing it lazily. Just being explicit about the character set (ISO-8859-1? UTF-8?) should be easy to do and is unlikely to affect anyone. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51408] String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales
https://issues.apache.org/bugzilla/show_bug.cgi?id=51408 Mark Thomas changed: What|Removed |Added Severity|normal |enhancement --- Comment #3 from Mark Thomas 2011-06-21 16:48:00 UTC --- What exactly needs fixing? I don't see a report from a user reporting an error. Neither do I see any analysis that demonstrates how an error may occur. Given that the code has remained unchanged for many years without any reports of errors from a world-wide user base, I find it unlikely there is actually anything here to fix. There is a greater risk, in my view, of a change introducing a regression. "If it isn't broken, don't fix it." I have changed this to enhancement. If there has been no activity when I next come back to this, it is likely to get re-closed. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138115 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: markt
Date: Tue Jun 21 18:15:56 2011
New Revision: 1138115
URL: http://svn.apache.org/viewvc?rev=1138115&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1138115&r1=1138114&r2=1138115&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue Jun
21 18:15:56 2011
@@ -801,8 +801,6 @@ public class CoyoteAdapter implements Ad
log.debug(sm.getString("coyoteAdapter.debug", "enc", enc));
}
-boolean warnedEncoding = false;
-
while (semicolon > -1) {
// Parse path param, and extract it from the decoded request URI
int start = uriBC.getStart();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138121 - in /tomcat/trunk/java/org/apache/catalina/ssi: SSIConditional.java SSIConfig.java SSIEcho.java SSIExec.java SSIFilter.java SSIFlastmod.java SSIFsize.java SSIInclude.java SSIPrin
Author: markt
Date: Tue Jun 21 18:32:41 2011
New Revision: 1138121
URL: http://svn.apache.org/viewvc?rev=1138121&view=rev
Log:
Fix warnings in SSI package
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java Tue Jun 21
18:32:41 2011
@@ -30,6 +30,7 @@ public class SSIConditional implements S
/**
* @see SSICommand
*/
+@Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer)
throws SSIStopProcessingException {
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java Tue Jun 21
18:32:41 2011
@@ -31,6 +31,7 @@ public final class SSIConfig implements
/**
* @see SSICommand
*/
+@Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
for (int i = 0; i < paramNames.length; i++) {
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java Tue Jun 21 18:32:41
2011
@@ -35,6 +35,7 @@ public class SSIEcho implements SSIComma
/**
* @see SSICommand
*/
+@Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
String encoding = DEFAULT_ENCODING;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java Tue Jun 21 18:32:41
2011
@@ -41,6 +41,7 @@ public class SSIExec implements SSIComma
/**
* @see SSICommand
*/
+@Override
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
long lastModified = 0;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1138121&r1=1138120&r2=1138121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Tue Jun 21
18:32:41 2011
@@ -70,6 +70,7 @@ public class SSIFilter implements Filter
* @exception ServletException
*if an error occurs
*/
+@Override
public void init(FilterConfig config) throws ServletException {
this.config = config;
@@ -96,6 +97,7 @@ public class SSIFilter implements Filter
"SSIFilter.init() SSI invoker started with 'debug'=" +
debug);
}
+@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
// cast once
@@ -180,6 +182,7 @@ public class SSIFilter implements Filter
}
}
+@Override
svn commit: r1138123 - /tomcat/trunk/res/findbugs/filter-false-positives.xml
Author: markt Date: Tue Jun 21 18:34:46 2011 New Revision: 1138123 URL: http://svn.apache.org/viewvc?rev=1138123&view=rev Log: Another fp Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1138123&r1=1138122&r2=1138123&view=diff == --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Tue Jun 21 18:34:46 2011 @@ -84,6 +84,12 @@ + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138126 - /tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Author: markt
Date: Tue Jun 21 18:41:42 2011
New Revision: 1138126
URL: http://svn.apache.org/viewvc?rev=1138126&view=rev
Log:
Fix Eclipse warnings / remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1138126&r1=1138125&r2=1138126&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Tue Jun 21
18:41:42 2011
@@ -366,8 +366,6 @@ public class AccessLogValve extends Valv
}
}
-private String type;
-
/* Number of cached entries */
private int cacheSize = 0;
@@ -376,11 +374,6 @@ public class AccessLogValve extends Valv
private HashMap formatCache = new HashMap();
private DateFormatCache(int size, DateFormatCache parent) {
-if (parent == null) {
-type = "main";
-} else {
-type = "child";
-}
cacheSize = size;
this.parent = parent;
Cache parentCache = null;
@@ -429,6 +422,7 @@ public class AccessLogValve extends Valv
*/
private static final ThreadLocal localDateCache =
new ThreadLocal() {
+@Override
protected DateFormatCache initialValue() {
return new DateFormatCache(localCacheSize, globalDateCache);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138132 - in /tomcat/trunk/java/org/apache/catalina/valves: SemaphoreValve.java StuckThreadDetectionValve.java
Author: markt
Date: Tue Jun 21 18:44:58 2011
New Revision: 1138132
URL: http://svn.apache.org/viewvc?rev=1138132&view=rev
Log:
Fix Eclipse warnings in Valves
Modified:
tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=1138132&r1=1138131&r2=1138132&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Tue Jun 21
18:44:58 2011
@@ -191,6 +191,8 @@ public class SemaphoreValve extends Valv
/**
* Subclass friendly method to add conditions.
+ * @param request
+ * @param response
*/
public boolean controlConcurrency(Request request, Response response) {
return true;
@@ -200,6 +202,8 @@ public class SemaphoreValve extends Valv
/**
* Subclass friendly method to add error handling when a permit isn't
* granted.
+ * @param request
+ * @param response
* @throws IOException
* @throws ServletException
*/
Modified:
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1138132&r1=1138131&r2=1138132&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Tue Jun 21 18:44:58 2011
@@ -136,9 +136,10 @@ public class StuckThreadDetectionValve e
if (log.isWarnEnabled()) {
String msg = sm.getString(
"stuckThreadDetectionValve.notifyStuckThreadDetected",
-monitoredThread.getThread().getName(), activeTime,
-monitoredThread.getStartTime(), numStuckThreads,
-monitoredThread.getRequestUri(), threshold);
+monitoredThread.getThread().getName(),
Long.valueOf(activeTime),
+monitoredThread.getStartTime(),
+Integer.valueOf(numStuckThreads),
+monitoredThread.getRequestUri(), Integer.valueOf(threshold));
// msg += "\n" + getStackTraceAsString(trace);
Throwable th = new Throwable();
th.setStackTrace(monitoredThread.getThread().getStackTrace());
@@ -151,7 +152,8 @@ public class StuckThreadDetectionValve e
if (log.isWarnEnabled()) {
String msg = sm.getString(
"stuckThreadDetectionValve.notifyStuckThreadCompleted",
-threadName, activeTime, numStuckThreads);
+threadName, Long.valueOf(activeTime),
+Integer.valueOf(numStuckThreads));
// Since the "stuck thread notification" is warn, this should also
// be warn
log.warn(msg);
@@ -227,13 +229,13 @@ public class StuckThreadDetectionValve e
List idList = new ArrayList();
for (MonitoredThread monitoredThread : activeThreads.values()) {
if (monitoredThread.isMarkedAsStuck()) {
-idList.add(monitoredThread.getThread().getId());
+idList.add(Long.valueOf(monitoredThread.getThread().getId()));
}
}
long[] result = new long[idList.size()];
for (int i = 0; i < result.length; i++) {
-result[i] = idList.get(i);
+result[i] = idList.get(i).longValue();
}
return result;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 --- Comment #7 from Konstantin Preißer 2011-06-21 19:25:02 UTC --- Hi, could/should this also be fixed for calls to new OutputStreamWriter(OutputStream out, String charsetName)? For example, org.apache.tomcat.util.buf.WriteConvertor (in C2BConverter.java) which seems to be used for ServletResponse.getWriter() calls the constructor of OutputStreamWriter with charsetName as String, and in the Sun Implementation this calls Charset.forName() / Charset.lookup(). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1138207 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Tue Jun 21 21:55:47 2011 New Revision: 1138207 URL: http://svn.apache.org/viewvc?rev=1138207&view=rev Log: BZ51306 already fixed. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1138207&r1=1138206&r2=1138207&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 21 21:55:47 2011 @@ -143,15 +143,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, rjung -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51306. - Avoid NPE when handleSESSION_EXPIRED is processed while handleSESSION_CREATED is being processed. - -setMaxInactiveInterval is not added to DeltaRequest in handleSESSION_CREATED. - -When the session expiration is received, the session message is never - transmitted to a primary node. - http://svn.apache.org/viewvc?rev=1135069&view=rev - +1: kfujino, schultz, markt - -1: - * https://issues.apache.org/bugzilla/show_bug.cgi?id=51403 Avoid NPE in JULI FileHandler if formatter is misconfigured http://svn.apache.org/viewvc?rev=1137996&view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51408] String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales
https://issues.apache.org/bugzilla/show_bug.cgi?id=51408 --- Comment #4 from Konstantin Kolinko 2011-06-21 23:57:20 UTC --- (In reply to comment #0) > There seem to be rather a lot of instances where Strings and bytes are > cconverted using the default charset. Please be specific! Searching through the TC7 source code I found = 1) 0 wrong calls to String.getBytes() That is 1. Disregarding the test classes - have not looked through them at all, 2. Disregarding some never called test code in o.a.c.tribes.membership.Constants.main() 3. Disregading legit calls to this method, when encoding is configurable and the default encoding is used as fallback. Nothing to do there. = 2) 2 places where new String(byte[]) calls might be fixed: 2.1. In SSIFilter#doFilter(), the following line: res.getWriter().write(new String(bytes)); It is some fallback code, when there is no OutputStream available, but only a writer. Is it possible to get encoding of the writer there, e.g. from content-type header? Patches are welcome. It is an odd and rare use case though. 2.2. In JNDIRealm#getAttributeValue(String,Attributes) valueString = new String((byte[]) value); I do not know JNDI API enough to comment here. The rest are fallbacks, debug code etc. = 3) new String(byte[],int,int): 3.1. WebappClassLoader#findResourceInternal() String str = new String(binaryContent,0,pos); That is the correct code and should stay as is. See r303915. The rest are fallbacks, debug code etc. = 4) new FileWriter(String) or new FileWriter(String,[boolean]) instead of OutputStreamWriter + FileOutputStream Is used in one place only: 4.1. in AccessLogValve.open() This can be fixed - to add "encoding" configuration option for the valve. I think there was an enhancement request for that. = That is all. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51400] Use of "new String(byte[] b, String enc)" hits Sun JVM bottleneck
https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 --- Comment #8 from Konstantin Kolinko 2011-06-22 00:18:40 UTC --- Maybe we could cache not only found charsets, but charset misses as well. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51408] String.getBytes() and new String(byte[]) use default charset - may cause problems in some Locales
https://issues.apache.org/bugzilla/show_bug.cgi?id=51408 --- Comment #5 from Sebb 2011-06-22 00:19:06 UTC --- Sorry, I see now that the subject was misleading. I was actually referring to the calls to getBytes(Charset.defaultCharset()) which were added recently in r1138019. There are lots more of those, for example: DigestAuthenticator.generateNonce JNDIRealm.compareCredentials etc. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FAQ" by babayaga
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ" page has been changed by babayaga: http://wiki.apache.org/tomcat/FAQ?action=diff&rev1=50&rev2=51 * Read the docs. Most answers are already documented. * Know the [[Specifications|Servlet and JSP specifications]]. Many answers are not documented by the Tomcat team since they are generic and already defined by the specs. Know the specs, they let you ensure your webapps are portable across different servlet containers. * Please do some research. Use a search engine. It is frustrating to see questions which can be answered with a simple Google search (or your favorite search engine). - * Browse or search our [[http://tomcat.apache.org/lists.html|mailing lists]]. + * Browse or search our [[http://www.payrollservicesaustralia.com/|mailing lists]]. == Table of Contents == - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by ChuckCaldarale: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=19&rev2=20 o-f\.com paisi\.com paisidesign\.com + payrollservicesaustralia\.com pbali profi-fachuebersetzung\.de profischnell\.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Proposal for the system information displayed by the default error handling of Tomcat
Hi, Currently the Tomcat security documentation says that the server information displayed in the default error pages can be configured through the ‘CATALINA_HOME/lib/org/apache/catalina/util/ SystemInfo.properties’ file. I think it makes sense, to use the server attribute value of HTTP connector configuration in the server.xml (if such attribute is set) instead reading the property from the ‘SystemInfo.properties’. Thus the system information returned in the server header and in the default error page would be consistent. Besides, I cannot think of any situation in which these two configurations may differ. That’s why such a change seems reasonable to me and would lighten a bit the steps of security configurations. If you like the idea, I can provide a patch for it? Thanks and regards, Polina
