Author: markt
Date: Tue Jan 23 19:37:55 2007
New Revision: 499237
URL: http://svn.apache.org/viewvc?view=rev&rev=499237
Log:
Resolve inconsistency between log level and message. Patch suggested by Suzuki
Yuichiro.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_ja.properties
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=499237&r1=499236&r2=499237
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Tue Jan 23 19:37:55 2007
@@ -1271,7 +1271,7 @@
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]);
}
}
@@ -1283,14 +1283,14 @@
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/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties?view=diff&rev=499237&r1=499236&r2=499237
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Tue Jan 23 19:37:55 2007
@@ -19,9 +19,9 @@
contextConfig.fixDocBase=Exception fixing docBase: {0}
contextConfig.init=ContextConfig: Initializing
contextConfig.missingRealm=No Realm has been configured to authenticate against
-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.start=ContextConfig: Processing START
contextConfig.stop=ContextConfig: Processing STOP
contextConfig.tldEntryException=Exception processing TLD {0} in JAR at
resource path {1} in context {2}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_es.properties?view=diff&rev=499237&r1=499236&r2=499237
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_es.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_es.properties
Tue Jan 23 19:37:55 2007
@@ -17,9 +17,9 @@
contextConfig.defaultParse=Error de evaluación (parse) en el arcivo web.xml
por defecto
contextConfig.defaultPosition=Se ha producido en la línea {0} columna {1}
contextConfig.missingRealm=Algún reino (realm) no ha sido configurado para
realizar la autenticación
-contextConfig.role.auth=ATENCIÓN: El nombre de papel de seguridad {0} es usado
en un <auth-constraint> sin haber sido definido en <security-role>
-contextConfig.role.link=ATENCIÓN: El nombre de papel de seguridad {0} es usado
en un <role-link> sin haber sido definido en <security-role>
-contextConfig.role.runas=ATENCIÓN: El nombre de papel de seguridad {0} es
usado en un <run-as> sin haber sido definido en <security-role>
+contextConfig.role.auth=El nombre de papel de seguridad {0} es usado en un
<auth-constraint> sin haber sido definido en <security-role>
+contextConfig.role.link=El nombre de papel de seguridad {0} es usado en un
<role-link> sin haber sido definido en <security-role>
+contextConfig.role.runas=El nombre de papel de seguridad {0} es usado en un
<run-as> sin haber sido definido en <security-role>
contextConfig.start="ContextConfig": Tratamiento del "START"
contextConfig.stop="ContextConfig": Tratamiento del "STOP"
contextConfig.tldEntryException=Excepción durante el tratamiento de la TLD {0}
en el JAR indicado por la trayectoria de recurso {1}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_fr.properties?view=diff&rev=499237&r1=499236&r2=499237
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_fr.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_fr.properties
Tue Jan 23 19:37:55 2007
@@ -17,9 +17,9 @@
contextConfig.defaultParse=Erreur d''évaluation (parse) dans le fichier
web.xml par défaut
contextConfig.defaultPosition=S''est produite à la ligne {0} colonne {1}
contextConfig.missingRealm=Aucun royaume (realm) n''a été configuré pour
réaliser l''authentification
-contextConfig.role.auth=ATTENTION: Le nom de rôle de sécurité {0} est utilisé
dans un <auth-constraint> sans avoir été défini dans <security-role>
-contextConfig.role.link=ATTENTION: Le nom de rôle de sécurité {0} est utilisé
dans un <role-link> sans avoir été défini dans <security-role>
-contextConfig.role.runas=ATTENTION: Le nom de rôle de sécurité {0} est utilisé
dans un <run-as> sans avoir été défini dans <security-role>
+contextConfig.role.auth=Le nom de rôle de sécurité {0} est utilisé dans un
<auth-constraint> sans avoir été défini dans <security-role>
+contextConfig.role.link=Le nom de rôle de sécurité {0} est utilisé dans un
<role-link> sans avoir été défini dans <security-role>
+contextConfig.role.runas=Le nom de rôle de sécurité {0} est utilisé dans un
<run-as> sans avoir été défini dans <security-role>
contextConfig.start="ContextConfig": Traitement du "START"
contextConfig.stop="ContextConfig": Traitement du "STOP"
contextConfig.tldEntryException=Exception lors du traitement de la TLD {0}
dans le JAR indiqué par le chemin de ressource {1}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_ja.properties?view=diff&rev=499237&r1=499236&r2=499237
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_ja.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings_ja.properties
Tue Jan 23 19:37:55 2007
@@ -17,9 +17,9 @@
contextConfig.defaultParse=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eweb.xml\u4e2d\u306e\u89e3\u6790\u30a8\u30e9\u30fc\u3067\u3059
contextConfig.defaultPosition={0}\u884c\u306e{1}\u5217\u76ee\u3067\u767a\u751f\u3057\u307e\u3057\u305f
contextConfig.missingRealm=\u8a8d\u8a3c\u3059\u308b\u305f\u3081\u306b\u30ec\u30eb\u30e0\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-contextConfig.role.auth=\u8b66\u544a:
<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<auth-constraint>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
-contextConfig.role.link=\u8b66\u544a:
<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<role-link>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
-contextConfig.role.runas=\u8b66\u544a:
<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0} \u304c<run-as>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
+contextConfig.role.auth=<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<auth-constraint>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
+contextConfig.role.link=<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0}
\u304c<role-link>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
+contextConfig.role.runas=<security-role>\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u540d
{0} \u304c<run-as>\u306e\u4e2d\u3067\u4f7f\u7528\u3055\u308c\u307e\u3057\u305f
contextConfig.start=ContextConfig:
\u51e6\u7406\u3092\u958b\u59cb\u3057\u307e\u3059
contextConfig.stop=ContextConfig:
\u51e6\u7406\u3092\u505c\u6b62\u3057\u307e\u3059
contextConfig.tldEntryException=\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9 {1}
\u306eJAR\u30d5\u30a1\u30a4\u30eb\u306eTLD {0}
\u3092\u51e6\u7406\u4e2d\u306e\u4f8b\u5916\u3067\u3059
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=499237&r1=499236&r2=499237
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jan 23 19:37:55 2007
@@ -217,6 +217,10 @@
<bug>39255</bug>: NPE in AuthenticatorBase when logging level is set
to DEBUG
and no prinicpal found. (yoavs)
</fix>
+ <fix>
+ <bug>41437</bug>: Make log messages and loglevel consistent during
Context
+ start. Patch provided by Suzuki Yuichiro. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
