svn commit: r812105 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Sep 7 12:22:35 2009 New Revision: 812105 URL: http://svn.apache.org/viewvc?rev=812105&view=rev Log: Add additional patch required for 38797 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=812105&r1=812104&r2=812105&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 12:22:35 2009 @@ -96,6 +96,10 @@ http://svn.apache.org/viewvc?rev=791224&view=rev +1: markt, kkolinko,funkman -1: + This also requires a second patch + http://svn.apache.org/viewvc?rev=809131&view=rev + +1: markt + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231 http://people.apache.org/~markt/patches/2009-08-16-bug39231.patch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812106 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Mon Sep 7 12:23:36 2009 New Revision: 812106 URL: http://svn.apache.org/viewvc?rev=812106&view=rev Log: Regression in fix for 38797 Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=812106&r1=812105&r2=812106&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Sep 7 12:23:36 2009 @@ -87,3 +87,9 @@ http://svn.apache.org/viewvc?rev=805182&view=rev +1: markt -1: + +* Fix regression in fix for + https://issues.apache.org/bugzilla/show_bug.cgi?id=38797 + http://svn.apache.org/viewvc?rev=809131&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812107 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Mon Sep 7 12:26:19 2009
New Revision: 812107
URL: http://svn.apache.org/viewvc?rev=812107&view=rev
Log:
Add a TODO
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=812107&r1=812106&r2=812107&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Sep
7 12:26:19 2009
@@ -1621,6 +1621,7 @@
"org/apache/catalina/loader/JdbcLeakPrevention.class");
// Cheat - we know roughly how big the class will be (~1K) but allow
// plenty room to grow
+// TODO Let buffer grow as required
byte[] classBytes = new byte[4096];
int offset = 0;
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812110 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/JdbcLeakPrevention.java java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt Date: Mon Sep 7 12:34:14 2009 New Revision: 812110 URL: http://svn.apache.org/viewvc?rev=812110&view=rev Log: Fix JDBC driver de-registration Added: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java (props changed) - copied unchanged from r789389, tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 7 12:34:14 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812110&r1=812109&r2=812110&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 12:34:14 2009 @@ -144,17 +144,6 @@ +1: kkolinko, markt, rjung, funkman -1: -* Fix the JDBC driver clean-up - http://svn.apache.org/viewvc?view=rev&revision=789389 - See below for additional fix required - +1: markt, rjung, funkman - -1: - rjung: I don't really like the implicit 4KB class size limit. - I understand your rationale, but we don't know enough about other JVMs - and the future in general. - I think it would be nice to improve in a second step by resizing the - array according to the class size. AFAIK it's not a performance critical path. - * Fix NPE observed when unpackWARs="false" with above fix http://svn.apache.org/viewvc?view=rev&revision=805153 +1: markt, funkman, rjung Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java -- svn:eol-style = native Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/load
svn commit: r812112 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/naming/resources/WARDirContext.java webapps/docs/changelog.xml
Author: markt
Date: Mon Sep 7 12:37:06 2009
New Revision: 812112
URL: http://svn.apache.org/viewvc?rev=812112&view=rev
Log:
Fix the NPE exposed by the JDBC fix
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 7 12:37:06 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,805153
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812112&r1=812111&r2=812112&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 12:37:06 2009
@@ -144,11 +144,6 @@
+1: kkolinko, markt, rjung, funkman
-1:
-* Fix NPE observed when unpackWARs="false" with above fix
- http://svn.apache.org/viewvc?view=rev&revision=805153
- +1: markt, funkman, rjung
- -1:
-
* Port Active Directory improvements to JNDIREalm from trunk
Patch testing successfully by willing volunteer on the users list
http://people.apache.org/~markt/patches/2009-08-06-ADforJNDIRealm.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=812112&r1=812111&r2=812112&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
Mon Sep 7 12:37:06 2009
@@ -784,7 +784,7 @@
* Entry tree lookup.
*/
protected Entry treeLookup(Name name) {
-if (name.isEmpty())
+if (name.isEmpty() || entries == null)
return entries;
Entry currentEntry = entries;
for (int i = 0; i < name.size(); i++) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/chan
svn commit: r812114 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Author: markt
Date: Mon Sep 7 12:39:42 2009
New Revision: 812114
URL: http://svn.apache.org/viewvc?rev=812114&view=rev
Log:
Add a couple of TODOs
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=812114&r1=812113&r2=812114&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Mon Sep 7
12:39:42 2009
@@ -1021,6 +1021,7 @@
List roles = getRoles(context, user);
if (containerLog.isDebugEnabled()) {
Iterator it = roles.iterator();
+// TODO: Use a single log message
while (it.hasNext()) {
containerLog.debug("Found role: " +
it.next());
}
@@ -1054,6 +1055,7 @@
List roles = getRoles(context, user);
if (containerLog.isDebugEnabled()) {
Iterator it = roles.iterator();
+// TODO: Use a single log message
while (it.hasNext()) {
containerLog.debug("Found role: " + it.next());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812115 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml
Author: markt Date: Mon Sep 7 12:45:58 2009 New Revision: 812115 URL: http://svn.apache.org/viewvc?rev=812115&view=rev Log: Apply AD improvements Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812115&r1=812114&r2=812115&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 12:45:58 2009 @@ -144,17 +144,6 @@ +1: kkolinko, markt, rjung, funkman -1: -* Port Active Directory improvements to JNDIREalm from trunk - Patch testing successfully by willing volunteer on the users list - http://people.apache.org/~markt/patches/2009-08-06-ADforJNDIRealm.patch - +1: markt, kkolinko, funkman - -1: - kkolinko: ( - There are several (two) places with a loop printing containerLog.debug( - "Found role: " + it.next()); It would be better to prepare the whole string - of roles and print it at once. - ) - * Port TLD processing improvements from trunk There have been quite a few changes to TLD processing and they are tightly coupled. Therefore, this proposal is a series of patches and the patches Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=812115&r1=812114&r2=812115&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Mon Sep 7 12:45:58 2009 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,8 +24,12 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; import java.util.Hashtable; +import java.util.Iterator; import java.util.List; +import java.util.Set; import javax.naming.Context; import javax.naming.CommunicationException; @@ -37,6 +41,7 @@ import javax.naming.NameParser; import javax.naming.Name; import javax.naming.AuthenticationException; +import javax.naming.PartialResultException; import javax.naming.ServiceUnavailableException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; @@ -134,6 +139,15 @@ * in the user's element whose name is configured by the * userRoleName property. * + * A default role can be assigned to each user that was successfully + * authenticated by setting the commonRole property to the + * name of this role. The role doesn't have to exist in the directory. + * + * If the directory server contains nested roles, you can search for them + * by setting roleNested to true. + * The default value is false, so role searches will not find + * nested roles. + * * Note that the standardelement in * the web application deployment descriptor allows applications to refer * to roles programmatically by names other than those used in the @@ -197,14 +211,14 @@ */ protected String contextFactory = "com.sun.jndi.ldap.LdapCtxFactory"; - + /** * How aliases should be dereferenced during search operations. */ protected String derefAliases = null; /** - * Constant that holds the name of the environment property for specifying + * Constant that holds the name of the environment property for specifying * the manner in which aliases should be dereferenced. */ public final static String DEREF_ALIASES = "java.naming.ldap.derefAliases"; @@ -230,9 +244,20 @@ /** - * How should we handle referrals? Microsoft Active Directory can't handle - * the default case, so an application authenticating against AD must - * set referrals to "follow". + * Should we ignore PartialResultExceptions when iterating over NamingEnumerations? + * Microsoft Active Directory often returns referrals, which lead + * to PartialResultExceptions. Unfortunately there's no stable way to detect, + * if the Exceptions really come from an AD referral. + * Set to true to ignore PartialResultExceptions. + */ +protected boolean adCompat = false; + + +/** + * How should we handle refe
svn commit: r812116 - /tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml
Author: markt Date: Mon Sep 7 12:51:56 2009 New Revision: 812116 URL: http://svn.apache.org/viewvc?rev=812116&view=rev Log: Update JNDI realm docs with new attributes Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml?rev=812116&r1=812115&r2=812116&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml Mon Sep 7 12:51:56 2009 @@ -292,17 +292,32 @@ information from the directory: - - If a socket connection can not be made to the provider at - the connectionURL an attempt will be made to use the - alternateURL. - - - - A string specifying the type of authentication to use. - "none", "simple", "strong" or a provider specific definition - can be used. If no value is given the providers default is used. - + +Microsoft Active Directory often returns referrals. +When iterating over NamingEnumerations these lead to +PartialResultExceptions. If you want us to ignore those exceptions, +set this attribute to "true". Unfortunately there's no stable way +to detect, if the Exceptions really come from an AD referral. +The default value is "false". + + + +If a socket connection can not be made to the provider at +the connectionURL an attempt will be made to use the +alternateURL. + + + +A string specifying the type of authentication to use. +"none", "simple", "strong" or a provider specific definition +can be used. If no value is given the providers default is used. + + + +A role name assigned to each successfully authenticated user in +addition to the roles retrieved from LDAP. If not specified, only +the roles retrieved via LDAP are used. + The directory username to use when establishing a @@ -351,6 +366,16 @@ the providers default is used. + +How do we handle JNDI referrals? Allowed values are +"ignore", "follow", or "throw" (see javax.naming.Context.REFERRAL +for more information). +Microsoft Active Directory often returns referrals. +If you need to follow them set referrals to "follow". +Caution: if your DNS is not part of AD, the LDAP client lib might try +to resolve your domain name in DNS to find another LDAP server. + + The base directory entry for performing role searches. If not specified the top-level element in the directory context - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r812115 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml
On 07/09/2009, ma...@apache.org wrote: > Author: markt > Date: Mon Sep 7 12:45:58 2009 > New Revision: 812115 > > URL: http://svn.apache.org/viewvc?rev=812115&view=rev > Log: > Apply AD improvements > > Modified: > tomcat/tc6.0.x/trunk/STATUS.txt > tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java > tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml > > Modified: tomcat/tc6.0.x/trunk/STATUS.txt > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812115&r1=812114&r2=812115&view=diff > > == > --- tomcat/tc6.0.x/trunk/STATUS.txt (original) > +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 12:45:58 2009 > @@ -144,17 +144,6 @@ >+1: kkolinko, markt, rjung, funkman >-1: > > -* Port Active Directory improvements to JNDIREalm from trunk > - Patch testing successfully by willing volunteer on the users list > - http://people.apache.org/~markt/patches/2009-08-06-ADforJNDIRealm.patch > - +1: markt, kkolinko, funkman > - -1: > - kkolinko: ( > - There are several (two) places with a loop printing containerLog.debug( > - "Found role: " + it.next()); It would be better to prepare the whole > string > - of roles and print it at once. > - ) > - > * Port TLD processing improvements from trunk >There have been quite a few changes to TLD processing and they are tightly >coupled. Therefore, this proposal is a series of patches and the patches > > Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=812115&r1=812114&r2=812115&view=diff > > == > --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java > (original) > +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Mon > Sep 7 12:45:58 2009 > @@ -5,9 +5,9 @@ > * The ASF licenses this file to You under the Apache License, Version 2.0 > * (the "License"); you may not use this file except in compliance with > * the License. You may obtain a copy of the License at > - * > + * > * http://www.apache.org/licenses/LICENSE-2.0 > - * > + * > * Unless required by applicable law or agreed to in writing, software > * distributed under the License is distributed on an "AS IS" BASIS, > * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > @@ -24,8 +24,12 @@ > import java.text.MessageFormat; > import java.util.ArrayList; > import java.util.Arrays; > +import java.util.HashMap; > +import java.util.HashSet; > import java.util.Hashtable; > +import java.util.Iterator; > import java.util.List; > +import java.util.Set; > > import javax.naming.Context; > import javax.naming.CommunicationException; > @@ -37,6 +41,7 @@ > import javax.naming.NameParser; > import javax.naming.Name; > import javax.naming.AuthenticationException; > +import javax.naming.PartialResultException; > import javax.naming.ServiceUnavailableException; > import javax.naming.directory.Attribute; > import javax.naming.directory.Attributes; > @@ -134,6 +139,15 @@ > * in the user's element whose name is configured by the > * userRoleName property. > * > + * A default role can be assigned to each user that was successfully > + * authenticated by setting the commonRole property to the > + * name of this role. The role doesn't have to exist in the directory. > + * > + * If the directory server contains nested roles, you can search for > them > + * by setting roleNested to true. > + * The default value is false, so role searches will not find > + * nested roles. > + * > * Note that the standardelement > in > * the web application deployment descriptor allows applications to refer > * to roles programmatically by names other than those used in the > @@ -197,14 +211,14 @@ > */ > protected String contextFactory = "com.sun.jndi.ldap.LdapCtxFactory"; > > - > + > /** > * How aliases should be dereferenced during search operations. > */ > protected String derefAliases = null; > > /** > - * Constant that holds the name of the environment property for > specifying > + * Constant that holds the name of the environment property for > specifying > * the manner in which aliases should be dereferenced. > */ > public final static String DEREF_ALIASES = > "java.naming.ldap.derefAliases"; > @@ -230,9 +244,20 @@ > > > /** > - * How should we handle referrals? Microsoft Active Directory can't > handle > - * the default case, so an application authenticating against AD must > - * set referrals to "follow". > + * Should we ignore PartialResultExceptions when iterating over > NamingEnumerations? > +
svn commit: r812118 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Sep 7 13:01:34 2009 New Revision: 812118 URL: http://svn.apache.org/viewvc?rev=812118&view=rev Log: Fix typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=812118&r1=812117&r2=812118&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 7 13:01:34 2009 @@ -86,7 +86,7 @@ session attribute serialization. (mturk) -Improve JNDI realm compatability with Active Directory. (rjung) +Improve JNDI realm compatibility with Active Directory. (rjung) Give session thisAccessedTime and lastAccessedTime clear semantics. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812119 - /tomcat/trunk/webapps/docs/realm-howto.xml
Author: markt Date: Mon Sep 7 13:01:59 2009 New Revision: 812119 URL: http://svn.apache.org/viewvc?rev=812119&view=rev Log: Remove attribute duplication - pages were often out of sync Modified: tomcat/trunk/webapps/docs/realm-howto.xml Modified: tomcat/trunk/webapps/docs/realm-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/realm-howto.xml?rev=812119&r1=812118&r2=812119&view=diff == --- tomcat/trunk/webapps/docs/realm-howto.xml (original) +++ tomcat/trunk/webapps/docs/realm-howto.xml Mon Sep 7 13:01:59 2009 @@ -352,74 +352,9 @@ To configure JDBCRealm, you will create aelement and nest it in your $CATALINA_BASE/conf/server.xml file, -as described above. The following -attributes are supported by this implementation: - - - - -The fully qualified Java class name of this Realm implementation. -You MUST specify the value -"org.apache.catalina.realm.JDBCRealm" here. - - - -The database username used to establish a JDBC connection. - - - -The database password used to establish a JDBC connection. - - - -The database URL used to establish a JDBC connection. - - - -The digest algorithm used to store passwords in non-plaintext formats. -Valid values are those accepted for the algorithm name by the -java.security.MessageDigest class. See -Digested Passwords for more -information. If not specified, passwords are stored in clear text. - - - -The fully qualified Java class name of the JDBC driver to be used. -Consult the documentation for your JDBC driver for the appropriate -value. - - - -The name of the column, in the user roles table, that -contains the name of a role assigned to this user. - - - -The name of the column, in the users table, that contains -the password for this user (either in clear text, or digested if the -digest attribute is set). - - - -The name of the column, in the users and user roles -tables, that contains the username of this user. - - - -The name of the table that contains one row for each role -assigned to a particular username. This table must include at -least the columns named by the userNameCol and -roleNameCol attributes. - - - -The name of the table that contains one row for each username -to be recognized by Tomcat. This table must include at least the columns -named by the userNameCol and userCredCol -attributes. - - - +as described above. The attributes for the +JDBCRealm are defined in the Realm configuration +documentation. Example @@ -530,70 +465,9 @@ To configure DataSourceRealm, you will create a element and nest it in your $CATALINA_BASE/conf/server.xml file, -as described above. The following -attributes are supported by this implementation: - - - - -The fully qualified Java class name of this Realm implementation. -You MUST specify the value -"org.apache.catalina.realm.DataSourceRealm" here. - - - -The JNDI named JDBC DataSource for your database. If the DataSource is -local to the context, the name is relative to java:/comp/env, -and otherwise the name should match the name used to define the global -DataSource. - - - -The digest algorithm used to store passwords in non-plaintext formats. -Valid values are those accepted for the algorithm name by the -java.security.MessageDigest class. See -Digested Passwords for more -information. If not specified, passwords are stored in clear text. - - - -When the realm is nested inside a Context element, this allows the -realm to use a DataSource defined for the Context rather than a global -DataSource. If not specified, the default is false: use a -global DataSource. - - - -The name of the column, in the user roles table, that -contains the name of a role assigned to this user. - - - -The name of the column, in the users table, that contains -the password for this user (either in clear text, or digested if the -digest attribute is set). - - - -The name of the column, in the users and user roles -tables, that contains the username of this user. - - - -The name of the table that contains one row for each role -assigned to a particular username. This table must include at -least the columns named by the userNameCol and -roleNameCol attributes. - - - -The name of the table that contains one row for each username -to be recognized by Tomcat. This table must include at least the columns -named by the userNameCol and userCredCol -attributes. - - - +as described above. The attributes for the +DataSourceRealm are defined in the Realm +configuration documentation. Example @@ -839,199 +713,9 @@ To configure JNDIRealm, you will create a element and ne
svn commit: r812121 - /tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml
Author: markt Date: Mon Sep 7 13:09:49 2009 New Revision: 812121 URL: http://svn.apache.org/viewvc?rev=812121&view=rev Log: Port removal of attribute list from realm howto - reduces duplciation in docs and prevents attribute lists in two locations getting out of sync Modified: tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml?rev=812121&r1=812120&r2=812121&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml Mon Sep 7 13:09:49 2009 @@ -352,74 +352,9 @@ To configure JDBCRealm, you will create aelement and nest it in your $CATALINA_BASE/conf/server.xml file, -as described above. The following -attributes are supported by this implementation: - - - - -The fully qualified Java class name of this Realm implementation. -You MUST specify the value -"org.apache.catalina.realm.JDBCRealm" here. - - - -The database username used to establish a JDBC connection. - - - -The database password used to establish a JDBC connection. - - - -The database URL used to establish a JDBC connection. - - - -The digest algorithm used to store passwords in non-plaintext formats. -Valid values are those accepted for the algorithm name by the -java.security.MessageDigest class. See -Digested Passwords for more -information. If not specified, passwords are stored in clear text. - - - -The fully qualified Java class name of the JDBC driver to be used. -Consult the documentation for your JDBC driver for the appropriate -value. - - - -The name of the column, in the user roles table, that -contains the name of a role assigned to this user. - - - -The name of the column, in the users table, that contains -the password for this user (either in clear text, or digested if the -digest attribute is set). - - - -The name of the column, in the users and user roles -tables, that contains the username of this user. - - - -The name of the table that contains one row for each role -assigned to a particular username. This table must include at -least the columns named by the userNameCol and -roleNameCol attributes. - - - -The name of the table that contains one row for each username -to be recognized by Tomcat. This table must include at least the columns -named by the userNameCol and userCredCol -attributes. - - - +as described above. The attributes for the +JDBCRealm are defined in the Realm configuration +documentation. Example @@ -530,70 +465,9 @@ To configure DataSourceRealm, you will create a element and nest it in your $CATALINA_BASE/conf/server.xml file, -as described above. The following -attributes are supported by this implementation: - - - - -The fully qualified Java class name of this Realm implementation. -You MUST specify the value -"org.apache.catalina.realm.DataSourceRealm" here. - - - -The JNDI named JDBC DataSource for your database. If the DataSource is -local to the context, the name is relative to java:/comp/env, -and otherwise the name should match the name used to define the global -DataSource. - - - -The digest algorithm used to store passwords in non-plaintext formats. -Valid values are those accepted for the algorithm name by the -java.security.MessageDigest class. See -Digested Passwords for more -information. If not specified, passwords are stored in clear text. - - - -When the realm is nested inside a Context element, this allows the -realm to use a DataSource defined for the Context rather than a global -DataSource. If not specified, the default is false: use a -global DataSource. - - - -The name of the column, in the user roles table, that -contains the name of a role assigned to this user. - - - -The name of the column, in the users table, that contains -the password for this user (either in clear text, or digested if the -digest attribute is set). - - - -The name of the column, in the users and user roles -tables, that contains the username of this user. - - - -The name of the table that contains one row for each role -assigned to a particular username. This table must include at -least the columns named by the userNameCol and -roleNameCol attributes. - - - -The name of the table that contains one row for each username -to be recognized by Tomcat. This table must include at least the columns -named by the userNameCol and userCredCol -attributes. - - - +as described above. The attributes for the +DataSourceRealm are defined in the Realm +configu
svn commit: r812125 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Author: markt
Date: Mon Sep 7 13:24:50 2009
New Revision: 812125
URL: http://svn.apache.org/viewvc?rev=812125&view=rev
Log:
Fix spelling and other minor niggles
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=812125&r1=812124&r2=812125&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Mon
Sep 7 13:24:50 2009
@@ -277,7 +277,7 @@
*/
void release() {
-unregsiterJMX();
+unregisterJMX();
if (this.filter != null)
{
@@ -331,7 +331,7 @@
// Release any previously allocated filter instance
if (this.filter != null){
-if( Globals.IS_SECURITY_ENABLED) {
+if (Globals.IS_SECURITY_ENABLED) {
try{
SecurityUtil.doAsPrivilege("destroy", filter);
} catch(java.lang.Exception ex){
@@ -405,23 +405,23 @@
Registry.getRegistry(null, null).registerComponent(this, oname,
null);
} catch (Exception ex) {
-log.info(sm.getString("applicationFilterConfig.jmxRegsiterFail",
+log.info(sm.getString("applicationFilterConfig.jmxRegisterFail",
getFilterClass(), getFilterName()), ex);
}
}
-private void unregsiterJMX() {
+private void unregisterJMX() {
// unregister this component
if (oname != null) {
try {
Registry.getRegistry(null, null).unregisterComponent(oname);
-if(log.isDebugEnabled())
+if (log.isDebugEnabled())
log.debug(sm.getString(
-"applicationFilterConfig.jmxUnregsiter",
+"applicationFilterConfig.jmxUnregister",
getFilterClass(), getFilterName()));
} catch(Exception ex) {
log.error(sm.getString(
-"applicationFilterConfig.jmxUnregsiterFail",
+"applicationFilterConfig.jmxUnregisterFail",
getFilterClass(), getFilterName()), ex);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812133 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationFilterConfig.java java/org/apache/catalina/core/LocalStrings.properties java/org/apache/catalina/
Author: markt
Date: Mon Sep 7 13:37:06 2009
New Revision: 812133
URL: http://svn.apache.org/viewvc?rev=812133&view=rev
Log:
Expose filters via JMX
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 7 13:37:06 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,805153
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,805153,812125
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812133&r1=812132&r2=812133&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 13:37:06 2009
@@ -190,15 +190,6 @@
+1: markt
-1:
-* Expose filter configuration via JMX (read-only)
- Based on a patch by Xie Xiaodong as part of GSOC2009.
- http://svn.apache.org/viewvc?rev=802727&view=rev
- +1: markt, funkman, rjung
- -1:
- rjung: typo regsiter -> register should be corrected everywhere (method name,
- log messages etc., string manager property, sometimes with
capitalzation "Regsiter")
- Another little style nitpick: "if(" -> "if (".
-
* Use platform MBean server rather than creating a new one. Makes it possible
to
connect JConsole and other JMX tools to locally running Tomcat instances
without any config changes to Tomcat
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=812133&r1=812132&r2=812133&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++
to
svn commit: r812136 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/startup/Bootstrap.java java/org/apache/tomcat/util/modeler/Registry.java webapps/docs/changelog.xml
Author: markt Date: Mon Sep 7 13:42:58 2009 New Revision: 812136 URL: http://svn.apache.org/viewvc?rev=812136&view=rev Log: Use PlatformMBeanServer by default. Makes JMX easier. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 7 13:42:58 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,805153,812125 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77 7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,805153,812125 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812136&r1=812135&r2=812136&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 13:42:58 2009 @@ -190,13 +190,6 @@ +1: markt -1: -* Use platform MBean server rather than creating a new one. Makes it possible to - connect JConsole and other JMX tools to locally running Tomcat instances - without any config changes to Tomcat - http://svn.apache.org/viewvc?rev=677910&view=rev - +1: markt, funkman, rjung - -1: - * Add remote JMX listener. Enables JMX to be configured so that it can be used with fixed ports. Useful when connecting through a firewall as normally JMX uses one fixed and one random port. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=812136&r1=812135&r2=812136&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java Mon Sep 7 13:42:58 2009 @@ -20,6 +20,7 @@ import java.io.File; +import java.lang.management.ManagementFactory; import java.lang.reflect.Method; i
svn commit: r812137 - /tomcat/trunk/webapps/docs/config/listeners.xml
Author: markt Date: Mon Sep 7 13:50:12 2009 New Revision: 812137 URL: http://svn.apache.org/viewvc?rev=812137&view=rev Log: Fix typo Modified: tomcat/trunk/webapps/docs/config/listeners.xml Modified: tomcat/trunk/webapps/docs/config/listeners.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=812137&r1=812136&r2=812137&view=diff == --- tomcat/trunk/webapps/docs/config/listeners.xml (original) +++ tomcat/trunk/webapps/docs/config/listeners.xml Mon Sep 7 13:50:12 2009 @@ -199,7 +199,7 @@ - + The port to be used by the JMX/RMI registry for the Platform MBeans. The replaces the use of the com.sun.management.jmxremote.port system property that - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812143 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/mbeans/ webapps/docs/ webapps/docs/config/
Author: markt Date: Mon Sep 7 14:01:32 2009 New Revision: 812143 URL: http://svn.apache.org/viewvc?rev=812143&view=rev Log: Add the JmxRemoteLifecycleListener that fixes ports used by JMX, making firewall configuration simpler. Added: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/Constants.java (with props) tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java (with props) tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties (with props) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/extras.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 7 14:01:32 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77 7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,805153,812125 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77 7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,805153,812125,812137 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812143&r1=812142&r2=812143&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:01:32 2009 @@ -190,18 +190,6 @@ +1: markt -1: -* Add remote JMX listener. Enables JMX to be configured so that it can be used - with fixed ports. Useful when connecting through a firewall as normally JMX - uses one fixed and one random port. - Needs the platform MBean server fix above to be really useful - http://people.apache.org/~markt/patches/2009-08-12-jmx-remote.patch - +1: markt, funkman, rjung - -1: - rjung: The docs page contains a typo: rmiRegsitryPortPlatform -> rmiRegistryPortPlatform - There are also some hidden defaults (password and access file) which might make - sense to be added to the docs. Directory for those default files is - CATALINA_BASE and not CATALINA_BASE/conf? - * Make context deployment error message more meaningful http://svn.a
svn commit: r812144 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Mon Sep 7 14:05:07 2009
New Revision: 812144
URL: http://svn.apache.org/viewvc?rev=812144&view=rev
Log:
Make fixDocBase error more meaningful
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 7 14:05:07 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,805153,812125,812137
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,802940,805153,812125,812137
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812144&r1=812143&r2=812144&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:05:07 2009
@@ -190,11 +190,6 @@
+1: markt
-1:
-* Make context deployment error message more meaningful
- http://svn.apache.org/viewvc?rev=802940&view=rev
- +1: markt, kkolinko, funkman
- -1:
-
* Additional patch required for
https://issues.apache.org/bugzilla/show_bug.cgi?id=47046
Clean up Jk components that only exist in the 6.0.x and were hence missed
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=812144&r1=812143&r2=812144&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Sep 7 14:05:07 2009
@@ -1011,7 +1011,8 @@
try {
fixDocBase();
} catch (IOException e) {
-log.error(sm.getString("contextConfig.fixDocBase"), e);
+log.error(sm.getString(
+"contextConfig.fixDocBase",
svn commit: r812146 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jk/server/JkMain.java
Author: markt
Date: Mon Sep 7 14:07:02 2009
New Revision: 812146
URL: http://svn.apache.org/viewvc?rev=812146&view=rev
Log:
Additional patch required for
https://issues.apache.org/bugzilla/show_bug.cgi?id=47046
Clean up Jk components that only exist in the 6.0.x and were hence missed
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812146&r1=812145&r2=812146&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:07:02 2009
@@ -190,13 +190,6 @@
+1: markt
-1:
-* Additional patch required for
- https://issues.apache.org/bugzilla/show_bug.cgi?id=47046
- Clean up Jk components that only exist in the 6.0.x and were hence missed
- https://issues.apache.org/bugzilla/attachment.cgi?id=24125
- +1: markt, funkman, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403
Add a check when enumerating jar files, and
do not suppress IO errors when starting a web application.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java?rev=812146&r1=812145&r2=812146&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java Mon Sep 7
14:07:02 2009
@@ -278,17 +278,59 @@
public void stop()
{
+// Clean up the handlers
+MBeanServer s = Registry.getRegistry(null,null).getMBeanServer();
for( int i=0; i
DO NOT REPLY [Bug 47046] Shutdown does not unregister all MBeans
https://issues.apache.org/bugzilla/show_bug.cgi?id=47046 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2009-09-07 15:16:47 BST --- The additional patch has now been applied and will be included in 6.0.21 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812150 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: markt
Date: Mon Sep 7 14:24:46 2009
New Revision: 812150
URL: http://svn.apache.org/viewvc?rev=812150&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47413
First part of a composite EL expression "${a}${b}" was not coerced to String
Without coercion, the concatenation of ((Object)null) + string results in
"null" being printed. (kkolinko)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 7 14:24:46 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607,802727,802940,805153,812125,812137
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,805153,812125,812137
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812150&r1=812149&r2=812150&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:24:46 2009
@@ -136,14 +136,6 @@
Is it still relevant? I do not see any waiting there.
)
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47413
- First part of a composite EL expression "${a}${b}" was not coerced to String
- Without coercion, the concatenation of ((Object)null) + string results in
- "null" being printed.
- http://svn.apache.org/viewvc?rev=795466&view=rev
- +1: kkolinko, markt, rjung, funkman
- -1:
-
* Port TLD processing improvements from trunk
There have been quite a few changes to TLD processing and they are tightly
coupled. Therefore, this proposal is a series of patches and the patches
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=812150&r1=812149&r2=812150&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compi
DO NOT REPLY [Bug 47413] There is difference in composite ${a}${b} EL expressions between 6.0.18 and 6.0.20
https://issues.apache.org/bugzilla/show_bug.cgi?id=47413 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas 2009-09-07 15:27:57 BST --- This has been fixed in 6.0.x and will be included in 6.0.21 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812169 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/LocalStrings.properties java/org/apache/catalina/loader/WebappLoader.java webapps/docs/changelog.xml
Author: markt Date: Mon Sep 7 14:50:28 2009 New Revision: 812169 URL: http://svn.apache.org/viewvc?rev=812169&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 Add additional checks on web app deployment and do not swallow IO errors (kkolinko) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 7 14:50:28 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77 7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,805153,812125,812137 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77 7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,805153,812125,812137 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812169&r1=812168&r2=812169&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:50:28 2009 @@ -182,17 +182,6 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 - Add a check when enumerating jar files, and - do not suppress IO errors when starting a web application. - Note: -- tested in normal operation on windows, with unpackWARs="true" and "false" -- test on linux in normal and failure modes - http://svn.apache.org/viewvc?rev=804462&view=rev - http://svn.apache.org/viewvc?rev=804544&view=rev - +1: kkolinko, markt, funkman - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 Update AccessLogValve and ExtendedAccessLogValve with all the recent threading improvements Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=812169&r1=812168&r2=812169&view=diff == -
DO NOT REPLY [Bug 45403] Tomcat does not reload application
https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2009-09-07 15:50:42 BST --- The fix has been applied to 6.0.x and will be included in 6.0.21 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812171 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Sep 7 14:54:20 2009 New Revision: 812171 URL: http://svn.apache.org/viewvc?rev=812171&view=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=812171&r1=812170&r2=812171&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:54:20 2009 @@ -214,7 +214,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 ArithmeticException: / by zero when expiring sessions via manager http://svn.apache.org/viewvc?rev=809603&view=rev - +1: funkman, rjung + +1: funkman, rjung, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47705] ArithmeticException: / by zero when expiring sessions via manager
https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-09-07 15:57:30 BST --- This has been fixed in 6.0.x and will be included in 6.0.21 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812174 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml
Author: markt Date: Mon Sep 7 14:57:59 2009 New Revision: 812174 URL: http://svn.apache.org/viewvc?rev=812174&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 ArithmeticException: / by zero when expiring sessions via manager (funkman) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 7 14:57:59 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77 7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,805153,812125,812137 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77 7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,805153,809603,812125,812137 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812174&r1=812173&r2=812174&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:57:59 2009 @@ -211,13 +211,6 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 - ArithmeticException: / by zero when expiring sessions via manager - http://svn.apache.org/viewvc?rev=809603&view=rev - +1: funkman, rjung, markt - -1: - - * Fix VirtualWebappClassLoader file directives Index: java/org/apache/catalina/loader/VirtualWebappLoader.java === Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=812174&r1=812173&r2=812174&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Sep 7 14:57:59 2009 @@ -1132,6 +1132,8 @@ int histoInterval = maxInactiveInterval / maxCount;
svn commit: r812210 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/startup/TestTomcat.java
Author: markt
Date: Mon Sep 7 15:54:08 2009
New Revision: 812210
URL: http://svn.apache.org/viewvc?rev=812210&view=rev
Log:
Add an method that enables JNDI and a test case to make sure it works
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=812210&r1=812209&r2=812210&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Sep 7
15:54:08 2009
@@ -369,8 +369,8 @@
}
/**
- * Get the server object. You can add listeners and
- * few more customizations.
+ * Get the server object. You can add listeners and few more
+ * customizations. JNDI is disabled by default.
*/
public StandardServer getServer() {
@@ -528,6 +528,31 @@
}
/**
+ * Enables JNDI naming which is disabled by default.
+ */
+public void enableNaming() {
+// Make sure getServer() has been called as that is where naming is
+// disabled
+getServer();
+
+System.setProperty("catalina.useNaming", "true");
+String value = "org.apache.naming";
+String oldValue =
+System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
+if (oldValue != null) {
+value = value + ":" + oldValue;
+}
+System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, value);
+value = System.getProperty
+(javax.naming.Context.INITIAL_CONTEXT_FACTORY);
+if (value == null) {
+System.setProperty
+(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
+ "org.apache.naming.java.javaURLContextFactory");
+}
+}
+
+/**
* Provide default configuration for a context. This is the programmatic
* equivalent of the default web.xml.
*
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=812210&r1=812209&r2=812210&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Mon Sep 7
15:54:08 2009
@@ -25,11 +25,15 @@
import java.util.List;
import java.util.Map;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestTomcat extends TestTomcatBase {
@@ -42,8 +46,34 @@
private static final long serialVersionUID = 1L;
public void doGet(HttpServletRequest req, HttpServletResponse res)
-throws IOException {
- res.getWriter().write("Hello world");
+throws IOException {
+res.getWriter().write("Hello world");
+}
+}
+
+/**
+ * Simple servlet to test iJNDI
+ */
+public static class HelloWorldJndi extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+private static final String JNDI_ENV_NAME = "test";
+
+public void doGet(HttpServletRequest req, HttpServletResponse res)
+throws IOException {
+
+String name = null;
+
+try {
+Context initCtx = new InitialContext();
+Context envCtx = (Context) initCtx.lookup("java:comp/env");
+name = (String) envCtx.lookup(JNDI_ENV_NAME);
+} catch (NamingException e) {
+throw new IOException(e);
+}
+
+res.getWriter().write("Hello, " + name);
}
}
@@ -96,7 +126,39 @@
System.err.println("Test time: " +
(System.currentTimeMillis() - t0));
}
+
+/**
+ * Test for enabling JNDI.
+ */
+public void testEnableNaming() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+StandardContext ctx =
+tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+
+// You can customise the context by calling its API
+
+// Enable JNDI - it is disabled by default
+tomcat.enableNaming();
+
+ContextEnvironment environment =
Re: svn commit: r810161 - /tomcat/tc6.0.x/trunk/STATUS.txt
rj...@apache.org wrote: > URL: http://svn.apache.org/viewvc?rev=810161&view=rev > + rjung: The docs page contains a typo: rmiRegsitryPortPlatform -> > rmiRegistryPortPlatform Fixed. > + There are also some hidden defaults (password and access file) > which might make > + sense to be added to the docs. Directory for those default files is > + CATALINA_BASE and not CATALINA_BASE/conf? All of those default to the standard JMX system properties. This is documented in the docs for the listener. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r810161 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 07.09.2009 18:45, Mark Thomas wrote: > rj...@apache.org wrote: >> URL: http://svn.apache.org/viewvc?rev=810161&view=rev >> + rjung: The docs page contains a typo: rmiRegsitryPortPlatform -> >> rmiRegistryPortPlatform > Fixed. > >> + There are also some hidden defaults (password and access file) >> which might make >> + sense to be added to the docs. Directory for those default files is >> + CATALINA_BASE and not CATALINA_BASE/conf? > All of those default to the standard JMX system properties. This is > documented in the docs for the listener. OK, thanks Mark! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] Apache Tomcat 5.5.28 released
Phil Steitz wrote: > Filip Hanik - Dev Lists wrote: >> The Apache Tomcat team announces (a bit late) the immediate availability >> of Apache >> Tomcat 5.5.28 stable. >> >> Apache Tomcat 5.5.28 incorporates numerous security updates and bug fixes. >> Please refer to the change log for the list of changes: >> http://tomcat.apache.org/tomcat-5.5-doc/changelog.html > > The updated changelog showing .28 changes needs to be pushed to the > website. Looks like the updates have been made in svn, just not > published yet. The 5.5.28 docs needed to be copied across (they aren't in svn) and the symbolic link updated to point to new docs. This is now done and should sync to the live site in the next hour or so. As an aside, I removed old versions of the docs to leave just the current and previous versions. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812278 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Mon Sep 7 21:20:25 2009 New Revision: 812278 URL: http://svn.apache.org/viewvc?rev=812278&view=rev Log: Add proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=812278&r1=812277&r2=812278&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Sep 7 21:20:25 2009 @@ -93,3 +93,12 @@ http://svn.apache.org/viewvc?rev=809131&view=rev +1: markt -1: + +* Fix cluster replication problem: session expiration uses a replication + shortcut, so that attributes changed immediately before invalidation do + not get replicated before the expiration replication message. + That's a problem in case a session listener needs the changed attribute. + Patch: http://people.apache.org/~rjung/patches/TC5.5-cluster-replicate-before-expire.patch + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812295 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Mon Sep 7 22:16:16 2009
New Revision: 812295
URL: http://svn.apache.org/viewvc?rev=812295&view=rev
Log:
Remove reference to deleted class
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=812295&r1=812294&r2=812295&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Mon
Sep 7 22:16:16 2009
@@ -109,8 +109,6 @@
private final static void loadUtilPackage(ClassLoader loader)
throws Exception {
String basePackage = "org.apache.catalina.";
-loader.loadClass
-(basePackage + "util.URL");
loader.loadClass(basePackage + "util.Enumerator");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47795] New: service sticky_session not being set correctly with multiple isapi_redirect.dll loaded
https://issues.apache.org/bugzilla/show_bug.cgi?id=47795 Summary: service sticky_session not being set correctly with multiple isapi_redirect.dll loaded Product: Tomcat Connectors Version: 1.2.28 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: normal Priority: P2 Component: isapi AssignedTo: dev@tomcat.apache.org ReportedBy: chris.mo...@healthlink.net --- Comment #0 from ceemour 2009-09-07 15:25:11 PDT --- Have an IIS 6 Web site with isapi redirects to two tomcat engines with sticky support enabled. isapi filters are the 1.2.28 with chunked encoding suport. When only a single isapi is loaded into IIS all is fine here is the output of the isapi log with loglevel set to trace first request as expected no sticky yet with id =empty [Tue Sep 08 10:15:17.455 2009] [2500:2532] [trace] jk_lb_worker.c (1065): enter [Tue Sep 08 10:15:17.455 2009] [2500:2532] [debug] jk_lb_worker.c (1114): service sticky_session=1 id='empty' [Tue Sep 08 10:15:17.455 2009] [2500:2532] [trace] jk_lb_worker.c (903): enter [Tue Sep 08 10:15:17.455 2009] [2500:2532] [debug] jk_lb_worker.c (997): found best worker ndb1 (ndb1) using method 'Request' second request beautiful found the worker with the correct route [Tue Sep 08 10:15:17.533 2009] [2500:2532] [trace] jk_lb_worker.c (1065): enter [Tue Sep 08 10:15:17.533 2009] [2500:2532] [debug] jk_lb_worker.c (1114): service sticky_session=1 id='4E30F16C3E76C48D4F9E444B360CDC54.ndb1' [Tue Sep 08 10:15:17.533 2009] [2500:2532] [trace] jk_lb_worker.c (903): enter [Tue Sep 08 10:15:17.533 2009] [2500:2532] [debug] jk_lb_worker.c (942): searching worker for partial sessionid 4E30F16C3E76C48D4F9E444B360CDC54.ndb1 [Tue Sep 08 10:15:17.533 2009] [2500:2532] [debug] jk_lb_worker.c (950): searching worker for session route ndb1 [Tue Sep 08 10:15:17.533 2009] [2500:2532] [debug] jk_lb_worker.c (964): found worker ndb1 (ndb1) for route ndb1 and partial sessionid 4E30F16C3E76C48D4F9E444B360CDC54.ndb1 [Tue Sep 08 10:15:17.533 2009] [2500:2532] [trace] jk_lb_worker.c (967): exit in this case the jvmroute parameter has been set to ndb1 in the first tomcat If I add another instance of the isapi dll into the web site I get an unusual service sticky_session log entry [Tue Sep 08 10:21:08.705 2009] [3936:3008] [trace] jk_lb_worker.c (1065): enter [Tue Sep 08 10:21:08.705 2009] [3936:3008] [debug] jk_lb_worker.c (1114): service sticky_session=3682862 id='blah blah blah' [Tue Sep 08 10:21:08.705 2009] [3936:3008] [trace] jk_lb_worker.c (903): enter [Tue Sep 08 10:21:08.705 2009] [3936:3008] [debug] jk_lb_worker.c (942): searching worker for partial sessionid blah blah blah [Tue Sep 08 10:21:08.705 2009] [3936:3008] [debug] jk_lb_worker.c (950): searching worker for session route blah blah blah [Tue Sep 08 10:21:08.705 2009] [3936:3008] [debug] jk_lb_worker.c (997): found best worker ndb1 (ndb1) using method 'Request' The service sticky_session=3682862 is incorrect and so is the information after it and there is no way that stickiness can work -- 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 47796] New: StandardContext's annotationProcessor field gets cached between webapp start/stop cycles
https://issues.apache.org/bugzilla/show_bug.cgi?id=47796 Summary: StandardContext's annotationProcessor field gets cached between webapp start/stop cycles Product: Tomcat 6 Version: 6.0.20 Platform: PC OS/Version: Windows XP Status: NEW Severity: major Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: 20090...@csokker.hu --- Comment #0 from mrbrush <20090...@csokker.hu> 2009-09-07 16:21:00 PDT --- Created an attachment (id=24222) Patch file contatining the proposed fix When a webapp is stopped in tomcat, the annotationProcessor field does not get nullified. When the webapp is started again, the start() method of the StandardContext class checks whether the annotationProcessor field is null, and only builds a new one if so. This means that the annotationProcessor gets reused between application start/stop cycles (not tomcat restart cycles). Things that are dependent on the annotationProcessor (like injection, etc) may be broken because of this. One specific example is when using OpenEJB tomcat integration. The annotationProcesor itself holds a reference to a javax.naming.Context, which is cached between context start/stop cycles. This causes that after a stop/start cycle of a context, the annotationProcessor tries to inject the EJB reference proxies made at the first start of the context, which was made against different instances of the to-be-injected fields' classes. This results that the EJB injection is not working. Other types of injections may be broken too. Attached patch file containing the fix. Tested, works. -- 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 47796] StandardContext's annotationProcessor field gets cached between webapp start/stop cycles
https://issues.apache.org/bugzilla/show_bug.cgi?id=47796 mrbrush <20090...@csokker.hu> changed: What|Removed |Added CC||20090...@csokker.hu -- 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 47795] service sticky_session not being set correctly with multiple isapi_redirect.dll loaded
https://issues.apache.org/bugzilla/show_bug.cgi?id=47795 --- Comment #1 from ceemour 2009-09-07 22:05:23 PDT --- blah blah blah represents some random mumbly jumbly from the request, definitely not the JSESSIONID -- 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
