Re: [VOTE] Release Apache Tomcat 7.0.5
[X] Beta - go ahead and release as 7.0.5 Beta It worked fine for my tests, on Linux. I tested: - tar.gz binary bundle - deployments via the manager, though I haven't specifically tested the parallel deployments feature yet - ran several different webapps, both simple and complex - HTTP and HTTPS JIO connectors - JMX connector and context statistics All of the above worked great, as one would expect them to work for Tomcat 6.0.x. Looks like it wouldn't take much for this to be voted stable. Thanks! -- Jason Brittain On Wed, Nov 24, 2010 at 10:52 AM, Mark Thomas ma...@apache.org wrote: The proposed Apache Tomcat 7.0.5 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.5/http://people.apache.org/%7Emarkt/dev/tomcat-7/v7.0.5/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ As with previous votes, I have included a stable option below although my personal inclination is still to vote beta. The proposed 7.0.5 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 7.0.5 Alpha [ ] Beta - go ahead and release as 7.0.5 Beta [ ] Stable - go ahead and release as 7.0.5 Stable This vote will run until 18.00 UTC Monday 29th November (3 working days). Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Jason Brittain
Re: [VOTE] Release Apache Tomcat 7.0.5
On 11/24/2010 07:52 PM, Mark Thomas wrote: The proposed Apache Tomcat 7.0.5 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.5/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ As with previous votes, I have included a stable option below although my personal inclination is still to vote beta. Something looks broken (that is not new I think). ant test gives: +++ testexist: [echo] Testing for /home/hudson/java/junit3.8.1/junit.jar downloadzip: [get] Getting: http://downloads.sourceforge.net/junit/junit3.8.2.zip [get] To: /home/hudson/java/file.zip [unzip] Expanding: /home/hudson/java/file.zip into /home/hudson/java [delete] Deleting: /home/hudson/java/file.zip test-compile: [mkdir] Created dir: /home/hudson/TMP/apache-tomcat-7.0.5-src/output/testclasses [javac] Compiling 122 source files to /home/hudson/TMP/apache-tomcat-7.0.5-src/output/testclasses [javac] /home/hudson/TMP/apache-tomcat-7.0.5-src/test/org/apache/catalina/startup/TomcatBaseTest.java:34: package junit.framework does not exist +++ Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.5
On 30/11/2010 08:17, jean-frederic clere wrote: Something looks broken (that is not new I think). Yes, but it is your test environment ;) ant test gives: +++ testexist: [echo] Testing for /home/hudson/java/junit3.8.1/junit.jar Note the 3.8.1 reference above. downloadzip: [get] Getting: http://downloads.sourceforge.net/junit/junit3.8.2.zip Tomcat is using 3.8.2. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040450 - in /tomcat/trunk/java/org/apache/catalina: manager/HTMLManagerServlet.java startup/HostConfig.java
Author: markt Date: Tue Nov 30 09:35:01 2010 New Revision: 1040450 URL: http://svn.apache.org/viewvc?rev=1040450view=rev Log: Fix Javadoc warnings Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1040450r1=1040449r2=1040450view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Tue Nov 30 09:35:01 2010 @@ -679,7 +679,7 @@ public final class HTMLManagerServlet ex /** * Undeploy the web application at the specified context path. * - * @see ManagerServlet#undeploy(PrintWriter, String, StringManager) + * @see ManagerServlet#undeploy(PrintWriter, ContextName, StringManager) * * @param cn Name of the application to be undeployed * @param smClient StringManager for the client's locale @@ -698,7 +698,8 @@ public final class HTMLManagerServlet ex /** * Display session information and invoke list. * - * @see ManagerServlet#sessions(PrintWriter, String, int, StringManager) + * @see ManagerServlet#sessions(PrintWriter, ContextName, int, + * StringManager) * * @param cn Name of the application to list session information * @param idle Expire all sessions with idle time ge; idle for this context @@ -718,7 +719,7 @@ public final class HTMLManagerServlet ex /** * Start the web application at the specified context path. * - * @see ManagerServlet#start(PrintWriter, String, StringManager) + * @see ManagerServlet#start(PrintWriter, ContextName, StringManager) * * @param cn Name of the application to be started * @param smClient StringManager for the client's locale @@ -737,7 +738,7 @@ public final class HTMLManagerServlet ex /** * Stop the web application at the specified context path. * - * @see ManagerServlet#stop(PrintWriter, String, StringManager) + * @see ManagerServlet#stop(PrintWriter, ContextName, StringManager) * * @param cn Name of the application to be stopped * @param smClient StringManager for the client's locale Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1040450r1=1040449r2=1040450view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Nov 30 09:35:01 2010 @@ -524,7 +524,7 @@ public class HostConfig /** - * @param contextPath + * @param cn * @param contextXml * @param file */ @@ -723,7 +723,7 @@ public class HostConfig } /** - * @param contextPath + * @param cn * @param war * @param file */ @@ -937,7 +937,7 @@ public class HostConfig /** - * @param contextPath + * @param cn * @param dir * @param file */ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [VOTE] Release Apache Tomcat 7.0.5
On 24/11/2010 18:52, Mark Thomas wrote: The proposed Apache Tomcat 7.0.5 release is now available for voting. The binding votes cast were: markt - beta rjung - beta timw - beta The additional votes cast were: Jason Brittain - beta The vote therefore passes and 7.0.5 will shortly be released as beta. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50351] javax.naming.NamingException: No set method found for property: singleton
https://issues.apache.org/bugzilla/show_bug.cgi?id=50351 --- Comment #7 from Mark Thomas ma...@apache.org 2010-11-30 04:49:00 EST --- Created an attachment (id=26355) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26355) Binary patch for Tomcat 7 To apply this patch, create the following directories in Tomcat's lib directory: org/apache/naming/factory Place the BeanFactory.class file in this new directory. Restart Tomcat. Let us know how you get on. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040452 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Tue Nov 30 10:00:37 2010 New Revision: 1040452 URL: http://svn.apache.org/viewvc?rev=1040452view=rev Log: Need required attribute or docs don't display correctly Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1040452r1=1040451r2=1040452view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Tue Nov 30 10:00:37 2010 @@ -335,7 +335,7 @@ execute tasks using the executor rather than an internal thread pool./p /attribute -attribute name=maxTrailerSize +attribute name=maxTrailerSize required=false pLimits the total length of trailing headers in the last chunk of a chunked HTTP request. If the value is code-1/code, no limit will be imposed. If not specified, the default value of code8192/code will be - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040453 - in /tomcat/trunk/java/org/apache/catalina/session: ManagerBase.java mbeans-descriptors.xml
Author: markt
Date: Tue Nov 30 10:02:33 2010
New Revision: 1040453
URL: http://svn.apache.org/viewvc?rev=1040453view=rev
Log:
randomClass - secureRandomClass
Align (and tidy up) mbean descriptor
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1040453r1=1040452r2=1040453view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Nov 30
10:02:33 2010
@@ -140,7 +140,7 @@ public abstract class ManagerBase extend
* used when generating session identifiers. The random number generator(s)
* will always be seeded from a SecureRandom instance.
*/
-protected String randomClass = java.security.SecureRandom;
+protected String secureRandomClass = java.security.SecureRandom;
/**
@@ -515,12 +515,12 @@ public abstract class ManagerBase extend
long t1 = System.currentTimeMillis();
try {
// Construct and seed a new random number generator
-Class? clazz = Class.forName(randomClass);
+Class? clazz = Class.forName(secureRandomClass);
result = (SecureRandom) clazz.newInstance();
} catch (Exception e) {
// Fall back to the default case
log.error(sm.getString(managerBase.random,
-randomClass), e);
+secureRandomClass), e);
result = new java.security.SecureRandom();
}
byte[] seedBytes = randomSeed.generateSeed(64);
@@ -573,9 +573,9 @@ public abstract class ManagerBase extend
/**
* Return the random number generator class name.
*/
-public String getRandomClass() {
+public String getSecureRandomClass() {
-return (this.randomClass);
+return (this.secureRandomClass);
}
@@ -585,12 +585,12 @@ public abstract class ManagerBase extend
*
* @param randomClass The new random number generator class name
*/
-public void setRandomClass(String randomClass) {
+public void setSecureRandomClass(String randomClass) {
-String oldRandomClass = this.randomClass;
-this.randomClass = randomClass;
+String oldRandomClass = this.secureRandomClass;
+this.secureRandomClass = randomClass;
support.firePropertyChange(randomClass, oldRandomClass,
- this.randomClass);
+ this.secureRandomClass);
}
Modified: tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=1040453r1=1040452r2=1040453view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Tue
Nov 30 10:02:33 2010
@@ -75,14 +75,18 @@
description=Path name of the disk file in which active sessions
type=java.lang.String/
-attribute name=processExpiresFrequency
- description=The frequency of the manager checks (expiration
and passivation)
- type=int/
+attribute name=processExpiresFrequency
+ description=The frequency of the manager checks (expiration and
passivation)
+ type=int/
attribute name=processingTime
description=Time spent doing housekeeping and expiration
type=long /
+attribute name=secureRandomClass
+ description=The random number generator class name
+ type=java.lang.String/
+
attribute name=sessionAverageAliveTime
description=Average time an expired session had been alive
type=int
@@ -113,7 +117,8 @@
attribute name=stateName
description=The name of the LifecycleState that this component is
currently in
- type=java.lang.String/
+ type=java.lang.String
+writeable=false/
attribute name=randomFile
description=File source of random - /dev/urandom or a pipe that
will be used when the Manager is next started
@@ -124,10 +129,6 @@
type=java.lang.String
writeable=false/
-attribute name=randomClass
- description=The random number generator class name
- type=java.lang.String/
-
attribute name=rejectedSessions
description=Number of sessions we
svn commit: r1040455 - /tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Author: markt
Date: Tue Nov 30 10:18:41 2010
New Revision: 1040455
URL: http://svn.apache.org/viewvc?rev=1040455view=rev
Log:
SecureRandom implementations are self-seeding so simplify code.
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1040455r1=1040454r2=1040455view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Nov 30
10:18:41 2010
@@ -22,8 +22,6 @@ package org.apache.catalina.session;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -131,17 +129,12 @@ public abstract class ManagerBase extend
new ConcurrentLinkedQueueSecureRandom();
/**
- * Random number generator used to see @{link {...@link #randoms}.
- */
-protected SecureRandom randomSeed = null;
-
-/**
* The Java class name of the secure random number generator class to be
- * used when generating session identifiers. The random number generator(s)
- * will always be seeded from a SecureRandom instance.
+ * used when generating session identifiers. The random number generator
+ * class must be self-seeding and have a zero-argument constructor. If not
+ * specified, an instance of {...@link SecureRandom} will be generated.
*/
-protected String secureRandomClass = java.security.SecureRandom;
-
+protected String secureRandomClass = null;
/**
* The longest time (in seconds) that an expired session had been alive.
@@ -505,37 +498,28 @@ public abstract class ManagerBase extend
* Create a new random number generator instance we should use for
* generating session identifiers.
*/
-protected SecureRandom createRandom() {
-if (randomSeed == null) {
-createRandomSeed();
-}
-
+protected SecureRandom createSecureRandom() {
+
SecureRandom result = null;
long t1 = System.currentTimeMillis();
-try {
-// Construct and seed a new random number generator
-Class? clazz = Class.forName(secureRandomClass);
-result = (SecureRandom) clazz.newInstance();
-} catch (Exception e) {
-// Fall back to the default case
-log.error(sm.getString(managerBase.random,
-secureRandomClass), e);
-result = new java.security.SecureRandom();
-}
-byte[] seedBytes = randomSeed.generateSeed(64);
-ByteArrayInputStream bais = new ByteArrayInputStream(seedBytes);
-DataInputStream dis = new DataInputStream(bais);
-for (int i = 0; i 8; i++) {
+if (secureRandomClass != null) {
try {
-result.setSeed(dis.readLong());
-} catch (IOException e) {
-// Should never happen
-log.error(sm.getString(managerBase.seedFailed,
-result.getClass().getName()), e);
+// Construct and seed a new random number generator
+Class? clazz = Class.forName(secureRandomClass);
+result = (SecureRandom) clazz.newInstance();
+} catch (Exception e) {
+// Fall back to the default case
+log.error(sm.getString(managerBase.random,
+secureRandomClass), e);
}
}
+if (result == null) {
+// No secureRandomClass or creation failed
+result = new SecureRandom();
+}
+
if(log.isDebugEnabled()) {
long t2=System.currentTimeMillis();
if( (t2-t1) 100 )
@@ -547,30 +531,6 @@ public abstract class ManagerBase extend
/**
- * Create the random number generator that will be used to seed the random
- * number generators that will create session IDs.
- */
-protected synchronized void createRandomSeed() {
-if (randomSeed != null) {
-return;
-}
-
-long t1 = System.currentTimeMillis();
-
-// Construct and seed a new random number generator
-SecureRandom result = new SecureRandom();
-
-if(log.isDebugEnabled()) {
-long t2=System.currentTimeMillis();
-if( (t2-t1) 100 )
-log.debug(sm.getString(managerBase.createRandomSeed,
-Long.valueOf(t2-t1)));
-}
-randomSeed = result;
-}
-
-
-/**
* Return the random number generator
svn commit: r1040456 - /tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
Author: markt Date: Tue Nov 30 10:19:38 2010 New Revision: 1040456 URL: http://svn.apache.org/viewvc?rev=1040456view=rev Log: Updated Windows results (removal of digest) Modified: tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java Modified: tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1040456r1=1040455r2=1040456view=diff == --- tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java (original) +++ tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java Tue Nov 30 10:19:38 2010 @@ -37,10 +37,10 @@ public class Benchmarks extends TestCase /* * Results on markt's 4-core Windows dev box - * 1 thread - ~2,000ms - * 2 threads - ~3,300ms - * 4 threads - ~4,900ms - * 16 threads - ~21,300ms + * 1 thread - ~1,400ms + * 2 threads - ~2,200ms + * 4 threads - ~3,200ms + * 16 threads - ~14,800ms * * Results on markt's 2-core OSX dev box * 1 thread - ~4,700ms @@ -140,10 +140,10 @@ public class Benchmarks extends TestCase /* * Results on markt's 4-core Windows dev box - * 1 thread - ~4,300ms - * 2 threads - ~7,600ms - * 4 threads - ~11,600ms - * 16 threads - ~49,000ms + * 1 thread - ~4,000ms + * 2 threads - ~6,500ms + * 4 threads - ~10,400ms + * 16 threads - ~43,600ms * * Results on markt's 2-core OSX dev box * 1 thread - ~9,100ms @@ -238,6 +238,12 @@ public class Benchmarks extends TestCase * SecureRandom vs. reading /dev/urandom. Very different performance noted * on some platforms. * + * Results on markt's 4-core Windows dev box + * SecureRandom /dev/urandom + * 1 thread -~766msN/A + * 2 threads -~843msN/A + * 4 threads -~766msN/A + * * Results on markt's 2-core OSX dev box * SecureRandom /dev/urandom * 1 thread - ~4,100ms ~3,500ms - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50380] New: Make binary and source distributions available in Maven Central repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=50380 Summary: Make binary and source distributions available in Maven Central repository Product: Tomcat 6 Version: 6.0.29 Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Native:Packaging AssignedTo: dev@tomcat.apache.org ReportedBy: 1983-01...@gmx.net I use Ant to customize a vanilla Tomcat distribution to our needs. During this process Ant downloads files from our local Nexus (only Nexus has outbound connection). At ths moment I have to download Tomcat manually, place on the target server and run the Ant script. It'd be much better if all of these files http://tomcat.apache.org/download-60.cgi would be available with appropriate classifiers in Maven Central. I could Ant download Tomcat and customize it. It would the useless manual step. The Maven goes do provide both distros in Central. Their classifier/release scheme could be taken as an example. More over, this could be automated in the build.xml file to upload artifacts to Apache's Nexus repo which is automatically synched to Maven Central. Look here for the example: https://repository.apache.org/index.html#nexus-search;gav~org.apache.maven~apache-maven~3.0.1~~ Everything is provided, bin and src as zip and tar.gz. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50339] mod_jk parsing error if workers.properties contains whitespaces
https://issues.apache.org/bugzilla/show_bug.cgi?id=50339 --- Comment #3 from Frank muel...@wave-computer.de 2010-11-30 06:23:03 EST --- (In reply to comment #2) Hi, thanks for your answer, but I'm afraid the patch does not completely solve the problem. The parser doesn't read any wrong values like socket_tioeout anymore, but it fails to read some values at all: workers.properties looks like this: ### Templates ### ## Template 1 worker.tpl1.method=Busyness worker.tpl1.sticky_session=True worker.tpl1.recover_time=20 ## Template 2 worker.tpl2.type=ajp13 worker.tpl2.lbfactor=100 worker.tpl2.fail_on_status=500,503 worker.tpl2.socket_timeout=0 worker.tpl2.connect_timeout=5 worker.tpl2.connection_pool_size=4 ### /Templates ### ... worker.list=lb_www.domain.tld worker.lb_www.domain.tld.maintain=20 worker.lb_www.domain.tld.type=lb worker.lb_www.domain.tld.balance_workers=worker1 worker.lb_www.domain.tld.reference=worker.tpl1 ## Set properties for worker1 (ajp13) worker.worker1.reference=worker.tpl2 worker.worker1.host=10.0.0.1 worker.worker1.port=9001 worker.worker1.route=123 The template entries are indented by 2 spaces, the worker entries are not! That's a formatting error I made, and haven't discovered until yet (the file's got 939 lines ...). All other worker entries are indented just like the templates. But when the file looks like this, I get the error: [Tue Nov 30 12:13:50 2010] [28294:140392364185344] [debug] jk_map_resolve_references::jk_map.c (816): Copying values from worker.tpl1. to worker.lb_www.domain.tld. [Tue Nov 30 12:13:50 2010] [28294:140392364185344] [error] jk_map_inherit_properties::jk_map.c (882): Reference 'worker.tpl1.' not found So, it can't read the line that references the template. When I indent the worker entries by 2 spaces too, everything is fine. Also when I remove the spaces in front of the template lines, it works. But if there is a mixed use of spaces and no spaces, the parser fails. It's no problem to fix my config file at all, but it's really hard to find an error like that. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040511 - in /tomcat/trunk: java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ test/org/apache/catalina/session/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Tue Nov 30 13:15:51 2010
New Revision: 1040511
URL: http://svn.apache.org/viewvc?rev=1040511view=rev
Log:
Remove direct support for reading random bytes from a file
Add support for specifying SecureRandom algorithm and provider
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1040511r1=1040510r2=1040511view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Tue Nov
30 13:15:51 2010
@@ -202,7 +202,6 @@ public class BackupManager extends Clust
}
cluster.removeManager(this);
-this.randoms.clear();
super.stopInternal();
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1040511r1=1040510r2=1040511view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Nov
30 13:15:51 2010
@@ -961,7 +961,6 @@ public CatalinaCluster getCluster() {
// Require a new random number generator if we are restarted
getCluster().removeManager(this);
-this.randoms.clear();
super.stopInternal();
replicationValve = null;
}
Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1040511r1=1040510r2=1040511view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Tue
Nov 30 13:15:51 2010
@@ -28,12 +28,10 @@ JDBCStore.checkConnectionDBReOpenFail=Th
JDBCStore.checkConnectionSQLException=A SQL exception occurred {0}
JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found {0}
managerBase.createRandom=Created random number generator for session ID
generation in {0}ms.
-managerBase.createRandomSeed=Created SecureRandom instance to seed random
number generators for session ID generation in {0}ms.
managerBase.createSession.ise=createSession: Too many active sessions
-managerBase.getting=Getting message digest component for algorithm {0}
-managerBase.gotten=Completed getting message digest component
-managerBase.random=Exception initializing random number generator of class
{0}. Falling back to java.util.Random.
-managerBase.seedFailed=Failed to seed random number generator class {0}
+managerBase.random=Exception initializing random number generator of class
[{0}]. Falling back to java.secure.SecureRandom
+managerBase.randomAlgorithm=Exception initializing random number generator
using algorithm [{0}]
+managerBase.randomProviderException initializing random number generator using
provider [{0}]
managerBase.sessionTimeout=Invalid session timeout setting {0}
serverSession.value.iae=null value
standardManager.expireException=processsExpire: Exception during session
expiration
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=1040511r1=1040510r2=1040511view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
Tue Nov 30 13:15:51 2010
@@ -27,8 +27,6 @@ JDBCStore.checkConnectionDBReOpenFail =
svn commit: r1040516 - /tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
Author: markt
Date: Tue Nov 30 13:41:09 2010
New Revision: 1040516
URL: http://svn.apache.org/viewvc?rev=1040516view=rev
Log:
Align tests with new ManagerBase code
Update OSX figures - now comparable
Modified:
tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
Modified: tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1040516r1=1040515r2=1040516view=diff
==
--- tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java Tue Nov 30
13:41:09 2010
@@ -43,10 +43,10 @@ public class Benchmarks extends TestCase
* 16 threads - ~14,700ms
*
* Results on markt's 2-core OSX dev box
- * 1 thread - ~4,700ms
- * 2 threads - ~ 6,000ms
- * 4 threads - ~11,900ms
- * 16 threads - ~48,659ms
+ * 1 thread - ~1,400ms
+ * 2 threads - ~1,700ms
+ * 4 threads - ~3,500ms
+ * 16 threads - ~14,465ms
*/
public void testManagerBaseGenerateSessionId() throws Exception {
doTestManagerBaseGenerateSessionId(1, 100);
@@ -141,10 +141,10 @@ public class Benchmarks extends TestCase
* 16 threads - ~43,500ms
*
* Results on markt's 2-core OSX dev box
- * 1 thread - ~9,100ms
- * 2 threads - ~10,800ms
- * 4 threads - ~21,400ms
- * 16 threads - ~87,600ms
+ * 1 thread - ~4,100ms
+ * 2 threads - ~5,700ms
+ * 4 threads - ~11,700ms
+ * 16 threads - ~45,600ms
*/
public void testManagerBaseCreateSession() {
doTestManagerBaseCreateSession(1, 100);
@@ -236,9 +236,9 @@ public class Benchmarks extends TestCase
*
* Results on markt's 2-core OSX dev box
* SecureRandom /dev/urandom
- * 1 thread - ~4,100ms ~3,500ms
- * 2 threads - ~10,700ms ~5,100ms
- * 4 threads - ~20,700ms ~10,700ms
+ * 1 thread - ~759ms ~3,500ms
+ * 2 threads - ~725ms ~5,200ms
+ * 4 threads - ~1,265ms ~10,500ms
*/
public void testSecureRandomVsDevURandom() throws Exception {
doTestSecureRandomVsDevURandom(1, 100);
@@ -246,13 +246,14 @@ public class Benchmarks extends TestCase
doTestSecureRandomVsDevURandom(4, 100);
}
-private void doTestSecureRandomVsDevURandom(int threadCount, int
iterCount) {
+private void doTestSecureRandomVsDevURandom(int threadCount, int iterCount)
+throws Exception {
doTestSecureRandomVsDevURandomInner(threadCount, iterCount, true);
doTestSecureRandomVsDevURandomInner(threadCount, iterCount, false);
}
private void doTestSecureRandomVsDevURandomInner(int threadCount,
-int iterCount, boolean useSecureRandom) {
+int iterCount, boolean useSecureRandom) throws Exception {
Thread[] threads = new Thread[threadCount];
@@ -294,12 +295,13 @@ public class Benchmarks extends TestCase
private static final class TestThreadSecureRandom implements Runnable {
-private SecureRandom secureRandom = new SecureRandom();
+private SecureRandom secureRandom;
private byte[] bytes = new byte[16];
private int count;
-TestThreadSecureRandom(int iterCount) {
+TestThreadSecureRandom(int iterCount) throws Exception {
this.count = iterCount;
+this.secureRandom = SecureRandom.getInstance(SHA1PRNG);
}
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50383] New: Bad spelling in catalina.sh
https://issues.apache.org/bugzilla/show_bug.cgi?id=50383 Summary: Bad spelling in catalina.sh Product: Tomcat 6 Version: 6.0.29 Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: 1983-01...@gmx.net The catalina.sh says: # Environment Variable Prequisites There is English word such ach prequisite. Check Oxford Dic: http://oxforddictionaries.com/noresults?dictionaryVersion=region-ukisWritersAndEditors=truenoresults=truepage=1pageSize=20q=PrequisitessearchUri=Allsort=alphatype=dictionarysearch But there is a word: Prerequisite http://oxforddictionaries.com/view/entry/m_en_gb0658610#m_en_gb0658610 This should be corrected. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of FAQ/Developing by KonstantinK olinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The FAQ/Developing page has been changed by KonstantinKolinko.
The comment on this change is: Review the instructions. Rephrase some of them..
http://wiki.apache.org/tomcat/FAQ/Developing?action=diffrev1=10rev2=11
--
The short answer is to add the following options when the JVM is started:
{{{-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n}}}
+
There are a number of ways you can do this depending on how you normally
start Tomcat:
+ * If you are using shell scripts to start Tomcat, start it with the
following command: {{{catalina jpda start}}}BRThe above mentioned options
can be provided by setting certain environment variables, e.g.
{{{JPDA_ADDRESS=8000}}} and {{{JPDA_TRANSPORT=dt_socket}}}. See comments at the
top of {{{catalina.sh}}} or {{{.bat}}} file for details.
* If you run Tomcat using service wrapper, add the above JVM options
before any other JVM options. Check the documentation for the service to
determine how to set JVM options.
- * Set environment variables {{{JPDA_ADDRESS=8000}}} and
{{{JPDA_TRANSPORT=dt_socket}}} and then start tomcat using {{{catalina jpda
start}}}.
* If you start Tomcat from within an IDE, check the documentation for the
IDE to determine how to set the required JVM options.
The port does not need to be set to 8000, it may be any value appropriate for
your system.
@@ -25, +26 @@
Anchor(Q2)'''How do I remotely debug Tomcat using Eclipse?'''
- This answer assumes that you have a project set up with all of the fixings
and have some idea of what you're doing in this respect. If not then thats
really outside the scope of this topic and more in the scope of you needing to
go to [[http://eclipse.org|eclipse.org]] and read up on how to use your ide,
and maybe practice a little bit before you come back to this. We are also going
to assume you have some idea of what a debugger is and how to use one.
+ This answer assumes that you have a project set up and have some idea of what
you are doing in this respect. If not then that is really outside the scope of
this topic and you need to go to [[http://eclipse.org|eclipse.org]] and read up
on how to use your IDE, and maybe practice a little bit before you come back to
this. We are also going to assume that you have some idea of what a debugger is
and how to use one.
- Make sure Tomcat is started and that your app is deployed and the sources,
etc are all defined as resources in your app. If you have a servlet or
something, set a breakpoint where its sure to hit on the next request. Go to
Run-Debug Configurations Click on Remote Java Applications, then click
New. Type in the title and all. Notice that port 8000 from the Tomcat
instructions. Save and run. Eclipse will connect to the VM that Tomcat is
running under. Wow, that was easy! Now go type the url to submit to your
servlet or whatever in your browser. Boom you hit the breakpoint right? Have
fun!
+ * Make sure that Tomcat is started in remote debugging mode as described
above and that your app is deployed.
+ * Make sure that you have the sources for the code that you are trying to
debug in your IDE. For the libraries and for Tomcat itself you can attach the
sources to the jar files: open a class file and then click Attach Source...
button.
+ * If you have a servlet or something, set a breakpoint where it is sure
to hit on the next request.
+ * Go to Run-Debug Configurations Click on Remote Java
Applications, then click New. Type in the title. Note that port 8000 from
the Tomcat instructions. Save and run.
+ * Eclipse will connect to the JVM that Tomcat is running under. Wow, that
was easy!
+
+ Now go type the url to submit to your servlet or whatever in your browser.
Boom you hit the breakpoint right? Have fun!
Anchor(Q3)'''How do I remotely debug Tomcat using !NetBeans?'''
@@ -48, +55 @@
Anchor(Q4)'''How do I change the monitoring interval for modified
resources and application reloading?'''
- Monitoring interval for application reloading is controlled by the
`backgroundProcessorDelay` property on `Context` element or on its parent
containers: `Host` and `Engine`. See
[[http://tomcat.apache.org/tomcat-6.0-doc/config/index.html|Tomcat
Configuration Reference]]. By default there is a single backgroung processing
thread that run by Engine. See its
[[http://tomcat.apache.org/tomcat-6.0-doc/config/engine.html|configuration]]
for the default delay value.
+ Monitoring interval for application reloading is controlled by the
`backgroundProcessorDelay` property on `Context` element or on its parent
containers: `Host` and `Engine`. See
[[http://tomcat.apache.org/tomcat-6.0-doc/config/index.html|Tomcat
Configuration Reference]] for details. By default there is a single
Re: svn commit: r1040516 - /tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
On 30/11/2010 13:41, ma...@apache.org wrote: Author: markt Date: Tue Nov 30 13:41:09 2010 New Revision: 1040516 URL: http://svn.apache.org/viewvc?rev=1040516view=rev Log: Align tests with new ManagerBase code Update OSX figures - now comparable With these test results, I'm planning on drawing a line under my ManagerBase changes. I am sure there is room for further improvement but I don't think this is where the bottlenecks are in the request processing chain. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040546 - in /tomcat/trunk/bin: catalina.bat catalina.sh
Author: markt Date: Tue Nov 30 14:47:34 2010 New Revision: 1040546 URL: http://svn.apache.org/viewvc?rev=1040546view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50383 Comment typo Modified: tomcat/trunk/bin/catalina.bat tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1040546r1=1040545r2=1040546view=diff == --- tomcat/trunk/bin/catalina.bat (original) +++ tomcat/trunk/bin/catalina.bat Tue Nov 30 14:47:34 2010 @@ -18,7 +18,7 @@ if %OS% == Windows_NT setlocal rem --- rem Start/Stop Script for the CATALINA Server rem -rem Environment Variable Prequisites +rem Environment Variable Prerequisites rem rem CATALINA_HOME May point at your Catalina build directory. rem Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1040546r1=1040545r2=1040546view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Tue Nov 30 14:47:34 2010 @@ -18,7 +18,7 @@ # - # Start/Stop Script for the CATALINA Server # -# Environment Variable Prequisites +# Environment Variable Prerequisites # # CATALINA_HOME May point at your Catalina build directory. # @@ -71,7 +71,8 @@ # address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND # # CATALINA_PID(Optional) Path of the file which should contains the pid -# of catalina startup java process, when start (fork) is used +# of the catalina startup java process, when start (fork) is +# used # # LOGGING_CONFIG (Optional) Override Tomcat's logging config file # Example (all one line) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040547 - in /tomcat/tc6.0.x/trunk/bin: catalina.bat catalina.sh
Author: markt Date: Tue Nov 30 14:47:49 2010 New Revision: 1040547 URL: http://svn.apache.org/viewvc?rev=1040547view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50383 Comment typo Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat tomcat/tc6.0.x/trunk/bin/catalina.sh Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=1040547r1=1040546r2=1040547view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Tue Nov 30 14:47:49 2010 @@ -18,7 +18,7 @@ if %OS% == Windows_NT setlocal rem --- rem Start/Stop Script for the CATALINA Server rem -rem Environment Variable Prequisites +rem Environment Variable Prerequisites rem rem CATALINA_HOME May point at your Catalina build directory. rem Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=1040547r1=1040546r2=1040547view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.sh Tue Nov 30 14:47:49 2010 @@ -18,7 +18,7 @@ # - # Start/Stop Script for the CATALINA Server # -# Environment Variable Prequisites +# Environment Variable Prerequisites # # CATALINA_HOME May point at your Catalina build directory. # - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040548 - in /tomcat/tc5.5.x/trunk/container/catalina/src/bin: catalina.bat catalina.sh
Author: markt Date: Tue Nov 30 14:48:26 2010 New Revision: 1040548 URL: http://svn.apache.org/viewvc?rev=1040548view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50383 Comment typo Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat?rev=1040548r1=1040547r2=1040548view=diff == --- tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat Tue Nov 30 14:48:26 2010 @@ -18,7 +18,7 @@ if %OS% == Windows_NT setlocal rem --- rem Start/Stop Script for the CATALINA Server rem -rem Environment Variable Prequisites +rem Environment Variable Prerequisites rem rem CATALINA_HOME May point at your Catalina build directory. rem Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh?rev=1040548r1=1040547r2=1040548view=diff == --- tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh Tue Nov 30 14:48:26 2010 @@ -18,7 +18,7 @@ # - # Start/Stop Script for the CATALINA Server # -# Environment Variable Prequisites +# Environment Variable Prerequisites # # CATALINA_HOME May point at your Catalina build directory. # - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50383] Bad spelling in catalina.sh
https://issues.apache.org/bugzilla/show_bug.cgi?id=50383 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2010-11-30 09:50:00 EST --- Fixed for all versions. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040553 - in /tomcat/trunk/bin: tool-wrapper.bat tool-wrapper.sh
Author: rjung Date: Tue Nov 30 14:58:07 2010 New Revision: 1040553 URL: http://svn.apache.org/viewvc?rev=1040553view=rev Log: Fix typo in script comment. BZ 50383, addition to r1040546. Modified: tomcat/trunk/bin/tool-wrapper.bat tomcat/trunk/bin/tool-wrapper.sh Modified: tomcat/trunk/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.bat?rev=1040553r1=1040552r2=1040553view=diff == --- tomcat/trunk/bin/tool-wrapper.bat (original) +++ tomcat/trunk/bin/tool-wrapper.bat Tue Nov 30 14:58:07 2010 @@ -18,7 +18,7 @@ if %OS% == Windows_NT setlocal rem --- rem Wrapper script for command line tools rem -rem Environment Variable Prequisites +rem Environment Variable Prerequisites rem rem CATALINA_HOME May point at your Catalina build directory. rem Modified: tomcat/trunk/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1040553r1=1040552r2=1040553view=diff == --- tomcat/trunk/bin/tool-wrapper.sh (original) +++ tomcat/trunk/bin/tool-wrapper.sh Tue Nov 30 14:58:07 2010 @@ -18,7 +18,7 @@ # - # Wrapper script for command line tools # -# Environment Variable Prequisites +# Environment Variable Prerequisites # # CATALINA_HOME May point at your Catalina build directory. # - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040555 - in /tomcat/tc6.0.x/trunk/bin: tool-wrapper.bat tool-wrapper.sh
Author: rjung Date: Tue Nov 30 15:00:25 2010 New Revision: 1040555 URL: http://svn.apache.org/viewvc?rev=1040555view=rev Log: Fix typo in script comment. BZ 50383, addition to r1040547, backport of r1040553. Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat?rev=1040555r1=1040554r2=1040555view=diff == --- tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat (original) +++ tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat Tue Nov 30 15:00:25 2010 @@ -18,7 +18,7 @@ if %OS% == Windows_NT setlocal rem --- rem Wrapper script for command line tools rem -rem Environment Variable Prequisites +rem Environment Variable Prerequisites rem rem CATALINA_HOME May point at your Catalina build directory. rem Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh?rev=1040555r1=1040554r2=1040555view=diff == --- tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh (original) +++ tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh Tue Nov 30 15:00:25 2010 @@ -18,7 +18,7 @@ # - # Wrapper script for command line tools # -# Environment Variable Prequisites +# Environment Variable Prerequisites # # CATALINA_HOME May point at your Catalina build directory. # - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040559 - in /tomcat/tc5.5.x/trunk/container/catalina/src/bin: tool-wrapper.bat tool-wrapper.sh
Author: rjung Date: Tue Nov 30 15:03:14 2010 New Revision: 1040559 URL: http://svn.apache.org/viewvc?rev=1040559view=rev Log: Fix typo in script comment. BZ 50383, addition to r1040547, backport of r1040553 (trunk) and r1040555 (TC6). Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.bat tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.bat?rev=1040559r1=1040558r2=1040559view=diff == --- tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.bat (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.bat Tue Nov 30 15:03:14 2010 @@ -18,7 +18,7 @@ if %OS% == Windows_NT setlocal rem --- rem Wrapper script for command line tools rem -rem Environment Variable Prequisites +rem Environment Variable Prerequisites rem rem CATALINA_HOME May point at your Catalina build directory. rem Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh?rev=1040559r1=1040558r2=1040559view=diff == --- tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh Tue Nov 30 15:03:14 2010 @@ -18,7 +18,7 @@ # - # Wrapper script for command line tools # -# Environment Variable Prequisites +# Environment Variable Prerequisites # # CATALINA_HOME May point at your Catalina build directory. # - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.5
On 11/30/2010 09:55 AM, Mark Thomas wrote:
On 30/11/2010 08:17, jean-frederic clere wrote:
Something looks broken (that is not new I think).
Yes, but it is your test environment ;)
Yes I had a build.properties with
junit.home=${user.home}/java/junit3.8.1 probably for a older version of TC.
Cheers
Jean-Frederic
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040609 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java java/org/apache/catalina/connector/MapperListener.java java/org/apache/catalina/connector/mbeans-descriptors.
Author: markt
Date: Tue Nov 30 16:11:23 2010
New Revision: 1040609
URL: http://svn.apache.org/viewvc?rev=1040609view=rev
Log:
Switch MapperListener to the new Lifecycle
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1040609r1=1040608r2=1040609view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Nov 30
16:11:23 2010
@@ -879,11 +879,9 @@ public class Connector extends Lifecycle
onameProtocolHandler = register(protocolHandler,
createObjectNameKeyProperties(ProtocolHandler));
-
-mapperListener.setDomain(getDomain());
-onameMapper = register(mapperListener,
-createObjectNameKeyProperties(Mapper));
+// Initialize mapper listener
+mapperListener.init();
}
@@ -910,8 +908,7 @@ public class Connector extends Lifecycle
(coyoteConnector.protocolHandlerStartFailed, e));
}
-// MapperListener doesn't follow Lifecycle conventions
-mapperListener.init();
+mapperListener.start();
}
@@ -933,14 +930,13 @@ public class Connector extends Lifecycle
(coyoteConnector.protocolHandlerStopFailed, e));
}
-// MapperListener doesn't follow Lifecycle conventions
-mapperListener.destroy();
+mapperListener.stop();
}
@Override
protected void destroyInternal() throws LifecycleException {
-unregister(onameMapper);
+mapperListener.destroy();
unregister(onameProtocolHandler);
try {
@@ -977,7 +973,6 @@ public class Connector extends Lifecycle
// JMX registration
private ObjectName onameProtocolHandler;
-private ObjectName onameMapper;
@Override
protected String getDomainInternal() {
Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1040609r1=1040608r2=1040609view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Tue Nov
30 16:11:23 2010
@@ -27,6 +27,7 @@ import org.apache.catalina.LifecycleEven
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.http.mapper.Mapper;
@@ -39,7 +40,8 @@ import org.apache.tomcat.util.res.String
* @author Remy Maucherat
* @author Costin Manolache
*/
-public class MapperListener implements ContainerListener, LifecycleListener {
+public class MapperListener extends LifecycleMBeanBase
+implements ContainerListener, LifecycleListener {
private static final Log log = LogFactory.getLog(MapperListener.class);
@@ -82,18 +84,17 @@ public class MapperListener implements C
// - Public Methods
-public String getDomain() {
-return domain;
+public String getConnectorName() {
+return this.connector.toString();
}
-public void setDomain(String domain) {
-this.domain = domain;
-}
+
+// --- Lifecycle
Methods
-/**
- * Initialize associated mapper.
- */
-public void init() {
+@Override
+public void startInternal() {
+
+setState(LifecycleState.STARTING);
// Find any components that have already been initialized since the
// MBean listener won't be notified as those components will have
@@ -114,14 +115,25 @@ public class MapperListener implements C
}
-/**
- * Clean-up.
- */
-public void destroy() {
-// NO-OP?
+@Override
+public void stopInternal() {
+setState(LifecycleState.STOPPING);
+}
+
+
+@Override
+protected String getDomainInternal() {
+// Should be the same as the connector
+return connector.getDomainInternal();
}
+@Override
+protected String getObjectNameKeyProperties() {
+// Same as connector but Mapper
DO NOT REPLY [Bug 50351] javax.naming.NamingException: No set method found for property: singleton
https://issues.apache.org/bugzilla/show_bug.cgi?id=50351 --- Comment #8 from Flávio Henrique serv...@ig.com.br 2010-11-30 11:35:19 EST --- Mark, the patch works! Thank you! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50385] New: There's a Spanish Inquisition error in the documentation
https://issues.apache.org/bugzilla/show_bug.cgi?id=50385 Summary: There's a Spanish Inquisition error in the documentation Product: Tomcat Connectors Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: trivial Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: bugme...@lortemail.dk In this page: http://tomcat.apache.org/connectors-doc/reference/status.html were it says: The status worker knows about six actions. it should read: Amongst the actions the status worker knows about, are elements such as: Reference: http://www.youtube.com/watch?v=gldlyTjXk9A -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040652 - in /tomcat/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt Date: Tue Nov 30 17:42:01 2010 New Revision: 1040652 URL: http://svn.apache.org/viewvc?rev=1040652view=rev Log: Context name rather than Context path is passed in so construct ContextName object correctly. Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1040652r1=1040651r2=1040652view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Nov 30 17:42:01 2010 @@ -478,7 +478,7 @@ public class HostConfig File appBase = appBase(); File configBase = configBase(); -ContextName cn = new ContextName(name, null); +ContextName cn = new ContextName(name); String baseName = cn.getBaseName(); // Deploy XML descriptors from configBase Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1040652r1=1040651r2=1040652view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 30 17:42:01 2010 @@ -76,6 +76,9 @@ Further Lifecycle refactoring for Connectors and associated components. (markt) /fix + fix +Correct handling of versioned web applications in deployer. (markt) + /fix /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040656 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Author: markt
Date: Tue Nov 30 17:55:38 2010
New Revision: 1040656
URL: http://svn.apache.org/viewvc?rev=1040656view=rev
Log:
Don't set property that doesn't exist on any ProtocolHandler or Endpoint
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1040656r1=1040655r2=1040656view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Nov 30
17:55:38 2010
@@ -22,7 +22,6 @@ import java.util.HashMap;
import javax.management.ObjectName;
-import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Service;
@@ -866,9 +865,6 @@ public class Connector extends Lifecycle
adapter = new CoyoteAdapter(this);
protocolHandler.setAdapter(adapter);
-IntrospectionUtils.setProperty(protocolHandler, jkHome,
-
System.getProperty(Globals.CATALINA_BASE_PROP));
-
try {
protocolHandler.init();
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50387] New: Insert CLOB or BLOB with Oracle connection crashes software
https://issues.apache.org/bugzilla/show_bug.cgi?id=50387 Summary: Insert CLOB or BLOB with Oracle connection crashes software Product: Tomcat 6 Version: 6.0.29 Platform: PC OS/Version: Windows XP Status: NEW Severity: critical Priority: P2 Component: Servlet JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: beau.hutche...@thomsonreuters.com Overview: Stored Procedure using CLOB or BLOB with oracle driver spring framework crashes software upon insert. Actual Results: The application crashes with a 500 internal server error Expected Results: CLOB or BLOB data should be inserted into database and application should not crash. Occurs Also on Builds: 5.0.30 and 5.0.31 Doesn't Occur on Builds: 6.0.20 and 6.0.26 The error log is below. I thought that this error was gone with Tomcat 6.x, yet it has reappeard in 6.0.29. I have concluded that the error has to do with the DBCP library that Tomcat uses. Therefore, i replaced the 6.0.29 tomcat-dbcp.jar (243 KB) with the 6.0.26 tomcat-dbcp.jar (227 KB) and the error does not occur. I would like to make development aware that this error has come back and i hope that this error does not make it to Tomcat 7. Thank you. Johnny Coder at oracle.sql.BLOB.createTemporary(BLOB.java:587) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.springframework.jdbc.support.lob.OracleLobHandler$OracleLobCreator.prepareLob(OracleLobHandler.java:393) at org.springframework.jdbc.support.lob.OracleLobHandler$OracleLobCreator.createLob(OracleLobHandler.java:340) at org.springframework.jdbc.support.lob.OracleLobHandler$OracleLobCreator.setBlobAsBinaryStream(OracleLobHandler.java:243) at my.application.attachment.dao.JdbcAttachmentDao$1.setValues(JdbcAttachmentDao.java:58) at org.springframework.jdbc.core.JdbcTemplate$2.doInPreparedStatement(JdbcTemplate.java:796) at org.springframework.jdbc.core.JdbcTemplate.execute(JdbcTemplate.java:591) at org.springframework.jdbc.core.JdbcTemplate.update(JdbcTemplate.java:792) at org.springframework.jdbc.core.JdbcTemplate.update(JdbcTemplate.java:850) at my.application.attachment.dao.JdbcAttachmentDao.uploadAttachment(JdbcAttachmentDao.java:44) at my.application.attachment.biz.AttachmentManager.uploadAttachment(AttachmentManager.java:32) at my.application.attachment.util.ImportAttachment.importFile(ImportAttachment.java:35) at my.application.attachment.util.UploadAttachmentServlet.handle(UploadAttachmentServlet.java:59) at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:875) at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:807) at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:571) at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:511) at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:298) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:857) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:588) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:489) at java.lang.Thread.run(Thread.java:619) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50387] Insert CLOB or BLOB with Oracle connection crashes software
https://issues.apache.org/bugzilla/show_bug.cgi?id=50387 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com 2010-11-30 16:06:53 EST --- tomcat-dbcp.jar is nothing more than a repacked/renamed version of commons-dbcp and commons-pool libraries from http://commons.apache.org/ so this bug should be one of theirs (though I suspect that it is oracle.sql.BLOB to blame here). Note, that 1) versions of the libraries that were used to built a Tomcat release can be found in the build.properties.default file in the sources, 2) you can use any other version of DBCP POOL libraries, by placing both of them into lib folder and setting factory attribute on a Resource. https://issues.apache.org/bugzilla/show_bug.cgi?id=50326#c2 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50360] Server socket still bound after Embedded.stop is invoked
https://issues.apache.org/bugzilla/show_bug.cgi?id=50360 --- Comment #3 from Martin Grotzke martin.grot...@googlemail.com 2010-11-30 16:24:43 EST --- I debugged this and found the following path of execution: Connector.stopInternal(): - protocolHandler.stop() (Http11Protocol, stop() implemented in AbstractHttp11Protocol) - endpoint.stop() (JIoEndpoint) - pause() - unlockAccept() - shutdownExecutor() A problem here seems to be that JIoEndpoint.stop() does not close the serverSocket (only destroy is doing this). Therefore, if the implementation of AbstractHttp11Protocol.stop() is changed to invoke endpoint.destroy(); instead of endpoint.stop() also fixes the issue. Not sure if this is the correct solution. How can we proceed with this? Thanx Cheers, Martin -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50360] Server socket still bound after Embedded.stop is invoked
https://issues.apache.org/bugzilla/show_bug.cgi?id=50360 --- Comment #4 from Mark Thomas ma...@apache.org 2010-11-30 17:52:07 EST --- I'm working on this at the moment (although work and infrastructure stuff may distract me for the next few days). I have already sorted out the MapperListener, the ProtocolHandler and Endpoints are next but they will take a little longer as all five of the connectors will probably need to be changed together. From what I have looked at so far most of init() needs to move into start(), most of destroy() into stop() and any JMX stuff needs to move to init() / destroy(). The new Lifecycle code can't be used directly as it will create a dependency on Catalina from the Connectors but it should be possible to re-use most of the ideas and probably some of the code. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1039051 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
IMHO,
In current cluster membership implementation, local member is not
included in the cluster members list.
cluster.getMembers().length returns members that doesn't contain
local member.
Therefore, in this rev,
getAllClusterSessions does not work correctly when two tomcats
clustering configuration.
--
Keiichi.Fujino
12:24 2010
New Revision: 1039051
URL: http://svn.apache.org/viewvc?rev=1039051view=rev
Log:
Fix a couple of clustering issues:
- Don't try and obtain session data from the cluster if the current node is
the only node in the cluster.
- Log requesting session data as INFO rather than WARNING.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1039051r1=1039050r2=1039051view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu
Nov 25 14:12:24 2010
@@ -802,7 +802,7 @@ public CatalinaCluster getCluster() {
* @see #findSessionMasterMember()
*/
public synchronized void getAllClusterSessions() {
- if (cluster != null cluster.getMembers().length 0) {
+ if (cluster != null cluster.getMembers().length 1) {
long beforeSendTime = System.currentTimeMillis();
Member mbr = findSessionMasterMember();
if(mbr == null) { // No domain member found
@@ -820,8 +820,8 @@ public CatalinaCluster getCluster() {
receiverQueue = true ;
}
cluster.send(msg, mbr);
- if (log.isWarnEnabled())
-
log.warn(sm.getString(deltaManager.waitForSessionState,getName(), mbr,
Integer.valueOf(getStateTransferTimeout(;
+ if (log.isInfoEnabled())
+
log.info(sm.getString(deltaManager.waitForSessionState,getName(), mbr,
Integer.valueOf(getStateTransferTimeout(;
// FIXME At sender ack mode this method check only the state
transfer and resend is a problem!
waitForSendAllSessions(beforeSendTime);
} finally {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1039051r1=1039050r2=1039051view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 25 14:12:24 2010
@@ -70,6 +70,11 @@
bug50185/bug: Add additional trace level logging to Tribes to
assist
with fault diagnosis. Based on a patch by Ariel. (markt)
/add
+ fix
+ Donapos;t try and obtain session data from the cluster if the
current
+ node is the only node in the cluster. Log requesting session data as
+ INFO rather than WARNING. (markt)
+ /fix
/changelog
/subsection
subsection name=Web applications
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
--
Keiichi.Fujino
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1040863 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Wed Dec 1 02:49:52 2010 New Revision: 1040863 URL: http://svn.apache.org/viewvc?rev=1040863view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1040863r1=1040862r2=1040863view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 1 02:49:52 2010 @@ -201,18 +201,18 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50228 Improve recycling of BodyContentImpl. http://svn.apache.org/viewvc?rev=1037794view=rev - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Configure manager and host-manager webapps to use HttpOnly for session cookies http://people.apache.org/~kkolinko/patches/2010-11-22_tc6_httpOnly.patch - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50316 Fix minor glitch with display of negative values in Manager webapp http://svn.apache.org/viewvc?rev=1037887view=rev - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Backport AprEndpoint shutdown patch (BZ49795 and similar). @@ -226,7 +226,7 @@ PATCHES PROPOSED TO BACKPORT: JSP class loaders Patch by Sylvain Laurent https://issues.apache.org/bugzilla/attachment.cgi?id=25116 - +1: markt, kkolinko + +1: markt, kkolinko, kfujino -1: kkolinko: I'd like to s/isLoadedByThisWebAppClassLoader/isLoadedByThisWebappClassLoader/ to match this class name. Also do not change JavaDoc at class declaration. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
