Author: markt
Date: Mon Aug 12 14:27:33 2013
New Revision: 1513148
URL: http://svn.apache.org/r1513148
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55404
Log warnings as warnings
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
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=1513148&r1=1513147&r2=1513148&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Aug 12
14:27:33 2013
@@ -1027,7 +1027,7 @@ public class ContextConfig implements Li
for (int j = 0; j < roles.length; j++) {
if (!"*".equals(roles[j]) &&
!context.findSecurityRole(roles[j])) {
- log.info(sm.getString("contextConfig.role.auth",
roles[j]));
+ log.warn(sm.getString("contextConfig.role.auth",
roles[j]));
context.addSecurityRole(roles[j]);
}
}
@@ -1039,14 +1039,14 @@ public class ContextConfig implements Li
Wrapper wrapper = (Wrapper) wrappers[i];
String runAs = wrapper.getRunAs();
if ((runAs != null) && !context.findSecurityRole(runAs)) {
- log.info(sm.getString("contextConfig.role.runas", runAs));
+ log.warn(sm.getString("contextConfig.role.runas", runAs));
context.addSecurityRole(runAs);
}
String names[] = wrapper.findSecurityReferences();
for (int j = 0; j < names.length; j++) {
String link = wrapper.findSecurityReference(names[j]);
if ((link != null) && !context.findSecurityRole(link)) {
- log.info(sm.getString("contextConfig.role.link", link));
+ log.warn(sm.getString("contextConfig.role.link", link));
context.addSecurityRole(link);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1513148&r1=1513147&r2=1513148&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon
Aug 12 14:27:33 2013
@@ -54,9 +54,9 @@ contextConfig.jspFile.error=JSP file {0}
contextConfig.jspFile.warning=WARNING: JSP file {0} must start with a ''/'' in
Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
contextConfig.resourceJarFail=Failed to processes JAR found at URL [{0}] for
static resources to be included in context with name [{0}]
-contextConfig.role.auth=WARNING: Security role name {0} used in an
<auth-constraint> without being defined in a <security-role>
-contextConfig.role.link=WARNING: Security role name {0} used in a <role-link>
without being defined in a <security-role>
-contextConfig.role.runas=WARNING: Security role name {0} used in a <run-as>
without being defined in a <security-role>
+contextConfig.role.auth=Security role name {0} used in an <auth-constraint>
without being defined in a <security-role>
+contextConfig.role.link=Security role name {0} used in a <role-link> without
being defined in a <security-role>
+contextConfig.role.runas=Security role name {0} used in a <run-as> without
being defined in a <security-role>
contextConfig.sci.debug=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing
contextConfig.sci.info=Unable to process ServletContainerInitializer for
[{0}]. This is most likely due to a class defined in the @HandlesTypes
annotation being missing. Enable DEBUG level logging for the full stack trace.
contextConfig.servletContainerInitializerFail=Failed to process JAR found at
URL [{0}] for ServletContainerInitializers for context with name [{1}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
