[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) 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-taglibs-standard has an issue affecting its community integration. This issue affects 2 projects, and has been outstanding for 109 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-taglibs-standard : Standard Taglib - tomcat-taglibs-standard-install : JSP Taglibs Full details are available at: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Optional dependency httpunit failed with reason build failed -DEBUG- (Apache Gump generated) Apache Maven Settings in: /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build) Work ended in a state of : Failed Elapsed: 25 secs Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard] M2_HOME: /opt/maven2 - [INFO] [compiler:compile {execution: default-compile}] [INFO] Nothing to compile - all classes are up to date [debug] execute contextualize [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory /srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources [INFO] Copying 3 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] No sources to compile [INFO] [surefire:test {execution: default-test}] [INFO] Tests are skipped. [INFO] [bundle:bundle {execution: default-bundle}] [INFO] [install:install {execution: default-install}] [INFO] Installing /srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar to /srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar [INFO] [bundle:install {execution: default-install}] [INFO] Parsing file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml [INFO] Installing org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar [INFO] Writing OBR metadata [INFO] [INFO] Building JSTL Implementation [INFO]task-segment: [install] [INFO] [INFO] [remote-resources:process {execution: default}] [INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking for updates from apache.snapshots [debug] execute contextualize [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 14 resources [INFO] Copying 3 resources [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 96 source files to /srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes [INFO] - [ERROR] COMPILATION ERROR : [INFO] - [ERROR] /srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7] error: DataSourceWrapper is not abstract and does not override abstract method getParentLogger() in CommonDataSource [INFO] 1 error [INFO] - [INFO] [ERROR] BUILD FAILURE [INFO] [INFO] Compilation failure /srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7] error: DataSourceWrapper is not abstract and does not override abstract method getParentLogger() in CommonDataSource [INFO] [INFO] For more information, run Maven with the -e switch [INFO] --
Re: [VOTE] Release Apache Tomcat 7.0.31
On 01/10/2012 23:51, Konstantin Kolinko wrote: > 2012/10/2 Mark Thomas : >> The proposed Apache Tomcat 7.0.31 release is now available for voting. >> >> It can be obtained from: >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.31/ >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-073/ >> The svn tag is: >> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_31/ >> >> The proposed 7.0.31 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 7.0.31 Stable >> > > Haven't it been better to give some heads-up first? There are two reasons for not doing that this time: 1. It is the start of the month and I have repeatedly stated my aim is to do a release a month at the beginning of the month. 2. For the last few releases, my impression (and it is only an impression - the data doesn't support it) is that my tagging announcement has been quickly followed by a handful of bugs being reported that folks have been sitting on. I wanted to discourage this but since my initial impression was wrong there isn't anything to discourage. > The documentation formatting for the manager webapp is still broken. OK. That needs fixing (and it should have been fixed by now). I'll cancel the 7.0.31 release vote. That also means my Javadoc fixes will make it into the next release. I'll follow up on the issues with the original patch in the threads that already exist. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[CANCELLED] [VOTE] Release Apache Tomcat 7.0.31
On 01/10/2012 22:07, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.31 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.31/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-073/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_31/ > > The proposed 7.0.31 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.31 Stable Due to some unfixed issues in the documentation web app, this release vote has been cancelled. A 7.0.32 tag and release vote will follow shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1381633 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml
On 15/09/2012 23:02, Mark Thomas wrote: > On 06/09/2012 16:02, schu...@apache.org wrote: >> Author: schultz >> Date: Thu Sep 6 15:02:42 2012 >> New Revision: 1381633 >> >> URL: http://svn.apache.org/viewvc?rev=1381633&view=rev >> Log: >> Added multi-op modes to JMXProxyServlet. >> >> Modified: >> tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java >> tomcat/trunk/webapps/docs/manager-howto.xml > > The changes to manager-howto.xml mean that the page is now half a mile > wide and impossible to read comfortably. Please fix this ASAP. Ping. It has been more than three weeks with no fix. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1381635 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml
On 08/09/2012 14:37, Mark Thomas wrote: > On 08/09/2012 11:52, Konstantin Kolinko wrote: >> 2012/9/6 : >>> Author: schultz >>> Date: Thu Sep 6 15:08:58 2012 >>> New Revision: 1381635 >>> >>> URL: http://svn.apache.org/viewvc?rev=1381635&view=rev >>> Log: >>> Added multi-op modes to JMXProxyServlet. >>> >>> >>> Modified: >>> tomcat/tc7.0.x/trunk/ (props changed) >>> >>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java >>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >>> tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml >>> >>> Propchange: tomcat/tc7.0.x/trunk/ >>> -- >>> Merged /tomcat/trunk:r1381633 >>> >>> +if(null != request.getParameter("invokeAndGet")) { >>> ... >> >> 1. This broke formatting of the manager-howto page. >> You should wrap such long samples. >> >> 2. Not a showstopper, but personally I dislike such limited solutions, > > +1. This has the potential to get very messy, very quickly. I'm not > massively concerned about the current state of the code but any further > expansion of the list of possible combinations would be much better > implemented as Konstantin suggests. The more I think about this, the less I like it. Konstantin's proposal is the way this should be done. Given the above and the documentation issues I think this should be reverted in the 7.0.x branch pending further discussion and the fixing of the documentation issues. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: CMS or svnpubsub for Site
If no objections, I can create the infra jira for that. ? 2012/10/1 Konstantin Kolinko : > 2012/10/1 Olivier Lamy : >> 2012/10/1 Mark Thomas : >>> On 01/10/2012 10:36, Olivier Lamy wrote: 2012/10/1 Mark Thomas : > On 01/10/2012 07:48, Olivier Lamy wrote: >> 2012/10/1 Konstantin Kolinko : >>> 2012/10/1 Olivier Lamy : Hi Folks, I wonder what is the plan for CMS or svnpubsub for the web site ? >>> >>> The plan is to use svnpubsub. >> Ok. >>> >>> The whole site is already in svn, except for subprojects that rely on >>> Maven: >>> >>> 1. Taglibs >>> 2. Maven Plugin >> What is the svn path for both ? > > The main website is at: > https://svn.apache.org/repos/asf/tomcat/site/trunk > > That maps to: > http://tomcat.apache.org > > I'd expect the sub-projects to use their current URLs. > >> Recently I released a maven plugin to be able to commit maven site to >> a svn location, so I can have a look at the configuration for those >> projects. >> Once it's done, can we go live ? > > Yes. Migrating the sub-projects is the only blocker. Ok so not a problem anymore :-). Maven has now a plugin to commit web sites to a scm (i.e svn path) (http://maven.apache.org/plugins/maven-scm-publish-plugin/). Where will be the svn path for the generated content ? http://svn.apache.org/repos/asf/tomcat/site/trunk/docs/ ? >>> >>> Yes. >>> If yes I can setup the maven plugin and taglib to publish maven sites here (in the correct sub directory for sure). >>> >>> Great. >> >> All done. (I think it's possible to move to svnpubsub now :-) ) >> > > I updated the wc at people, reverting tree conflicts etc.. It is > clean. OK to go. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1392832 - in /tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources: Cache.java CachedResource.java LocalStrings.properties
Author: markt Date: Tue Oct 2 10:50:52 2012 New Revision: 1392832 URL: http://svn.apache.org/viewvc?rev=1392832&view=rev Log: Implement the background cache expiry Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/Cache.java tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/CachedResource.java tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/LocalStrings.properties Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/Cache.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/Cache.java?rev=1392832&r1=1392831&r2=1392832&view=diff == --- tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/Cache.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/Cache.java Tue Oct 2 10:50:52 2012 @@ -16,14 +16,24 @@ */ package org.apache.catalina.webresources; +import java.util.Comparator; +import java.util.Iterator; +import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; import org.apache.catalina.WebResource; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.util.res.StringManager; public class Cache { +private static final Log log = LogFactory.getLog(Cache.class); +protected static final StringManager sm = +StringManager.getManager(Constants.Package); + // Estimate (on high side to be safe) of average size excluding content // based on profiler data. private static final long CACHE_ENTRY_SIZE = 500; @@ -44,6 +54,9 @@ public class Cache { } protected WebResource getResource(String path) { + +// TODO Should some resources be excluded from caching? + CachedResource cacheEntry = resourceCache.get(path); if (cacheEntry != null && !cacheEntry.validate()) { @@ -85,8 +98,34 @@ public class Cache { protected void backgroundProcess() { long targetSize = maxSize * (100 - TARGET_FREE_PERCENT) / 100; -while (targetSize > size.get()) { -// TODO ID resources to remove +long now = System.currentTimeMillis(); + +// Create an ordered set of all cached resources with the least recently +// used first. +TreeSet orderedResources = +new TreeSet<>(new EvictionOrder()); +orderedResources.addAll(resourceCache.values()); + +Iterator iter = orderedResources.iterator(); + +while (targetSize > size.get() && iter.hasNext()) { +CachedResource resource = iter.next(); + +// Don't expire anything that has been checked within the TTL +if (resource.getNextCheck() > now) { +continue; +} + +// Remove the entry from the cache +removeCacheEntry(resource.getWebappPath()); +} + +long cacheSize = size.get(); +if (targetSize > cacheSize) { +log.info(sm.getString("cache.backgroundEvict", +Long.valueOf(TARGET_FREE_PERCENT), +root.getContext().getName(), +Long.valueOf(cacheSize / 1024))); } } @@ -116,4 +155,23 @@ public class Cache { public void setMaxSize(long maxSize) { this.maxSize = maxSize; } + +private static class EvictionOrder implements Comparator { + +@Override +public int compare(CachedResource cr1, CachedResource cr2) { +long nc1 = cr1.getNextCheck(); +long nc2 = cr2.getNextCheck(); + +// Oldest resource should be first (so iterator goes from oldest to +// youngest. +if (nc1 == nc2) { +return 0; +} else if (nc1 > nc2) { +return -1; +} else { +return 1; +} +} +} } Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/CachedResource.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/CachedResource.java?rev=1392832&r1=1392831&r2=1392832&view=diff == --- tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/CachedResource.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/CachedResource.java Tue Oct 2 10:50:52 2012 @@ -82,6 +82,9 @@ public class CachedResource implements W return true; } +protected long getNextCheck() { +return nextCheck; +} @Override public long getLastModified() { Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/webreso
Re: CMS or svnpubsub for Site
Done: https://issues.apache.org/jira/browse/INFRA-5339 2012/10/2 Olivier Lamy : > If no objections, I can create the infra jira for that. > ? > > 2012/10/1 Konstantin Kolinko : >> 2012/10/1 Olivier Lamy : >>> 2012/10/1 Mark Thomas : On 01/10/2012 10:36, Olivier Lamy wrote: > 2012/10/1 Mark Thomas : >> On 01/10/2012 07:48, Olivier Lamy wrote: >>> 2012/10/1 Konstantin Kolinko : 2012/10/1 Olivier Lamy : > Hi Folks, > I wonder what is the plan for CMS or svnpubsub for the web site ? The plan is to use svnpubsub. >>> Ok. The whole site is already in svn, except for subprojects that rely on Maven: 1. Taglibs 2. Maven Plugin >>> What is the svn path for both ? >> >> The main website is at: >> https://svn.apache.org/repos/asf/tomcat/site/trunk >> >> That maps to: >> http://tomcat.apache.org >> >> I'd expect the sub-projects to use their current URLs. >> >>> Recently I released a maven plugin to be able to commit maven site to >>> a svn location, so I can have a look at the configuration for those >>> projects. >>> Once it's done, can we go live ? >> >> Yes. Migrating the sub-projects is the only blocker. > Ok so not a problem anymore :-). Maven has now a plugin to commit web > sites to a scm (i.e svn path) > (http://maven.apache.org/plugins/maven-scm-publish-plugin/). > > Where will be the svn path for the generated content ? > http://svn.apache.org/repos/asf/tomcat/site/trunk/docs/ ? Yes. > If yes I can setup the maven plugin and taglib to publish maven sites > here (in the correct sub directory for sure). Great. >>> >>> All done. (I think it's possible to move to svnpubsub now :-) ) >>> >> >> I updated the wc at people, reverting tree conflicts etc.. It is >> clean. OK to go. >> >> Best regards, >> Konstantin Kolinko >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > > > -- > Olivier Lamy > Talend: http://coders.talend.com > http://twitter.com/olamy | http://linkedin.com/in/olamy -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53952] New: Add support for TLS 1.1 and 1.2
https://issues.apache.org/bugzilla/show_bug.cgi?id=53952 Priority: P2 Bug ID: 53952 Assignee: dev@tomcat.apache.org Summary: Add support for TLS 1.1 and 1.2 Severity: normal Classification: Unclassified OS: Linux Reporter: sebe...@post.cz Hardware: PC Status: NEW Version: unspecified Component: Library Product: Tomcat Native Created attachment 29433 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29433&action=edit patch for tomcat trunk that adds support for newer TLS versions It would be nice to have support for newer versions of TLS protocol. Due to BEAST attack, the only usable ciphersuites supported by TLS version 1.0 are those based on RC4. I'll attach compile-tested patches for both tcnative and tomcat. -- 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
[Bug 53952] Add support for TLS 1.1 and 1.2
https://issues.apache.org/bugzilla/show_bug.cgi?id=53952 --- Comment #1 from sebe...@post.cz --- Created attachment 29434 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29434&action=edit patch for tcnative trunk that adds support for newer TLS versions -- 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
[Bug 53952] Add support for TLS 1.1 and 1.2
https://issues.apache.org/bugzilla/show_bug.cgi?id=53952 --- Comment #2 from sebe...@post.cz --- Created attachment 29435 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29435&action=edit patch for tcnative 1.1 branch -- 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
[Bug 53952] Add support for TLS 1.1 and 1.2
https://issues.apache.org/bugzilla/show_bug.cgi?id=53952 sebe...@post.cz changed: What|Removed |Added CC||sebe...@post.cz -- 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: r1381633 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml
Mark, On 10/2/12 5:16 AM, Mark Thomas wrote: > On 15/09/2012 23:02, Mark Thomas wrote: >> On 06/09/2012 16:02, schu...@apache.org wrote: >>> Author: schultz >>> Date: Thu Sep 6 15:02:42 2012 >>> New Revision: 1381633 >>> >>> URL: http://svn.apache.org/viewvc?rev=1381633&view=rev >>> Log: >>> Added multi-op modes to JMXProxyServlet. >>> >>> Modified: >>> tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java >>> tomcat/trunk/webapps/docs/manager-howto.xml >> >> The changes to manager-howto.xml mean that the page is now half a mile >> wide and impossible to read comfortably. Please fix this ASAP. > > Ping. > > It has been more than three weeks with no fix. Sorry, I didn't see the original reply. I'll take a look. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1393011 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml
Author: schultz Date: Tue Oct 2 16:24:55 2012 New Revision: 1393011 URL: http://svn.apache.org/viewvc?rev=1393011&view=rev Log: Reverted r1381633 for further discussion. Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java tomcat/trunk/webapps/docs/manager-howto.xml Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1393011&r1=1393010&r2=1393011&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Tue Oct 2 16:24:55 2012 @@ -93,98 +93,33 @@ public class JMXProxyServlet extends Htt return; } -// Invoke an operation, then execute a "get" -if(null != request.getParameter("invokeAndGet")) { -try { -invokeOperationInternal(request.getParameter("invoke"), -request.getParameter("op"), - getInvokeParameters(request.getParameter("ps"))); - -getAttribute(writer, - request.getParameter("get"), - request.getParameter("att"), - request.getParameter("key")); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} +String qry=request.getParameter("set"); +if( qry!= null ) { +String name=request.getParameter("att"); +String val=request.getParameter("val"); + +setAttribute( writer, qry, name, val ); +return; } -// Get a value first, then invoke an operation -else if(null != request.getParameter("getAndInvoke")) { -try { -getAttribute(writer, - request.getParameter("get"), - request.getParameter("att"), - request.getParameter("key")); - -invokeOperationInternal(request.getParameter("invoke"), -request.getParameter("op"), - getInvokeParameters(request.getParameter("ps"))); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} +qry=request.getParameter("get"); +if( qry!= null ) { +String name=request.getParameter("att"); +getAttribute( writer, qry, name, request.getParameter("key") ); +return; } -// Invoke an operation, then set a value -else if(null != request.getParameter("invokeAndSet")) { -try { -invokeOperationInternal(request.getParameter("invoke"), -request.getParameter("op"), - getInvokeParameters(request.getParameter("ps"))); - -setAttribute(writer, - request.getParameter("set"), - request.getParameter("att"), - request.getParameter("val")); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} +qry = request.getParameter("invoke"); +if(qry != null) { +String opName=request.getParameter("op"); +String[] params = getInvokeParameters(request.getParameter("ps")); +invokeOperation(writer, qry, opName, params); +return; } -// Get a value, then set its value -else if(null != request.getParameter("getAndSet")) { -try { -getAttribute(writer, - request.getParameter("get"), - request.getParameter("att"), - request.getParameter("key")); - -setAttributeInternal(request.getParameter("set"), - request.getParameter("att"), - request.getParameter("val")); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} -} else { -String qry=request.getParameter("set"); -if( qry!= null ) { -String name=request.getParameter("att"); -String val=request.getParameter("val"); - -setAttribute( writer, qry, name, val ); -return; -} -qry=request.getParameter("get"); -if( qry
svn commit: r1393014 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml
Author: schultz Date: Tue Oct 2 16:29:15 2012 New Revision: 1393014 URL: http://svn.apache.org/viewvc?rev=1393014&view=rev Log: Reverted r1381635 for further discussion. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- Reverse-merged /tomcat/trunk:r1381633 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1393014&r1=1393013&r2=1393014&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Tue Oct 2 16:29:15 2012 @@ -93,98 +93,33 @@ public class JMXProxyServlet extends Htt return; } -// Invoke an operation, then execute a "get" -if(null != request.getParameter("invokeAndGet")) { -try { -invokeOperationInternal(request.getParameter("invoke"), -request.getParameter("op"), - getInvokeParameters(request.getParameter("ps"))); - -getAttribute(writer, - request.getParameter("get"), - request.getParameter("att"), - request.getParameter("key")); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} +String qry=request.getParameter("set"); +if( qry!= null ) { +String name=request.getParameter("att"); +String val=request.getParameter("val"); + +setAttribute( writer, qry, name, val ); +return; } -// Get a value first, then invoke an operation -else if(null != request.getParameter("getAndInvoke")) { -try { -getAttribute(writer, - request.getParameter("get"), - request.getParameter("att"), - request.getParameter("key")); - -invokeOperationInternal(request.getParameter("invoke"), -request.getParameter("op"), - getInvokeParameters(request.getParameter("ps"))); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} +qry=request.getParameter("get"); +if( qry!= null ) { +String name=request.getParameter("att"); +getAttribute( writer, qry, name, request.getParameter("key") ); +return; } -// Invoke an operation, then set a value -else if(null != request.getParameter("invokeAndSet")) { -try { -invokeOperationInternal(request.getParameter("invoke"), -request.getParameter("op"), - getInvokeParameters(request.getParameter("ps"))); - -setAttribute(writer, - request.getParameter("set"), - request.getParameter("att"), - request.getParameter("val")); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} +qry = request.getParameter("invoke"); +if(qry != null) { +String opName=request.getParameter("op"); +String[] params = getInvokeParameters(request.getParameter("ps")); +invokeOperation(writer, qry, opName, params); +return; } -// Get a value, then set its value -else if(null != request.getParameter("getAndSet")) { -try { -getAttribute(writer, - request.getParameter("get"), - request.getParameter("att"), - request.getParameter("key")); - -setAttributeInternal(request.getParameter("set"), - request.getParameter("att"), - request.getParameter("val")); -} catch (Exception e) { -writer.println("Error - " + e.toString()); -e.printStackTrace(writer); -} -} else { -String qry=request.getParameter("set"); -
Re: svn commit: r1381633 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml
Mark, On 10/2/12 12:16 PM, Christopher Schultz wrote: > Mark, > > On 10/2/12 5:16 AM, Mark Thomas wrote: >> On 15/09/2012 23:02, Mark Thomas wrote: >>> On 06/09/2012 16:02, schu...@apache.org wrote: Author: schultz Date: Thu Sep 6 15:02:42 2012 New Revision: 1381633 URL: http://svn.apache.org/viewvc?rev=1381633&view=rev Log: Added multi-op modes to JMXProxyServlet. Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java tomcat/trunk/webapps/docs/manager-howto.xml >>> >>> The changes to manager-howto.xml mean that the page is now half a mile >>> wide and impossible to read comfortably. Please fix this ASAP. >> >> Ping. >> >> It has been more than three weeks with no fix. > > Sorry, I didn't see the original reply. I'll take a look. I have reverted the patches to both TC 7 and trunk. I apologize for causing a false-start for the TC7 release. -chris signature.asc Description: OpenPGP digital signature
Re: svn commit: r1381635 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml
Mark, On 10/2/12 5:22 AM, Mark Thomas wrote: > On 08/09/2012 14:37, Mark Thomas wrote: >> On 08/09/2012 11:52, Konstantin Kolinko wrote: >>> 2012/9/6 : Author: schultz Date: Thu Sep 6 15:08:58 2012 New Revision: 1381635 URL: http://svn.apache.org/viewvc?rev=1381635&view=rev Log: Added multi-op modes to JMXProxyServlet. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1381633 +if(null != request.getParameter("invokeAndGet")) { ... >>> >>> 1. This broke formatting of the manager-howto page. >>> You should wrap such long samples. >>> >>> 2. Not a showstopper, but personally I dislike such limited solutions, >> >> +1. This has the potential to get very messy, very quickly. I'm not >> massively concerned about the current state of the code but any further >> expansion of the list of possible combinations would be much better >> implemented as Konstantin suggests. > > The more I think about this, the less I like it. Konstantin's proposal > is the way this should be done. > > Given the above and the documentation issues I think this should be > reverted in the 7.0.x branch pending further discussion and the fixing > of the documentation issues. Yes, the code will become convoluted if we support more varieties of operations but I figured that get/set or set/get (or invoke replacing get or set in any of those) were by far to be the most likely paired-operations to be performed. The JMXProxyServlet is designed to issue a single command (get, set, invoke) and return the results. I wanted to give a user the ability to do things like get stats and then reset them (nearly) simultaneously so you can get the best metrics possible. Being able to execute multiple gets, etc. will give you a whole bunch of output that a client will have to parse. I think this use case is better-served by a real JMX client and not the JMXProxyServlet. I want to be able to to get/set and get/invoke. If you really think that infinite flexibility is the right way to implement this, I'll do it, but I don't like Konstantin's suggestion at all. I think if we want to support infinite flexibility, HTTP GET is the wrong approach, and an HTTP POST with an XML body is more appropriate to support argument association, etc. That doesn't fit-in with the existing interface to the JMXProxyServlet. Perhaps a separate servlet with an explicitly-different interface is more appropriate. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1393071 - /tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
Author: kkolinko Date: Tue Oct 2 18:10:56 2012 New Revision: 1393071 URL: http://svn.apache.org/viewvc?rev=1393071&view=rev Log: Improve session management in CsrfPreventionFilter Modified: tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Modified: tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1393071&r1=1393070&r2=1393071&view=diff == --- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Tue Oct 2 18:10:56 2012 @@ -33,6 +33,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; +import javax.servlet.http.HttpSession; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -153,15 +154,19 @@ public class CsrfPreventionFilter extend } } -LruCache nonceCache = -(LruCache) req.getSession(true).getAttribute( -Constants.CSRF_NONCE_SESSION_ATTR_NAME); +HttpSession session = req.getSession(false); + +@SuppressWarnings("unchecked") +LruCache nonceCache = (session == null) ? null +: (LruCache) session.getAttribute( +Constants.CSRF_NONCE_SESSION_ATTR_NAME); if (!skipNonceCheck) { String previousNonce = req.getParameter(Constants.CSRF_NONCE_REQUEST_PARAM); -if (nonceCache != null && !nonceCache.contains(previousNonce)) { +if (nonceCache == null || previousNonce == null || +!nonceCache.contains(previousNonce)) { res.sendError(HttpServletResponse.SC_FORBIDDEN); return; } @@ -169,7 +174,10 @@ public class CsrfPreventionFilter extend if (nonceCache == null) { nonceCache = new LruCache<>(nonceCacheSize); -req.getSession().setAttribute( +if (session == null) { +session = req.getSession(true); +} +session.setAttribute( Constants.CSRF_NONCE_SESSION_ATTR_NAME, nonceCache); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
trunk: An buffer exception in AccessLogValve.log(..)
Hi! Running current trunk + Nio connector + JDK 7u7, I see a lot of the following exceptions. It looks like there is some bug in AccessLogValve optimization when StringBuilder was replaced with a CharBuffer. A CharBuffer cannot grow itself? 02-Oct-2012 22:17:29.000 SEVERE [http-nio-8080-exec-2] org.apache.coyote.http11.AbstractHttp11Processor.process Error processing request java.nio.BufferOverflowException at java.nio.Buffer.nextPutIndex(Buffer.java:513) at java.nio.HeapCharBuffer.put(HeapCharBuffer.java:163) at java.nio.CharBuffer.put(CharBuffer.java:892) at java.nio.CharBuffer.put(CharBuffer.java:915) at java.nio.CharBuffer.append(CharBuffer.java:1311) at org.apache.catalina.valves.AccessLogValve$RequestElement.addElement(AccessLogValve.java:1577) at org.apache.catalina.valves.AccessLogValve.log(AccessLogValve.java:944) at org.apache.catalina.core.AccessLogAdapter.log(AccessLogAdapter.java:51) at org.apache.catalina.core.ContainerBase.logAccess(ContainerBase.java:1043) at org.apache.catalina.core.ContainerBase.logAccess(ContainerBase.java:1050) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:480) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:963) at org.apache.coyote.http11.Http11NioProcessor.process(Http11NioProcessor.java:234) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:617) at org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:223) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1568) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) 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: r1393088 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/CsrfPreventionFilter.java webapps/docs/changelog.xml
Author: kkolinko Date: Tue Oct 2 18:40:22 2012 New Revision: 1393088 URL: http://svn.apache.org/viewvc?rev=1393088&view=rev Log: Merged revision 1393071 from tomcat/trunk: Improve session management in CsrfPreventionFilter Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1393071 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1393088&r1=1393087&r2=1393088&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Tue Oct 2 18:40:22 2012 @@ -33,6 +33,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; +import javax.servlet.http.HttpSession; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -153,16 +154,19 @@ public class CsrfPreventionFilter extend } } +HttpSession session = req.getSession(false); + @SuppressWarnings("unchecked") -LruCache nonceCache = -(LruCache) req.getSession(true).getAttribute( -Constants.CSRF_NONCE_SESSION_ATTR_NAME); - +LruCache nonceCache = (session == null) ? null +: (LruCache) session.getAttribute( +Constants.CSRF_NONCE_SESSION_ATTR_NAME); + if (!skipNonceCheck) { String previousNonce = req.getParameter(Constants.CSRF_NONCE_REQUEST_PARAM); -if (nonceCache != null && !nonceCache.contains(previousNonce)) { +if (nonceCache == null || previousNonce == null || +!nonceCache.contains(previousNonce)) { res.sendError(HttpServletResponse.SC_FORBIDDEN); return; } @@ -170,7 +174,10 @@ public class CsrfPreventionFilter extend if (nonceCache == null) { nonceCache = new LruCache(nonceCacheSize); -req.getSession().setAttribute( +if (session == null) { +session = req.getSession(true); +} +session.setAttribute( Constants.CSRF_NONCE_SESSION_ATTR_NAME, nonceCache); } Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1393088&r1=1393087&r2=1393088&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 2 18:40:22 2012 @@ -53,7 +53,17 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues to not "pop up" wrt. others). --> - + + + + +Improve session management in CsrfPreventionFilter. +(kkolinko) + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: trunk: An buffer exception in AccessLogValve.log(..)
Konstantin, On 10/2/12 2:32 PM, Konstantin Kolinko wrote: > Running current trunk + Nio connector + JDK 7u7, I see a lot of the > following exceptions. > > It looks like there is some bug in AccessLogValve optimization when > StringBuilder was replaced with a CharBuffer. > > A CharBuffer cannot grow itself? The API does not seem to say anything about re-sizing CharBuffers. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1393115 - /tomcat/trunk/build.properties.default
Author: kkolinko Date: Tue Oct 2 19:14:23 2012 New Revision: 1393115 URL: http://svn.apache.org/viewvc?rev=1393115&view=rev Log: Update to Checkstyle 5.6 Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1393115&r1=1393114&r2=1393115&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Tue Oct 2 19:14:23 2012 @@ -188,7 +188,7 @@ junit.jar=${junit.lib}/junit-4.8.2.jar junit.loc=http://cloud.github.com/downloads/KentBeck/junit/junit4.8.2.zip # - Checkstyle, version 5.1 or later - -checkstyle.version=5.5 +checkstyle.version=5.6 checkstyle.home=${base.path}/checkstyle-${checkstyle.version} checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle-${checkstyle.version}-bin.zip checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: trunk: An buffer exception in AccessLogValve.log(..)
Hi, -Original-Nachricht- > Von: Christopher Schultz > An: Tomcat Developers List > > A CharBuffer cannot grow itself? > > The API does not seem to say anything about re-sizing CharBuffers. The Javadoc for java.nio.Buffer (superclass of CharBuffer) states that: A buffer's capacity is the number of elements it contains. The capacity of a buffer is never negative and never changes. So one would probably need to manually allocate a bigger buffer when it has too little remaining elements. Regards, Konstantin Preißer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1393132 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml
Author: kkolinko Date: Tue Oct 2 19:41:51 2012 New Revision: 1393132 URL: http://svn.apache.org/viewvc?rev=1393132&view=rev Log: Merged revision 1393115 from tomcat/trunk: Update to Checkstyle 5.6 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1393115 Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1393132&r1=1393131&r2=1393132&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Tue Oct 2 19:41:51 2012 @@ -182,7 +182,7 @@ junit.jar=${junit.lib}/junit-4.8.2.jar junit.loc=http://cloud.github.com/downloads/KentBeck/junit/junit4.8.2.zip # - Checkstyle, version 5.1 or later - -checkstyle.version=5.5 +checkstyle.version=5.6 checkstyle.home=${base.path}/checkstyle-${checkstyle.version} checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle-${checkstyle.version}-bin.zip checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1393132&r1=1393131&r2=1393132&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 2 19:41:51 2012 @@ -62,6 +62,13 @@ + + + +Update optional Checkstyle library to 5.6. (kkolinko) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: trunk: An buffer exception in AccessLogValve.log(..)
2012/10/2 Christopher Schultz : > Konstantin, > > On 10/2/12 2:32 PM, Konstantin Kolinko wrote: >> Running current trunk + Nio connector + JDK 7u7, I see a lot of the >> following exceptions. >> >> It looks like there is some bug in AccessLogValve optimization when >> StringBuilder was replaced with a CharBuffer. >> >> A CharBuffer cannot grow itself? > > The API does not seem to say anything about re-sizing CharBuffers. > The CharArrayWriter class can be a replacement here. It grows itself. It is reusable with CharArrayWriter.reset(). It can write its buffer without creating a copy with CharArrayWriter.writeTo(Writer). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53952] Add support for TLS 1.1 and 1.2
https://issues.apache.org/bugzilla/show_bug.cgi?id=53952 --- Comment #3 from Christopher Schultz --- This introduces a compile-time dependency on OpenSSL 1.0.1+. -- 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: trunk: An buffer exception in AccessLogValve.log(..)
Konstantin, On 10/2/12 3:58 PM, Konstantin Kolinko wrote: > 2012/10/2 Christopher Schultz : >> Konstantin, >> >> On 10/2/12 2:32 PM, Konstantin Kolinko wrote: >>> Running current trunk + Nio connector + JDK 7u7, I see a lot of the >>> following exceptions. >>> >>> It looks like there is some bug in AccessLogValve optimization when >>> StringBuilder was replaced with a CharBuffer. >>> >>> A CharBuffer cannot grow itself? >> >> The API does not seem to say anything about re-sizing CharBuffers. >> > > The CharArrayWriter class can be a replacement here. > > It grows itself. > It is reusable with CharArrayWriter.reset(). > It can write its buffer without creating a copy with > CharArrayWriter.writeTo(Writer). Sounds ideal. One thing I might consider is whether it can *shrink* at some point. I can imagine some relatively rare use case where someone uses ${xxx}r or %{xxx}s and the resulting string ends up being huge. Then the AccessLogValve has this huge buffer that is not necessary. I'm just thinking about JSP caches, etc. that are often referenced taking up large amounts of heap space because they never shrink. -chris signature.asc Description: OpenPGP digital signature
[Bug 53952] Add support for TLS 1.1 and 1.2
https://issues.apache.org/bugzilla/show_bug.cgi?id=53952 --- Comment #4 from sebe...@post.cz --- This is not the case, because the parts of code which depend on the newer library version are #ifdef'ed. Actually, the patches improve compatibility with newer openssl versions, as the library may be compiled without SSL2 support (for example, current Debian testing contains such a version). -- 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: r1381633 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 02/10/2012 17:30, Christopher Schultz wrote: > Mark, > > On 10/2/12 12:16 PM, Christopher Schultz wrote: >> Mark, >> >> On 10/2/12 5:16 AM, Mark Thomas wrote: >>> On 15/09/2012 23:02, Mark Thomas wrote: On 06/09/2012 16:02, schu...@apache.org wrote: > Author: schultz Date: Thu Sep 6 15:02:42 2012 New > Revision: 1381633 > > URL: http://svn.apache.org/viewvc?rev=1381633&view=rev > Log: Added multi-op modes to JMXProxyServlet. > > Modified: > tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java > > tomcat/trunk/webapps/docs/manager-howto.xml The changes to manager-howto.xml mean that the page is now half a mile wide and impossible to read comfortably. Please fix this ASAP. >>> >>> Ping. >>> >>> It has been more than three weeks with no fix. >> >> Sorry, I didn't see the original reply. I'll take a look. > > I have reverted the patches to both TC 7 and trunk. I apologize > for causing a false-start for the TC7 release. Don't worry. Not a big issue. The broken Javadocs were bugging me as well as this issue. Version numbers are cheap, the release process is as easy as "ant release" and the unit and TCK testing is fully automated. In short, rolling a release is trivial. Thanks for the revert. Mark > > -chris > -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQa16QAAoJEBDAHFovYFnn7RgP/3E0NIiZHombngUKRcH2eQen Ou7wzEGxhbVjXn7nPpR90eT/UikvYXeFAmnyI7uRDUU1Ph773YFUL/5MWPymSfP7 KZWBijWR69E6XkemLaZ37dy0LO2xIpMJN2WRH+j4EXCTe1g5/diuWH8D8t4xJ4RX jn2YkcGCiVP5VNaJMxY6xowRcr1e1granV1MkBzZDg8IkP9kpDpHaDMAfyR/0IkV G5bUySrKAxEic9HaVhFWNE2ilF6HojktlPYIJu/3JO4sqnyrw0kp+sBvtsgMLljC W//w65U4YQbKiD1LX7AWPkvFIIXOjoxFthErLCRZ5bNEH8+ZYLP5kC/akaSxDIvR Z5A4wwV2CrzjonjQGFZ6wwSlsJNK/W5WLzH6daZjFKvzc0i9MP+V27ViMRfridci Rj2DRuiUR/leAVbhZXqZtrLeIC6/lyngIekOPwlV6DXPXhChgFjTQYk8S9TtdCXA BzYjeWgr4/KdjPjTKCDJAMgdEuvKrcmdKzOGm09gp7Q6Ikx/QhyBboEzhXEP7KQm Ca4A/OciLSj3z1sOiROM6laJpWalWjKYV7Cq3b6mjCbGL7mI6h1xFW5j+Akaa8A4 0it9pWJXHKRyoxHkCnYif/KscZANa/ds08BrRXhu9SHVb6npu4WDEkZN+3chJ8UC 3xGNUdLHuLB3IaIHTISz =/rVq -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1381635 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 02/10/2012 17:41, Christopher Schultz wrote: > Yes, the code will become convoluted if we support more varieties > of operations but I figured that get/set or set/get (or invoke > replacing get or set in any of those) were by far to be the most > likely paired-operations to be performed. Agreed. > The JMXProxyServlet is designed to issue a single command (get, > set, invoke) and return the results. I wanted to give a user the > ability to do things like get stats and then reset them (nearly) > simultaneously so you can get the best metrics possible. The best metrics possible would require the two operations to be atomic. That raises a number of questions: - - What is the difference in results for the current approach, your proposed approach and an atomic approach - - Do any of these differences matter? My instinct is that the answers are "Not much" and "No". Of course, my instincts could be wrong (it wouldn't be the first time). Can you expand on what prompted you to add these? > Being able to execute multiple gets, etc. will give you a whole > bunch of output that a client will have to parse. I think this use > case is better-served by a real JMX client and not the > JMXProxyServlet. Agreed. > I want to be able to to get/set and get/invoke. Can you expand on why? > If you really think that infinite flexibility is the right way to > implement this, Right now, I don't know. I am afraid that the API could grow like topsy to accommodate different requirements. If there is a risk it will grow, I'd prefer to have the generic solution from the start. I think some discussion around the requirements that prompted this should give us an idea of how likely additional expansion is. If there is low likelihood of further expansion then your proposal looks good. If there is a high likelihood of further expansion then I think we need something (I have no strong views on what) more generic. > I'll do it, but I don't like Konstantin's suggestion at all. I > think if we want to support infinite flexibility, HTTP GET is the > wrong approach, and an HTTP POST with an XML body is more > appropriate to support argument association, etc. That doesn't > fit-in with the existing interface to the JMXProxyServlet. Fair point - although XML is usually very verbose. > Perhaps a separate servlet with an explicitly-different interface > is more appropriate. Probably (if the discussion indicates a generic interface is required). Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQa2NnAAoJEBDAHFovYFnnI4EP+gMesG0RUfFvpU1sqNcWGtLn eVAeep5jp/mvbrETuO8jhGBtVVYWtc/NP46FjAhJtnEjOS6qWdsX+0zVWLlTZ9z+ WrkzA92cfzfOWfffD7rXN5fFwXJADHbC2BRXWA6w5GLe431p49iA0u7f+YLGLJq4 SDXijUUT0ikml/gkxQgis+UHqPoy0rmzNyKidZR3LZkYWJfxY2qg8LnofomXh53H 8u7hwfwUjzQLELRCPdlEjOdJ6FHrmIlM4akr3sHtJ95Sw7f7gS+hinRqctnhVuon mql6L12Aqdxk2wvtfG8krLz7geeEefzGB0D3NFzDtvhK4W9lRoZdGHOX6zFnlMGz khShLcDT7tuiiiJdPHJgP1MvauTThY8Xhv+EdccEegtJWbUR0MDBmoF984kDtkyA 8e+PRcWbv47t6YyL3NEV0X99CxEl6XI8Jdd9lgzp1kd1xJCUnOUAg+1duXukN2VW 2Gn+xnO5ZD0ji8Ipfzv1Zv1xDYiRzT2hZ4thsoVJwzhHcFGKi9HiEFr/QpB1KOXN wOnhGyzkga4YuMX4v2EYNM0tHYliu82MdgNxX38FJYEcmZwwj6kqsTTWERCEzTo+ JvSHcUgAS8BGpshcveINKVWFU4QK/EqZmizbRPfBhDxVe8DDIxePjp2cZ+yyxh6r CyOyYjRMJvdwUv2hc9lY =GBqC -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: trunk: An buffer exception in AccessLogValve.log(..)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 02/10/2012 21:37, Christopher Schultz wrote: > Konstantin, > > On 10/2/12 3:58 PM, Konstantin Kolinko wrote: >> 2012/10/2 Christopher Schultz : >>> Konstantin, >>> >>> On 10/2/12 2:32 PM, Konstantin Kolinko wrote: Running current trunk + Nio connector + JDK 7u7, I see a lot of the following exceptions. It looks like there is some bug in AccessLogValve optimization when StringBuilder was replaced with a CharBuffer. A CharBuffer cannot grow itself? My bad. I'll fix that. >>> The API does not seem to say anything about re-sizing >>> CharBuffers. >>> >> >> The CharArrayWriter class can be a replacement here. >> >> It grows itself. It is reusable with CharArrayWriter.reset(). It >> can write its buffer without creating a copy with >> CharArrayWriter.writeTo(Writer). > > Sounds ideal. +1. > One thing I might consider is whether it can *shrink* at some > point. I can imagine some relatively rare use case where someone > uses ${xxx}r or %{xxx}s and the resulting string ends up being > huge. Then the AccessLogValve has this huge buffer that is not > necessary. > > I'm just thinking about JSP caches, etc. that are often referenced > taking up large amounts of heap space because they never shrink. There is a limit (set at 256 characters) and if the buffer is above this size it gets thrown away rather than recycled. Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQa2kKAAoJEBDAHFovYFnnM74P/08DdXdAWynBV+3cCViOnDGw nLNXAH7/E2FZTbyWb0HjbEjKwEY2JxdL71mHTEudNLRYvR3M5ZYXGId7J4jX4CXS uNZFLnEUJH9Dx4sdLwsD6gIbJtDReD0zLkl1yJS2Bfq+ssdKXtZ8dqPgwYx34BYK OExsh9lBH9TRY0CUf+Sfm8v+s2wOBu4Y00IHw7+yFRmHPLJVS/YzcLP2YwLGBZxI N2uq35HHWXmbGd+UbAVD6w4UVFJdXxNk3BBS2NFOwT55SaqPJG6II/Bl+3MKHN2s 0AtOjCjioWxJT8cqxmSkserbX+Z0QDO4FJe3QEoBndRh+z9XOJ6Y6kBJp/EcsRYA gG1wWOqM1hShVVpn12YGimGa13Ki+B/uoDxO8RlA6pDbh3puhZ0pq4/oWkrAR1hJ bzyUSs3w2wD/Um7acKQfntj8tZRKt37oeFclAqMZmJmPVaDhqBQMJxUvo8UQvGYF gZVJFNDSJInjfI8Lss4MFl6ErNwfwN6zYhLtzQVjiEzF5idJCTk9pt0Z7raFt0Em +SM+bW3bLfW1qSpAmlIuismMDadwNY4k/vobRa607b9fi7sABAlk9wlMuRWQfFd4 InPTEFYGvX33aNZ9HmvJJmw9XTJHNowUcYv+XuLZ/TuDuJMveOv6+VVZORQoKada 6gR8WCGWxPI9JmBLsUo/ =ggGG -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org