svn commit: r943032 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

[markt]

Author: markt
Date: Tue May 11 08:01:52 2010
New Revision: 943032

URL: http://svn.apache.org/viewvc?rev=943032&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49269
Set maxIdle to maxActive by default to prevent warning on start when maxIdle > 
maxActive
Patch provided by Matt Passell

Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=943032&r1=943031&r2=943032&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 Tue May 11 08:01:52 2010
@@ -47,7 +47,7 @@ public class PoolProperties implements P
 protected String connectionProperties;
 protected int initialSize = 10;
 protected int maxActive = 100;
-protected int maxIdle = Integer.MAX_VALUE;
+protected int maxIdle = maxActive;
 protected int minIdle = initialSize;
 protected int maxWait = 3;
 protected String validationQuery;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49269] Shouldn't see maxIdle > maxActive message with default props

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49269

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2010-05-11 04:03:11 EDT ---
Thanks for the patch. It has been applied to trunk.

-- 
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: r943065 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

[markt]

Author: markt
Date: Tue May 11 09:46:42 2010
New Revision: 943065

URL: http://svn.apache.org/viewvc?rev=943065&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49240
If a class can't be loaded, don't scan HandlesTypes for it
Also handle NoClassDefFoundError
Patch provided by pid

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=943065&r1=943064&r2=943065&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue May 11 
09:46:42 2010
@@ -1871,11 +1871,15 @@ public class ContextConfig
 
 Class clazz = null;
 try {
-clazz = Class.forName(className, true,
-context.getLoader().getClassLoader());
+clazz = context.getLoader().getClassLoader().loadClass(className);
+} catch (NoClassDefFoundError e) {
+log.debug(sm.getString("contextConfig.invalidSciHandlesTypes",
+className), e);
+return;
 } catch (ClassNotFoundException e) {
 log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
 className), e);
+return;
 }
 
 for (Map.Entry, Set> entry :



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49240] Error thrown during detection of ServletContainerInitializer's

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49240

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2010-05-11 05:48:34 EDT ---
Patch applied to trunk and will be included in 7.0.0 onwards.

Many thanks.

-- 
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: r943073 - in /tomcat/trunk/java/org/apache/catalina: connector/LocalStrings.properties connector/MapperListener.java core/mbeans-descriptors.xml

[markt]

Author: markt
Date: Tue May 11 10:18:55 2010
New Revision: 943073

URL: http://svn.apache.org/viewvc?rev=943073&view=rev
Log:
ContainerListener != LifecycleListener. Use the correct one.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=943073&r1=943072&r2=943073&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Tue 
May 11 10:18:55 2010
@@ -82,6 +82,6 @@ mapperListener.unregisterContext=Unregis
 mapperListener.registerWrapper=Register Wrapper {0} in Context {1}
 mapperListener.addMBeanListenerFail=Failed to add MBean notification listener 
for connector [{0}] in domain [{1}]. Adding Hosts, Contexts and Wrappers will 
not be visible to the connector.
 mapperListener.removeMBeanListenerFail=Failed to remove MBean notification 
listener for connector [{0}] in domain [{1}]. This may result in a memory leak.
-mapperLister.containerListenerFail=Failed to call method [{0}] on object 
[{1}]. Changes in the object state may not be correctly reflected in the mapper 
for connector [{2}] in domain [{3}].
+mapperLister.lifecycleListenerFail=Failed to call method [{0}] on object 
[{1}]. Changes in the object state may not be correctly reflected in the mapper 
for connector [{2}] in domain [{3}].
 
 inputBuffer.streamClosed=Stream closed

Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=943073&r1=943072&r2=943073&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Tue May 
11 10:18:55 2010
@@ -34,6 +34,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Wrapper;
 import org.apache.juli.logging.Log;
@@ -53,8 +55,7 @@ import org.apache.tomcat.util.res.String
  * @author Costin Manolache
  */
 public class MapperListener
-implements NotificationListener, ContainerListener
- {
+implements NotificationListener, ContainerListener, LifecycleListener {
 
 
 private static final Log log = LogFactory.getLog(MapperListener.class);
@@ -206,10 +207,10 @@ public class MapperListener
 String methodName = null;
 if (notification.getType().equals
 (MBeanServerNotification.REGISTRATION_NOTIFICATION)) {
-methodName = "addContainerListener";
+methodName = "addLifecycleListener";
 } else if (notification.getType().equals
 (MBeanServerNotification.UNREGISTRATION_NOTIFICATION)) {
-methodName = "removeContainerListener";
+methodName = "removeLifecycleListener";
 } else {
 return;
 }
@@ -231,18 +232,18 @@ public class MapperListener
 try {
 mBeanServer.invoke(objectName, methodName,
 new Object[] {this},
-new String[] 
{"org.apache.catalinaContainerListener"});
+new String[] 
{"org.apache.catalina.LifecycleListener"});
 } catch (ReflectionException e) {
 log.error(sm.getString(
-"mapperLister.containerListenerFail", methodName,
+"mapperLister.lifecycleListenerFail", methodName,
 objectName, connector, domain), e);
 } catch (MBeanException e) {
 log.error(sm.getString(
-"mapperLister.containerListenerFail", methodName,
+"mapperLister.lifecycleListenerFail", methodName,
 objectName, connector, domain), e);
 } catch (InstanceNotFoundException e) {
 log.error(sm.getString(
-"mapperLister.containerListenerFail", methodName,
+"mapperLister.lifecycleListenerFail", methodName,
 objectName, connector, domain), e);
 }
 }
@@ -254,25 +255,7 @@ public class MapperListen

Re: CSRF prevention filter and Tomcat 5/6

[Tim Funk]

+1 to E

-Tim

On 5/10/2010 11:47 AM, Mark Thomas wrote:

On 10/05/2010 13:25, Konstantin Kolinko wrote:

Thoughts?



It is possible to combine A+C:

E. Use a different name for the new role that allows access to GUI
interface only,
"manager-gui", as well as new "manager-script", "manager-jmx",
"manager-status".

We can even rename "manager" -> "manager-gui" in Tomcat 7.

The "manager" role is preserved as is, but is documented as
"deprecated" and is no longer recommended for use.


I like it. Neat solution.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r943081 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties MapperListener.java

[markt]

Author: markt
Date: Tue May 11 11:06:02 2010
New Revision: 943081

URL: http://svn.apache.org/viewvc?rev=943081&view=rev
Log:
No need to remove LifecycleListeners from destroyed components

Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=943081&r1=943080&r2=943081&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Tue 
May 11 11:06:02 2010
@@ -82,6 +82,6 @@ mapperListener.unregisterContext=Unregis
 mapperListener.registerWrapper=Register Wrapper {0} in Context {1}
 mapperListener.addMBeanListenerFail=Failed to add MBean notification listener 
for connector [{0}] in domain [{1}]. Adding Hosts, Contexts and Wrappers will 
not be visible to the connector.
 mapperListener.removeMBeanListenerFail=Failed to remove MBean notification 
listener for connector [{0}] in domain [{1}]. This may result in a memory leak.
-mapperLister.lifecycleListenerFail=Failed to call method [{0}] on object 
[{1}]. Changes in the object state may not be correctly reflected in the mapper 
for connector [{2}] in domain [{3}].
+mapperLister.lifecycleListenerFail=Failed to add Lifecycle listener to object 
[{0}]. Changes in the object state may not be correctly reflected in the mapper 
for connector [{1}] in domain [{2}].
 
 inputBuffer.streamClosed=Stream closed

Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=943081&r1=943080&r2=943081&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Tue May 
11 11:06:02 2010
@@ -204,14 +204,8 @@ public class MapperListener
 return;
 }
 
-String methodName = null;
-if (notification.getType().equals
+if (!notification.getType().equals
 (MBeanServerNotification.REGISTRATION_NOTIFICATION)) {
-methodName = "addLifecycleListener";
-} else if (notification.getType().equals
-(MBeanServerNotification.UNREGISTRATION_NOTIFICATION)) {
-methodName = "removeLifecycleListener";
-} else {
 return;
 }
 
@@ -230,21 +224,21 @@ public class MapperListener
 if ("Servlet".equals(type) || "WebModule".equals(type) ||
 "Host".equals(type)) {
 try {
-mBeanServer.invoke(objectName, methodName,
+mBeanServer.invoke(objectName, "addLifecycleListener",
 new Object[] {this},
 new String[] 
{"org.apache.catalina.LifecycleListener"});
 } catch (ReflectionException e) {
 log.error(sm.getString(
-"mapperLister.lifecycleListenerFail", methodName,
-objectName, connector, domain), e);
+"mapperLister.lifecycleListenerFail", objectName,
+connector, domain), e);
 } catch (MBeanException e) {
 log.error(sm.getString(
-"mapperLister.lifecycleListenerFail", methodName,
-objectName, connector, domain), e);
+"mapperLister.lifecycleListenerFail", objectName,
+connector, domain), e);
 } catch (InstanceNotFoundException e) {
 log.error(sm.getString(
-"mapperLister.lifecycleListenerFail", methodName,
-objectName, connector, domain), e);
+"mapperLister.lifecycleListenerFail", objectName,
+connector, domain), e);
 }
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 47237] Put a hard limit on Http11NioProcessor objects

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=47237

William Leung  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |

--- Comment #3 from William Leung  2010-05-11 07:41:36 EDT ---
Some issue found after this patch applied:
http://svn.apache.org/viewvc?rev=783155&view=rev

please check this steps:
1. start tomcat with connector - Http11NIOProtocol
2. use a console, and type:

[r...@localhost ~]# telnet 127.0.0.1 8080
  Trying 127.0.0.1...
  Connected to localhost (127.0.0.1).
  Escape character is '^]'.
 GET /test HTTP/1.0
 Host: test
  Connection closed by foreign host.

the server just close the socket, and nothing was logged


3. I try this on TC 6.0.20, and it's OK
   (Same result test for 6.0.26 with Http11Protocol)

[r...@localhost ~]# telnet 127.0.0.1 8080
  Trying 127.0.0.1...
  Connected to localhost (127.0.0.1).
  Escape character is '^]'.
 GET /test HTTP/1.0
 Host: test

 HTTP/1.1 404 Not Found
 Server: Apache-Coyote/1.1
 Content-Type: text/html;charset=utf-8
 Content-Length: 967
 Date: Tue, 11 May 2010 11:23:11 GMT
 Connection: close

 Apache Tomcat/6.0.20 - Error report
 ... ... Connection closed by foreign host.


It seems that this changes in http://svn.apache.org/viewvc?rev=783155&view=rev
of Http11NioProtocol.java causes this problem.

-- 
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 47237] Put a hard limit on Http11NioProcessor objects

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=47237

William Leung  changed:

   What|Removed |Added

 CC||l...@21cn.com

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r943081 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties MapperListener.java

[Konstantin Kolinko]

2010/5/11  :
> Author: markt
> Date: Tue May 11 11:06:02 2010
> New Revision: 943081
>
> URL: http://svn.apache.org/viewvc?rev=943081&view=rev
> Log:
> No need to remove LifecycleListeners from destroyed components
>
> Modified:
>    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
>    tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
>
> Modified: 
> tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=943081&r1=943080&r2=943081&view=diff
>

> --- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
> Tue May 11 11:06:02 2010
> -mapperLister.lifecycleListenerFail=Failed to call method [{0}] on object 
> [{1}]. Changes in the object state may not be correctly reflected in the 
> mapper for connector [{2}] in domain [{3}].
> +mapperLister.lifecycleListenerFail=Failed to add Lifecycle listener to 
> object [{0}]. Changes in the object state may not be correctly reflected in 
> the mapper for connector [{1}] in domain [{2}].

s/mapperLister./mapperListener./
both in *.properties and in *.java



Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r943110 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties MapperListener.java

[markt]

Author: markt
Date: Tue May 11 13:01:50 2010
New Revision: 943110

URL: http://svn.apache.org/viewvc?rev=943110&view=rev
Log:
Fix typos

Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=943110&r1=943109&r2=943110&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Tue 
May 11 13:01:50 2010
@@ -82,6 +82,6 @@ mapperListener.unregisterContext=Unregis
 mapperListener.registerWrapper=Register Wrapper {0} in Context {1}
 mapperListener.addMBeanListenerFail=Failed to add MBean notification listener 
for connector [{0}] in domain [{1}]. Adding Hosts, Contexts and Wrappers will 
not be visible to the connector.
 mapperListener.removeMBeanListenerFail=Failed to remove MBean notification 
listener for connector [{0}] in domain [{1}]. This may result in a memory leak.
-mapperLister.lifecycleListenerFail=Failed to add Lifecycle listener to object 
[{0}]. Changes in the object state may not be correctly reflected in the mapper 
for connector [{1}] in domain [{2}].
+mapperListener.lifecycleListenerFail=Failed to add Lifecycle listener to 
object [{0}]. Changes in the object state may not be correctly reflected in the 
mapper for connector [{1}] in domain [{2}].
 
 inputBuffer.streamClosed=Stream closed

Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=943110&r1=943109&r2=943110&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Tue May 
11 13:01:50 2010
@@ -229,15 +229,15 @@ public class MapperListener
 new String[] 
{"org.apache.catalina.LifecycleListener"});
 } catch (ReflectionException e) {
 log.error(sm.getString(
-"mapperLister.lifecycleListenerFail", objectName,
+"mapperListener.lifecycleListenerFail", objectName,
 connector, domain), e);
 } catch (MBeanException e) {
 log.error(sm.getString(
-"mapperLister.lifecycleListenerFail", objectName,
+"mapperListener.lifecycleListenerFail", objectName,
 connector, domain), e);
 } catch (InstanceNotFoundException e) {
 log.error(sm.getString(
-"mapperLister.lifecycleListenerFail", objectName,
+"mapperListener.lifecycleListenerFail", objectName,
 connector, domain), e);
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r943112 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

[markt]

Author: markt
Date: Tue May 11 13:09:43 2010
New Revision: 943112

URL: http://svn.apache.org/viewvc?rev=943112&view=rev
Log:
NPE protection

Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=943112&r1=943111&r2=943112&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue May 11 
13:09:43 2010
@@ -899,6 +899,10 @@ public abstract class ContainerBase exte
  */
 public void removeChild(Container child) {
 
+if (child == null) {
+return;
+}
+
 synchronized(children) {
 if (children.get(child.getName()) == null)
 return;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r943151 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

[markt]

Author: markt
Date: Tue May 11 15:48:36 2010
New Revision: 943151

URL: http://svn.apache.org/viewvc?rev=943151&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49235
Fix handlesTypes with annotations. The annotated class should be reported, not 
the annotation class.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=943151&r1=943150&r2=943151&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue May 11 
15:48:36 2010
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.lang.annotation.Annotation;
 import java.net.JarURLConnection;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -1857,7 +1858,8 @@ public class ContextConfig
 
 /**
  * For classes packaged with the web application, the class and each
- * super class needs to be checked for a match with {...@link 
HandlesTypes}.
+ * super class needs to be checked for a match with {...@link 
HandlesTypes} or
+ * for an annotation that matches {...@link HandlesTypes}.
  * @param javaClass
  */
 protected void checkHandlesTypes(JavaClass javaClass) {
@@ -1882,9 +1884,28 @@ public class ContextConfig
 return;
 }
 
+if (clazz.isAnnotation()) {
+// Skip
+return;
+}
+
+boolean match = false;
+
 for (Map.Entry, Set> entry :
 typeInitializerMap.entrySet()) {
-if (entry.getKey().isAssignableFrom(clazz)) {
+if (entry.getKey().isAnnotation()) {
+AnnotationEntry[] annotationEntries = 
javaClass.getAnnotationEntries();
+for (AnnotationEntry annotationEntry : annotationEntries) {
+if (entry.getKey().getName().equals(
+getClassName(annotationEntry.getAnnotationType( {
+match = true;
+break;
+}
+}
+} else if (entry.getKey().isAssignableFrom(clazz)) {
+match = true;
+}
+if (match) {
 for (ServletContainerInitializer sci : entry.getValue()) {
 initializerClassMap.get(sci).add(clazz);
 }
@@ -1892,6 +1913,16 @@ public class ContextConfig
 }
 }
 
+private static final String getClassName(String internalForm) {
+if (!internalForm.startsWith("L")) {
+return internalForm;
+}
+
+// Assume starts with L, ends with ; and uses / rather than .
+return internalForm.substring(1,
+internalForm.length() - 1).replace('/', '.');
+}
+
 protected void processAnnotationWebServlet(String className,
 AnnotationEntry ae, WebXml fragment) {
 String servletName = null;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49235] ServletContainerInitializer onStartup(Set> classSet is not expect class

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49235

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2010-05-11 11:49:02 EDT ---
Thanks for the report. This has been fixed in trunk and will be included in
7.0.0 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: r943155 - in /tomcat/trunk/java/org/apache/jasper: compiler/Validator.java tagplugins/jstl/Util.java

[markt]

Author: markt
Date: Tue May 11 15:53:10 2010
New Revision: 943155

URL: http://svn.apache.org/viewvc?rev=943155&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49228
Use English Locale since other Locale's may give add results

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=943155&r1=943154&r2=943155&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Tue May 11 
15:53:10 2010
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.Locale;
 
 import javax.el.ELException;
 import javax.el.ExpressionFactory;
@@ -330,7 +331,7 @@ class Validator {
 
 Node.Root root = pageDir.getRoot();
 String configEnc = root.getJspConfigPageEncoding();
-String pageDirEnc = thePageDirEnc.toUpperCase();
+String pageDirEnc = thePageDirEnc.toUpperCase(Locale.ENGLISH);
 
 /*
  * Compare the 'pageEncoding' attribute of the page directive with
@@ -339,7 +340,7 @@ class Validator {
  * "UTF-16LE" as identical.
  */
 if (configEnc != null) {
-configEnc = configEnc.toUpperCase();
+configEnc = configEnc.toUpperCase(Locale.ENGLISH);
 if (!pageDirEnc.equals(configEnc)
 && (!pageDirEnc.startsWith("UTF-16") || !configEnc
 .startsWith("UTF-16"))) {
@@ -359,7 +360,7 @@ class Validator {
  * identical.
  */
 if ((root.isXmlSyntax() && root.isEncodingSpecifiedInProlog()) || 
root.isBomPresent()) {
-String pageEnc = root.getPageEncoding().toUpperCase();
+String pageEnc = 
root.getPageEncoding().toUpperCase(Locale.ENGLISH);
 if (!pageDirEnc.equals(pageEnc)
 && (!pageDirEnc.startsWith("UTF-16") || !pageEnc
 .startsWith("UTF-16"))) {
@@ -387,7 +388,7 @@ class Validator {
 Node.TagDirective pageDir) throws JasperException {
 
 Node.Root root = pageDir.getRoot();
-String pageDirEnc = thePageDirEnc.toUpperCase();
+String pageDirEnc = thePageDirEnc.toUpperCase(Locale.ENGLISH);
 /*
  * Compare the 'pageEncoding' attribute of the page directive with
  * the encoding specified in the XML prolog (only for XML syntax,
@@ -396,7 +397,7 @@ class Validator {
  * identical.
  */
 if ((root.isXmlSyntax() && root.isEncodingSpecifiedInProlog()) || 
root.isBomPresent()) {
-String pageEnc = root.getPageEncoding().toUpperCase();
+String pageEnc = 
root.getPageEncoding().toUpperCase(Locale.ENGLISH);
 if (!pageDirEnc.equals(pageEnc)
 && (!pageDirEnc.startsWith("UTF-16") || !pageEnc
 .startsWith("UTF-16"))) {

Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=943155&r1=943154&r2=943155&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Tue May 11 
15:53:10 2010
@@ -119,7 +119,7 @@ public class Util {
 public static String getContentTypeAttribute(String input, String name) {
 int begin;
 int end;
-int index = input.toUpperCase().indexOf(name.toUpperCase());
+int index = 
input.toUpperCase(Locale.ENGLISH).indexOf(name.toUpperCase(Locale.ENGLISH));
 if (index == -1) return null;
 index = index + name.length(); // positioned after the attribute name
 index = input.indexOf('=', index); // positioned at the '='



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49228] toLowerCase()/toUpperCase() may not work OK in all Locales

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49228

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2010-05-11 11:53:37 EDT ---
Fixed in trunk and will be included in 7.0.0 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 47237] Put a hard limit on Http11NioProcessor objects

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=47237

Filip Hanik  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME

--- Comment #4 from Filip Hanik  2010-05-11 12:19:35 EDT ---
Tried both 6.0.x/trunk and trunk, returns 404 for the request

GET /test HTTP/1.0
Host: test

Notice, if you send an invalid request like 


GET /test HTTP/1.0
Host: test

with a CRLF missing, it simply times out and closes the connection. The request
is incomplete

-- 
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

WebappClassLoader.clearReferences removes root Java Logger handlers

[Ruslan Gainutdinov]

Hello!

I am using apache-tomcat-6.0.26 with Tanuki Wrapper.

In this particular setup, Juli is not used (no
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager) and
java.util.logging.LogManager returns standard Java SE instance.

org.apache.catalina.loader.WebappClassLoader.clearReferences() calls Juli
org.apache.juli.logging.LogFactory.release() which in turn
issues
LogManager.getLogManager().reset();

For Juli this, I suppose, means return to pristine state before any
changes have been done.
But for Java SE LogManager this REMOVES any handlers in root classloader.

This causes all logging to stop after such event as web application
redeployment.

I propose following change to Juli org.apache.juli.logging.LogFactory:

--- LogFactory.orig
+++ LogFactory.java
@@ -328,9 +328,11 @@
  */
 public static void release(
 @SuppressWarnings("unused") ClassLoader classLoader) {
+if (LogManager.getLogManager() instanceof ClassLoaderLogManager) {
 // JULI's log manager looks at the current classLoader
 LogManager.getLogManager().reset();
+ }
}

P.S. If needed, I can create bug in bugzilla.

With kindest personal regards,
Ruslan Gainutdinov


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49224] NullPointerException in PooledConnection when username or password are null

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49224

--- Comment #4 from Matt Passell  2010-05-11 
13:07:05 EDT ---
Created an attachment (id=25427)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25427)
only set username and password if the values are not null

Looking at how the dbProperties are just passed to the driver, it's clear that
any driver willing to accept a connection without a username or password should
be fine without values for those properties being passed through.  So, the
patch I'm attaching does just what Filip was suggesting and only sets the
username/password if they're not null.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: WebappClassLoader.clearReferences removes root Java Logger handlers

[Mark Thomas]

On 11/05/2010 18:52, Ruslan Gainutdinov wrote:

Hello!

I am using apache-tomcat-6.0.26 with Tanuki Wrapper.

In this particular setup, Juli is not used (no
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager) and
java.util.logging.LogManager returns standard Java SE instance.


This question belongs on the users list. Pretty much the exact same 
question was asked very recently. You could try searching the archives.


Mark



org.apache.catalina.loader.WebappClassLoader.clearReferences() calls Juli
org.apache.juli.logging.LogFactory.release() which in turn
issues
LogManager.getLogManager().reset();

For Juli this, I suppose, means return to pristine state before any
changes have been done.
But for Java SE LogManager this REMOVES any handlers in root classloader.

This causes all logging to stop after such event as web application
redeployment.

I propose following change to Juli org.apache.juli.logging.LogFactory:

--- LogFactory.orig
+++ LogFactory.java
@@ -328,9 +328,11 @@
   */
  public static void release(
  @SuppressWarnings("unused") ClassLoader classLoader) {
+if (LogManager.getLogManager() instanceof ClassLoaderLogManager) {
  // JULI's log manager looks at the current classLoader
  LogManager.getLogManager().reset();
+ }
 }

P.S. If needed, I can create bug in bugzilla.

With kindest personal regards,
Ruslan Gainutdinov


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org






-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r943250 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java

[markt]

Author: markt
Date: Tue May 11 19:51:45 2010
New Revision: 943250

URL: http://svn.apache.org/viewvc?rev=943250&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49227
Ensure case conversion behaves as expected
Patch provided by sebb

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=943250&r1=943249&r2=943250&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue May 
11 19:51:45 2010
@@ -20,6 +20,7 @@ package org.apache.coyote.http11;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.util.Locale;
 import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
@@ -1444,7 +1445,7 @@ public class Http11AprProcessor implemen
 String encodingName = null;
 while (commaPos != -1) {
 encodingName = transferEncodingValue.substring
-(startPos, commaPos).toLowerCase().trim();
+(startPos, commaPos).toLowerCase(Locale.ENGLISH).trim();
 if (!addInputFilter(inputFilters, encodingName)) {
 // Unsupported transfer encoding
 error = true;
@@ -1455,7 +1456,7 @@ public class Http11AprProcessor implemen
 commaPos = transferEncodingValue.indexOf(',', startPos);
 }
 encodingName = transferEncodingValue.substring(startPos)
-.toLowerCase().trim();
+.toLowerCase(Locale.ENGLISH).trim();
 if (!addInputFilter(inputFilters, encodingName)) {
 // Unsupported transfer encoding
 error = true;

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=943250&r1=943249&r2=943250&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue May 
11 19:51:45 2010
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.InetAddress;
 import java.nio.channels.SelectionKey;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.coyote.ActionCode;
@@ -933,7 +934,7 @@ public class Http11NioProcessor extends 
 String encodingName = null;
 while (commaPos != -1) {
 encodingName = transferEncodingValue.substring
-(startPos, commaPos).toLowerCase().trim();
+(startPos, commaPos).toLowerCase(Locale.ENGLISH).trim();
 if (!addInputFilter(inputFilters, encodingName)) {
 // Unsupported transfer encoding
 error = true;
@@ -944,7 +945,7 @@ public class Http11NioProcessor extends 
 commaPos = transferEncodingValue.indexOf(',', startPos);
 }
 encodingName = transferEncodingValue.substring(startPos)
-.toLowerCase().trim();
+.toLowerCase(Locale.ENGLISH).trim();
 if (!addInputFilter(inputFilters, encodingName)) {
 // Unsupported transfer encoding
 error = true;

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=943250&r1=943249&r2=943250&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 11 
19:51:45 2010
@@ -23,6 +23,7 @@ import java.net.InetAddress;
 import java.net.Socket;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.coyote.ActionCode;
@@ -771,7 +772,7 @@ public class Http11Processor extends Abs
 String encodingName = null;
 while (commaPos != -1) {
 encodingName = transferEncodingValue.substring
-(startPos, commaPos).toLowerCase().trim();
+(startPos, commaPos).toLowerCase(Lo

DO NOT REPLY [Bug 49227] toLowerCase()/toUpperCase() may not work OK in all Locales

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49227

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2010-05-11 15:52:06 EDT ---
Fixed. Will be in 7.0.0 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: r943260 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/util/ java/org/apache/catalin

[markt]

Author: markt
Date: Tue May 11 20:05:15 2010
New Revision: 943260

URL: http://svn.apache.org/viewvc?rev=943260&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49226
Ensure case conversion behaves as expected
Patch provided by sebb

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/http/AcceptLanguage.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java

tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java?rev=943260&r1=943259&r2=943260&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java Tue May 11 
20:05:15 2010
@@ -25,6 +25,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.MultipartConfigElement;
@@ -134,7 +135,7 @@ public class ApplicationPart implements 
 String fileName = null;
 String cd = getHeader("Content-Disposition");
 if (cd != null) {
-String cdl = cd.toLowerCase();
+String cdl = cd.toLowerCase(Locale.ENGLISH);
 if (cdl.startsWith("form-data") || cdl.startsWith("attachment")) {
 ParameterParser paramParser = new ParameterParser();
 paramParser.setLowerCaseNames(true);

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=943260&r1=943259&r2=943260&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Tue May 11 
20:05:15 2010
@@ -16,6 +16,8 @@
  */
 package org.apache.catalina.core;
 
+import java.util.Locale;
+
 import org.apache.catalina.Container;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
@@ -138,7 +140,7 @@ public class StandardEngine extends Cont
 if (host == null) {
 this.defaultHost = null;
 } else {
-this.defaultHost = host.toLowerCase();
+this.defaultHost = host.toLowerCase(Locale.ENGLISH);
 }
 support.firePropertyChange("defaultHost", oldDefaultHost,
this.defaultHost);

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=943260&r1=943259&r2=943260&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java T

DO NOT REPLY [Bug 49226] toLowerCase()/toUpperCase() may not work OK in all Locales

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49226

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2010-05-11 16:05:24 EDT ---
Fixed in trunk. Will be included in 7.0.0 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: r943290 - in /tomcat/trunk/webapps/manager: 401.jsp WEB-INF/web.xml

[markt]

Author: markt
Date: Tue May 11 21:02:19 2010
New Revision: 943290

URL: http://svn.apache.org/viewvc?rev=943290&view=rev
Log:
Change role name for Manager GUI access to manager-gui to align with planned 
changes to Tomcat 5/6

Modified:
tomcat/trunk/webapps/manager/401.jsp
tomcat/trunk/webapps/manager/WEB-INF/web.xml

Modified: tomcat/trunk/webapps/manager/401.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/401.jsp?rev=943290&r1=943289&r2=943290&view=diff
==
--- tomcat/trunk/webapps/manager/401.jsp (original)
+++ tomcat/trunk/webapps/manager/401.jsp Tue May 11 21:02:19 2010
@@ -39,13 +39,13 @@
 file must contain the credentials to let you use this webapp.


-For example, to add the manager role to a user named
+For example, to add the manager-gui role to a user named
 tomcat with a password of s3cret, add the following to 
the
 config file listed above.

 
-
-
+
+
 

 Note that for Tomcat 7 onwards, the roles required to use the manager
@@ -54,7 +54,7 @@
 the functionality you wish to access.

 
-  manager - allows access to the HTML GUI and the status
+  manager-gui - allows access to the HTML GUI and the status
   pages
   manager-script - allows access to the text interface and the
   status pages

Modified: tomcat/trunk/webapps/manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/web.xml?rev=943290&r1=943289&r2=943290&view=diff
==
--- tomcat/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/web.xml Tue May 11 21:02:19 2010
@@ -105,7 +105,7 @@
   /html/*
 
 
-   manager
+   manager-gui
 
   
   
@@ -132,7 +132,7 @@
   /status/*
 
 
-   manager
+   manager-gui
manager-script
manager-jmx
manager-status
@@ -150,7 +150,7 @@
 
   The role that is required to access the HTML Manager pages
 
-manager
+manager-gui
   
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org