[GUMP@vmgump]: Project tomcat-trunk-validate-eoln (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-validate-eoln has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 6 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-validate-eoln : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build) Work ended in a state of : Failed Elapsed: 1 sec 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 validate-eoln [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/classes:/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/public/workspace/xml-commons/java/build/resolver.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/bin [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/conf [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/lib [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/logs [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/webapps compile-prepare: [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/webapps/docs validate-eoln: [javac] Compiling 1 source file to /srv/gump/public/workspace/tomcat-trunk/output/classes [javac] javac: invalid target release: 1.7 [javac] Usage: javac options source files [javac] use -help for a list of possible options BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:523: Compile failed; see the compiler error output for details. Total time: 1 second - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 05000616072012, vmgump.apache.org:vmgump:05000616072012 Gump E-mail Identifier (unique within run) #8. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-dbcp (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-dbcp has an issue affecting its community integration. This issue affects 3 projects, and has been outstanding for 6 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 : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... - tomcat-trunk-dbcp : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-dbcp/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Made directory [/srv/gump/public/workspace/tomcat-trunk/tomcat-deps] -INFO- Failed with reason build failed -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-dbcp/gump_work/build_tomcat-trunk_tomcat-trunk-dbcp.html Work Name: build_tomcat-trunk_tomcat-trunk-dbcp (Type: Build) Work ended in a state of : Failed Elapsed: 2 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-16072012.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps build-tomcat-dbcp [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/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/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/jta-spec1_0_1/jta-spec1_0_1.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp build-manifests: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/manifests [copy] Copying 12 files to /srv/gump/public/workspace/tomcat-trunk/output/manifests build-tomcat-dbcp: [copy] Copying 70 files to /srv/gump/public/workspace/tomcat-trunk/tomcat-deps [patch] patching file src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java [patch] Hunk #1 succeeded at 661 (offset -113 lines). [patch] patching file src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java [patch] patching file src/java/org/apache/commons/dbcp/DelegatingResultSet.java [patch] Hunk #1 succeeded at 1079 (offset -195 lines). [patch] patching file src/java/org/apache/commons/dbcp/PoolingDataSource.java [patch] Hunk #1 succeeded at 437 (offset -52 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingConnection.java [patch] Hunk #1 succeeded at 678 (offset -126 lines). [patch] patching file src/java/org/apache/commons/dbcp/PoolingDriver.java [patch] Hunk #1 succeeded at 497 (offset -4 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingStatement.java [patch] Hunk #1 succeeded at 484 (offset -45 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java [patch] Hunk #1 succeeded at 1204 (offset -173 lines). [patch] patching file src/java/org/apache/commons/dbcp/BasicDataSource.java [patch] Hunk #1 succeeded at 28 with fuzz 1. [patch] Hunk #2 succeeded at 1782 (offset -19 lines). [patch] patching file src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java [patch] Hunk #1 succeeded at 887 (offset -1 lines). [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/tomcat-deps/src/java/org/apache/tomcat/dbcp [move] Moving 75 files to /srv/gump/public/workspace/tomcat-trunk/tomcat-deps/src/java/org/apache/tomcat/dbcp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/tomcat-deps/classes [javac] Compiling 66 source files to
svn commit: r1361962 - /tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
Author: rjung Date: Mon Jul 16 10:00:21 2012 New Revision: 1361962 URL: http://svn.apache.org/viewvc?rev=1361962view=rev Log: Remove redundant Japanese message texts. Since they were all english they can be found in LocalString.properties. Keep Japanese file because of the information contained in the comments. Modified: tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties Modified: tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties?rev=1361962r1=1361961r2=1361962view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties Mon Jul 16 10:00:21 2012 @@ -14,50 +14,6 @@ # limitations under the License. # HttpMessages. The values in this file will be used in HTTP headers and as such -# may only contain TEXT as defined by RFC 2616. Since Japanese language messages -# do not meet this requirement, English text is used. -sc.100=Continue -sc.101=Switching Protocols -sc.200=OK -sc.201=Created -sc.202=Accepted -sc.203=Non-Authoritative Information -sc.204=No Content -sc.205=Reset Content -sc.206=Partial Content -sc.207=Multi-Status -sc.300=Multiple Choices -sc.301=Moved Permanently -sc.302=Moved Temporarily -sc.303=See Other -sc.304=Not Modified -sc.305=Use Proxy -sc.307=Temporary Redirect -sc.400=Bad Request -sc.401=Unauthorized -sc.402=Payment Required -sc.403=Forbidden -sc.404=Not Found -sc.405=Method Not Allowed -sc.406=Not Acceptable -sc.407=Proxy Authentication Required -sc.408=Request Timeout -sc.409=Conflict -sc.410=Gone -sc.411=Length Required -sc.412=Precondition Failed -sc.413=Request Entity Too Large -sc.414=Request-URI Too Long -sc.415=Unsupported Media Type -sc.416=Requested Range Not Satisfiable -sc.417=Expectation Failed -sc.422=Unprocessable Entity -sc.423=Locked -sc.424=Failed Dependency -sc.500=Internal Server Error -sc.501=Not Implemented -sc.502=Bad Gateway -sc.503=Service Unavailable -sc.504=Gateway Timeout -sc.505=HTTP Version Not Supported -sc.507=Insufficient Storage +# may only contain TEXT as defined by RFC 2616. Since Japanese language +# messages do not meet this requirement, English text is used. +# The English messages can be found in the default file LocalStrings.properties. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (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-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 6 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-validate : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 1 sec 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/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/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-16072012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-16072012.jar:/srv/gump/public/workspace/junit/dist/junit-16072012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-16072012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-*[0-9T].jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-16072012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-16072012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-16072012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-16072012-dep.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 - download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:461: Could not create type checkstyle due to java.lang.NoClassDefFoundError: com/google/common/collect/Lists at com.puppycrawl.tools.checkstyle.CheckStyleTask.init(CheckStyleTask.java:78) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:532) at org.apache.tools.ant.AntTypeDefinition.innerCreateAndSet(AntTypeDefinition.java:328) at org.apache.tools.ant.AntTypeDefinition.createAndSet(AntTypeDefinition.java:274) at org.apache.tools.ant.AntTypeDefinition.icreate(AntTypeDefinition.java:219) at org.apache.tools.ant.AntTypeDefinition.create(AntTypeDefinition.java:206) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:286) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:264) at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:417) at
Re: svn commit: r1360729 - in /tomcat/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/
On 15 July 2012 20:54, Mark Thomas ma...@apache.org wrote: On 15/07/2012 20:49, Filip Hanik Mailing Lists wrote: not sure if they want to make Java 7 minimum requirement I'd forgotten that DBCP stands for the Don't Be Compatible Project ... That will need a discussion on the commons dev list. If no-one brings it up sooner, I'll bring it up once Pool2 is sorted as work will naturally move to dbcp2 at that point. Mark - Original Message - From: sebb seb...@gmail.com To: Tomcat Developers List dev@tomcat.apache.org Sent: Saturday, July 14, 2012 8:04:42 PM Subject: Re: svn commit: r1360729 - in /tomcat/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/ Do these patches need to be fed back to Commons DBCP? Or do they only apply to the version embedded by Tomcat? On 14 July 2012 21:47, Rainer Jung rainer.j...@kippdata.de wrote: On 14.07.2012 22:25, Filip Hanik Mailing Lists wrote: I know, it's the same patch for DBCP as for DBCP2. Roger that. we can fix it, not urgent though No hurry, maybe we'll be on DBCP2 until the first TC 8 release. Rainer - Original Message - From: Rainer Jung rainer.j...@kippdata.de To: dev@tomcat.apache.org Sent: Friday, July 13, 2012 3:47:27 AM Subject: Re: svn commit: r1360729 - in /tomcat/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/ On 12.07.2012 17:38, fha...@apache.org wrote: Author: fhanik Date: Thu Jul 12 15:38:28 2012 New Revision: 1360729 URL: http://svn.apache.org/viewvc?rev=1360729view=rev Log: Configure Tomcat trunk to build with Java 7. This includes adding a patch to the Commons-DBCP code from res/dbcp Added: tomcat/trunk/res/dbcp/ tomcat/trunk/res/dbcp/dbcp-java-7.patch (with props) Just an info: when compiling TC trunk with Java 7 and ant 1.8.2 a few minutes ago, many of the offsets when applying the patch were quite big: [copy] Copying 68 files to /shared/build/dev/tomcat/deps/tomcat8-deps/tomcat8-deps/dbcp [patch] patching file src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java [patch] Hunk #1 succeeded at 660 (offset -114 lines). [patch] patching file src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java [patch] patching file src/java/org/apache/commons/dbcp/DelegatingResultSet.java [patch] Hunk #1 succeeded at 1078 (offset -196 lines). [patch] patching file src/java/org/apache/commons/dbcp/PoolingDataSource.java [patch] Hunk #1 succeeded at 437 (offset -52 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingConnection.java [patch] Hunk #1 succeeded at 678 (offset -126 lines). [patch] patching file src/java/org/apache/commons/dbcp/PoolingDriver.java [patch] Hunk #1 succeeded at 496 (offset -5 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingStatement.java [patch] Hunk #1 succeeded at 385 (offset -144 lines). [patch] patching file src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java [patch] Hunk #1 succeeded at 1206 (offset -171 lines). [patch] patching file src/java/org/apache/commons/dbcp/BasicDataSource.java [patch] Hunk #1 succeeded at 28 with fuzz 1. [patch] Hunk #2 succeeded at 1580 (offset -221 lines). [patch] patching file src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java [patch] Hunk #1 succeeded at 887 (offset -1 lines). Compilation for everything including DBCP works though. Regards, Rainer - 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 - 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1361432 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
On 14.07.2012 00:42, ma...@apache.org wrote:
Author: markt
Date: Fri Jul 13 22:42:42 2012
New Revision: 1361432
URL: http://svn.apache.org/viewvc?rev=1361432view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361432r1=1361431r2=1361432view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Jul
13 22:42:42 2012
@@ -236,33 +236,8 @@ public class WebappClassLoader
}
-/**
- * Construct a new ClassLoader with no defined repositories and the given
- * parent ClassLoader.
- *
- * @param parent Our parent class loader
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
-@Deprecated
-public WebappClassLoader(ClassLoader parent) {
-
-super(new URL[0], parent);
-
-this.parent = getParent();
-
-system = getSystemClassLoader();
-securityManager = System.getSecurityManager();
-
-if (securityManager != null) {
-refreshPolicy();
-}
-}
I get lots of test failures. This one seems to be used via reflection in
WebappLoader:
670 /**
671 * Create associated classLoader.
672 */
673 private WebappClassLoader createClassLoader()
674 throws Exception {
675
676 Class? clazz = Class.forName(loaderClass);
677 WebappClassLoader classLoader = null;
678
679 if (parentClassLoader == null) {
680 parentClassLoader = context.getParentClassLoader();
681 }
682 Class?[] argTypes = { ClassLoader.class };
683 Object[] args = { parentClassLoader };
684 Constructor? constr = clazz.getConstructor(argTypes);
^^
685 classLoader = (WebappClassLoader) constr.newInstance(args);
686
687 return classLoader;
688
689 }
So we get:
[junit] java.lang.NoSuchMethodException:
org.apache.catalina.loader.WebappClassLoader.init(java.lang.ClassLoader)
[junit] at java.lang.Class.getConstructor0(Class.java:2721)
[junit] at java.lang.Class.getConstructor(Class.java:1674)
[junit] at
org.apache.catalina.loader.WebappLoader.createClassLoader(WebappLoader.java:684)
[junit] at
org.apache.catalina.loader.WebappLoader.startInternal(WebappLoader.java:557)
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1361432 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Rainer Jung rainer.j...@kippdata.de wrote:
On 14.07.2012 00:42, ma...@apache.org wrote:
Author: markt
Date: Fri Jul 13 22:42:42 2012
New Revision: 1361432
URL: http://svn.apache.org/viewvc?rev=1361432view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361432r1=1361431r2=1361432view=diff
==
---
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri
Jul 13 22:42:42 2012
@@ -236,33 +236,8 @@ public class WebappClassLoader
}
-/**
- * Construct a new ClassLoader with no defined repositories and
the given
- * parent ClassLoader.
- *
- * @param parent Our parent class loader
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
-@Deprecated
-public WebappClassLoader(ClassLoader parent) {
-
-super(new URL[0], parent);
-
-this.parent = getParent();
-
-system = getSystemClassLoader();
-securityManager = System.getSecurityManager();
-
-if (securityManager != null) {
-refreshPolicy();
-}
-}
I get lots of test failures. This one seems to be used via reflection
in
WebappLoader:
Ok. Could you revert that commit for me please along with the deprecation. I'd
do it myself but I won't have easy access to do that for a few days.
Also, it would be worth adding a comment to the method's Javadoc.
Cheers,
Mark
670 /**
671 * Create associated classLoader.
672 */
673 private WebappClassLoader createClassLoader()
674 throws Exception {
675
676 Class? clazz = Class.forName(loaderClass);
677 WebappClassLoader classLoader = null;
678
679 if (parentClassLoader == null) {
680 parentClassLoader = context.getParentClassLoader();
681 }
682 Class?[] argTypes = { ClassLoader.class };
683 Object[] args = { parentClassLoader };
684 Constructor? constr = clazz.getConstructor(argTypes);
^^
685 classLoader = (WebappClassLoader) constr.newInstance(args);
686
687 return classLoader;
688
689 }
So we get:
[junit] java.lang.NoSuchMethodException:
org.apache.catalina.loader.WebappClassLoader.init(java.lang.ClassLoader)
[junit] at java.lang.Class.getConstructor0(Class.java:2721)
[junit] at java.lang.Class.getConstructor(Class.java:1674)
[junit] at
org.apache.catalina.loader.WebappLoader.createClassLoader(WebappLoader.java:684)
[junit] at
org.apache.catalina.loader.WebappLoader.startInternal(WebappLoader.java:557)
Regards,
Rainer
-
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
svn commit: r1361981 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/test/java/org/apache/
Author: rjung
Date: Mon Jul 16 12:00:25 2012
New Revision: 1361981
URL: http://svn.apache.org/viewvc?rev=1361981view=rev
Log:
Revert r1361432: method is not unused.
WebappLoader uses it via reflection.
Note: the spurious remove of svn:mergeinfo from
jdbc doesn't harm, it was empty.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
(props changed)
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
(props changed)
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361981r1=1361980r2=1361981view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Jul
16 12:00:25 2012
@@ -236,8 +236,33 @@ public class WebappClassLoader
}
+/**
+ * Construct a new ClassLoader with no defined repositories and the given
+ * parent ClassLoader.
+ *
+ * @param parent Our parent class loader
+ *
+ * @deprecated Unused - will be removed in 8.0.x
+ */
+@Deprecated
+public WebappClassLoader(ClassLoader parent) {
+
+super(new URL[0], parent);
+
+this.parent = getParent();
+
+system = getSystemClassLoader();
+securityManager = System.getSecurityManager();
+
+if (securityManager != null) {
+refreshPolicy();
+}
+}
+
+
// - Instance Variables
+
/**
* Associated directory context giving access to the resources in this
* webapp.
Propchange:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
('svn:mergeinfo' removed)
Propchange:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
('svn:mergeinfo' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361982 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Mon Jul 16 12:01:46 2012
New Revision: 1361982
URL: http://svn.apache.org/viewvc?rev=1361982view=rev
Log:
Revert r1361430: the method can not be deprecated,
because it is still used by WebappLoader via reflection.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361982r1=1361981r2=1361982view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Jul
16 12:01:46 2012
@@ -241,10 +241,7 @@ public class WebappClassLoader
* parent ClassLoader.
*
* @param parent Our parent class loader
- *
- * @deprecated Unused - will be removed in 8.0.x
*/
-@Deprecated
public WebappClassLoader(ClassLoader parent) {
super(new URL[0], parent);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361985 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Mon Jul 16 12:12:10 2012
New Revision: 1361985
URL: http://svn.apache.org/viewvc?rev=1361985view=rev
Log:
Add javadoc to clarify method use.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361985r1=1361984r2=1361985view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Jul
16 12:12:10 2012
@@ -239,6 +239,9 @@ public class WebappClassLoader
/**
* Construct a new ClassLoader with no defined repositories and the given
* parent ClassLoader.
+ * p
+ * Method is used via reflection -
+ * see {@link WebappLoader#createClassLoader()}
*
* @param parent Our parent class loader
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361987 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Mon Jul 16 12:20:10 2012
New Revision: 1361987
URL: http://svn.apache.org/viewvc?rev=1361987view=rev
Log:
Revert r1361434: method is not deprecated.
Add javadoc to clarify method use.
Backport of r1361982 and r1361985 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361982,1361985
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361987r1=1361986r2=1361987view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Mon Jul 16 12:20:10 2012
@@ -240,12 +240,12 @@ public class WebappClassLoader
/**
* Construct a new ClassLoader with no defined repositories and the given
* parent ClassLoader.
+ * p
+ * Method is used via reflection -
+ * see {@link WebappLoader#createClassLoader()}
*
* @param parent Our parent class loader
- *
- * @deprecated Unused - will be removed in 8.0.x
*/
-@Deprecated
public WebappClassLoader(ClassLoader parent) {
super(new URL[0], parent);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1361432 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
On 16.07.2012 13:26, Mark Thomas wrote:
Rainer Jung rainer.j...@kippdata.de wrote:
On 14.07.2012 00:42, ma...@apache.org wrote:
Author: markt
Date: Fri Jul 13 22:42:42 2012
New Revision: 1361432
URL: http://svn.apache.org/viewvc?rev=1361432view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361432r1=1361431r2=1361432view=diff
==
---
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri
Jul 13 22:42:42 2012
@@ -236,33 +236,8 @@ public class WebappClassLoader
}
-/**
- * Construct a new ClassLoader with no defined repositories and
the given
- * parent ClassLoader.
- *
- * @param parent Our parent class loader
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
-@Deprecated
-public WebappClassLoader(ClassLoader parent) {
-
-super(new URL[0], parent);
-
-this.parent = getParent();
-
-system = getSystemClassLoader();
-securityManager = System.getSecurityManager();
-
-if (securityManager != null) {
-refreshPolicy();
-}
-}
I get lots of test failures. This one seems to be used via reflection
in
WebappLoader:
Ok. Could you revert that commit for me please along with the deprecation. I'd
do it myself but I won't have easy access to do that for a few days.
NP
Also, it would be worth adding a comment to the method's Javadoc.
Done and done.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361991 - in /tomcat/trunk/java/org/apache/catalina/valves: ErrorReportValve.java LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties
Author: rjung
Date: Mon Jul 16 12:26:41 2012
New Revision: 1361991
URL: http://svn.apache.org/viewvc?rev=1361991view=rev
Log:
Remove redundant output of error message from
error report.
See: https://issues.apache.org/bugzilla/show_bug.cgi?id=53071#c9
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1361991r1=1361990r2=1361991view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Jul
16 12:26:41 2012
@@ -152,7 +152,7 @@ public class ErrorReportValve extends Va
// Do nothing if there is no report for the specified status code
String report = null;
try {
-report = sm.getString(http. + statusCode, message);
+report = sm.getString(http. + statusCode);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1361991r1=1361990r2=1361991view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Mon
Jul 16 12:26:41 2012
@@ -55,59 +55,59 @@ stuckThreadDetectionValve.notifyStuckThr
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
# The list might be kept in sync with the one in
# org/apache/tomcat/util/http/res/LocalStrings.properties.
-http.100=The client may continue ({0}).
-http.101=The server is switching protocols according to the Upgrade header
({0}).
-http.102=The server has accepted the complete request, but has not yet
completed it ({0}).
-http.201=The request succeeded and a new resource ({0}) has been created on
the server.
-http.202=This request was accepted for processing, but has not been completed
({0}).
-http.203=The meta information presented by the client did not originate from
the server ({0}).
-http.204=The request succeeded but there is no information to return ({0}).
-http.205=The client should reset the document view which caused this request
to be sent ({0}).
-http.206=The server has fulfilled a partial GET request for this resource
({0}).
-http.207=Multiple status values have been returned ({0}).
-http.208=This collection binding was already reported ({0}).
-http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance ({0}).
-http.300=The requested resource ({0}) corresponds to any one of a set of
representations, each with its own specific location.
-http.301=The requested resource ({0}) has moved permanently to a new location.
-http.302=The requested resource ({0}) has moved temporarily to a new location.
-http.303=The response to this request can be found under a different URI ({0}).
-http.304=The requested resource ({0}) is available and has not been modified.
-http.305=The requested resource ({0}) must be accessed through the proxy given
by the Location header.
-http.307=The requested resource resides temporarily under a different URI
({0}).
-http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs ({0}).
-http.400=The request sent by the client was syntactically incorrect ({0}).
-http.401=This request requires HTTP authentication ({0}).
-http.402=Payment is required for access to this resource ({0}).
-http.403=Access to the specified resource ({0}) has been forbidden.
-http.404=The requested resource ({0}) is not available.
-http.405=The specified HTTP method is not allowed for the requested resource
({0}).
-http.406=The resource identified by this request is only capable of generating
responses with characteristics not acceptable according to the request accept
headers ({0}).
-http.407=The client must first authenticate itself with the proxy ({0}).
-http.408=The client did not produce a request within the time that the server
was prepared to wait ({0}).
-http.409=The request could not be completed due to a conflict with the current
state of the resource ({0}).
-http.410=The requested resource ({0}) is no longer available, and no
forwarding address is known.
-http.411=This request cannot be handled without a
svn commit: r1361998 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ java/org/apache/tomcat/util/http/res/ webapps/docs/
Author: rjung
Date: Mon Jul 16 12:32:24 2012
New Revision: 1361998
URL: http://svn.apache.org/viewvc?rev=1361998view=rev
Log:
- Update list of HTTP status codes.
Current list taken from
http://www.iana.org/assignments/http-status-codes/http-status-codes.xml.
Only change of existing entries is code 302 message text changed
from Moved Temporarily to Found as per RFC 2616.
Backport of r1361263 from trunk.
- Remove redundant Japanese message texts.
Since they were all english they can be found
in LocalString.properties.
Keep Japanese file because of the information
contained in the comments.
Backport of r1361962 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361263,1361962
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1361998r1=1361997r2=1361998view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Mon Jul 16 12:32:24 2012
@@ -56,8 +56,13 @@ stuckThreadDetectionValve.notifyStuckThr
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread {0} (id={3}) was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0 There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
# HTTP status reports
+# All status codes registered with IANA can be found at
+# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
+# The list might be kept in sync with the one in
+# org/apache/tomcat/util/http/res/LocalStrings.properties.
http.100=The client may continue ({0}).
http.101=The server is switching protocols according to the Upgrade header
({0}).
+http.102=The server has accepted the complete request, but has not yet
completed it ({0}).
http.201=The request succeeded and a new resource ({0}) has been created on
the server.
http.202=This request was accepted for processing, but has not been completed
({0}).
http.203=The meta information presented by the client did not originate from
the server ({0}).
@@ -65,12 +70,16 @@ http.204=The request succeeded but there
http.205=The client should reset the document view which caused this request
to be sent ({0}).
http.206=The server has fulfilled a partial GET request for this resource
({0}).
http.207=Multiple status values have been returned ({0}).
+http.208=This collection binding was already reported ({0}).
+http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance ({0}).
http.300=The requested resource ({0}) corresponds to any one of a set of
representations, each with its own specific location.
http.301=The requested resource ({0}) has moved permanently to a new location.
http.302=The requested resource ({0}) has moved temporarily to a new location.
http.303=The response to this request can be found under a different URI ({0}).
http.304=The requested resource ({0}) is available and has not been modified.
http.305=The requested resource ({0}) must be accessed through the proxy given
by the Location header.
+http.307=The requested resource resides temporarily under a different URI
({0}).
+http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs ({0}).
http.400=The request sent by the client was syntactically incorrect ({0}).
http.401=This request requires HTTP authentication ({0}).
http.402=Payment is required for access to this resource ({0}).
@@ -91,10 +100,19 @@ http.416=The requested byte range cannot
http.417=The expectation given in the Expect request header ({0}) could not
be fulfilled.
http.422=The server understood the content type and syntax of the request but
was unable to process the contained instructions ({0}).
http.423=The source or destination resource of a method is locked ({0}).
+http.424=The method could not be performed on the resource because the
requested action depended on another action and that action failed ({0}).
+http.426=The request can only be completed after a protocol upgrade ({0}).
+http.428=The request is required to be conditional ({0}).
+http.429=The user has sent too many requests in a given amount of time ({0}).
svn commit: r1362000 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/
Author: rjung
Date: Mon Jul 16 12:34:22 2012
New Revision: 1362000
URL: http://svn.apache.org/viewvc?rev=1362000view=rev
Log:
Remove redundant output of error message from
error report.
See: https://issues.apache.org/bugzilla/show_bug.cgi?id=53071#c9
Backport of r1361991 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361991
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1362000r1=1361999r2=1362000view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Mon Jul 16 12:34:22 2012
@@ -176,7 +176,7 @@ public class ErrorReportValve extends Va
// Do nothing if there is no report for the specified status code
String report = null;
try {
-report = sm.getString(http. + statusCode, message);
+report = sm.getString(http. + statusCode);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1362000r1=1361999r2=1362000view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Mon Jul 16 12:34:22 2012
@@ -60,59 +60,59 @@ stuckThreadDetectionValve.notifyStuckThr
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
# The list might be kept in sync with the one in
# org/apache/tomcat/util/http/res/LocalStrings.properties.
-http.100=The client may continue ({0}).
-http.101=The server is switching protocols according to the Upgrade header
({0}).
-http.102=The server has accepted the complete request, but has not yet
completed it ({0}).
-http.201=The request succeeded and a new resource ({0}) has been created on
the server.
-http.202=This request was accepted for processing, but has not been completed
({0}).
-http.203=The meta information presented by the client did not originate from
the server ({0}).
-http.204=The request succeeded but there is no information to return ({0}).
-http.205=The client should reset the document view which caused this request
to be sent ({0}).
-http.206=The server has fulfilled a partial GET request for this resource
({0}).
-http.207=Multiple status values have been returned ({0}).
-http.208=This collection binding was already reported ({0}).
-http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance ({0}).
-http.300=The requested resource ({0}) corresponds to any one of a set of
representations, each with its own specific location.
-http.301=The requested resource ({0}) has moved permanently to a new location.
-http.302=The requested resource ({0}) has moved temporarily to a new location.
-http.303=The response to this request can be found under a different URI ({0}).
-http.304=The requested resource ({0}) is available and has not been modified.
-http.305=The requested resource ({0}) must be accessed through the proxy given
by the Location header.
-http.307=The requested resource resides temporarily under a different URI
({0}).
-http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs ({0}).
-http.400=The request sent by the client was syntactically incorrect ({0}).
-http.401=This request requires HTTP authentication ({0}).
-http.402=Payment is required for access to this resource ({0}).
-http.403=Access to the specified resource ({0}) has been forbidden.
-http.404=The requested resource ({0}) is not available.
-http.405=The specified HTTP method is not allowed for the requested resource
({0}).
-http.406=The resource identified by this request is only capable of generating
responses with characteristics not acceptable according to the request accept
headers ({0}).
-http.407=The client must first authenticate itself with the proxy ({0}).
-http.408=The client did not produce a
[Bug 53071] ErrorReportValve ignores message from throwable
https://issues.apache.org/bugzilla/show_bug.cgi?id=53071
--- Comment #11 from Rainer Jung rainer.j...@kippdata.de ---
(In reply to comment #8)
I personally do not like use of {0} in the messages for the description
field. Especially the ones for 404 and 403. It looks like some unrelated
text is inserted into the middle of a sentence. With this change it is
printed 4 times on the same page.
I removed the {0} from the report in r1361991 (trunk) and r1362000 (tc7).
Motivation:
As far as I can see, those properties are only used in ErrorReportValve. There
they are only put into the report, which is only output in an HTML document
directly below the message that would have been put into {0}.
In addition the same message is again being output as an h1 heading shortly
before.
So I see no reason at all to keep the message inside the report.
--
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
Re: HTTP Status Code Messages (Backport additions and changes, Japanese redundancy)
On 13.07.2012 18:45, Konstantin Kolinko wrote:
2012/7/13 Rainer Jung rainer.j...@kippdata.de:
1) Japanese HTTP Status Codes
=
The file
java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
is functionally identical to
java/org/apache/tomcat/util/http/res/LocalStrings.properties
(apart from changes introduced by me a few minutes ago).
I don't see any use in having all the english messages duplicated in the
Japanese file. I'd remove all lines except for a header that makes clear
that we don't want to introduce non-TEXT messages.
Any objections?
2) Backport r1361263
I plan to backport
http://svn.apache.org/viewvc?rev=1361263view=rev
to TC 7.
Note that there is a change for 302 from Moved Temporarily to Found. The
standards compliant text Found is also used by the Apache Web Server.
I do not really like how many {0} are used in those messages in the
valves' resource file. There was some discussion of that in
https://issues.apache.org/bugzilla/show_bug.cgi?id=53071#c9
Agreed, removed, backported.
Regarding the Japanese file: I think it is possible to remove the
messages, but I think that you should not remove the file itself.
Done and ported back.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53047] JDBCRealm allRolesMode=authOnly still needs role table
https://issues.apache.org/bugzilla/show_bug.cgi?id=53047 --- Comment #11 from Manuel Fink finkm...@googlemail.com --- I could not find the bug 53047 in the change log for 7.0.28 or 7.0.29. Is this still an issue? I need to implement the authOnly mode without checking any roles. Greetings from Germany Manuel -- 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
Re: svn commit: r1358055 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/
On 6 July 2012 07:53, fha...@apache.org wrote:
Author: fhanik
Date: Fri Jul 6 06:53:52 2012
New Revision: 1358055
URL: http://svn.apache.org/viewvc?rev=1358055view=rev
Log:
implement rev 1 of async/non blocking writes
@@ -146,8 +226,12 @@ public class InternalNioOutputBuffer ext
* @throws IOException
* TODO Fix non blocking write properly
*/
+int total = 0;
The field is misplaced; it should not be between the Javadoc and the method.
private synchronized int writeToSocket(ByteBuffer bytebuffer, boolean
block, boolean flip) throws IOException {
-if ( flip ) bytebuffer.flip();
+if ( flip ) {
+bytebuffer.flip();
+flipped = true;
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
