10:04 a.m.
Author: remy.maucherat(a)jboss.com
Date: 2012-08-27 11:04:39 -0400 (Mon, 27 Aug 2012)
New Revision: 2068
Added:
trunk/src/main/resources/
trunk/src/main/resources/org/
trunk/src/main/resources/org/apache/
trunk/src/main/resources/org/apache/catalina/
trunk/src/main/resources/org/apache/catalina/util/
trunk/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties
trunk/src/main/resources/org/apache/tomcat/
trunk/src/main/resources/org/apache/tomcat/util/
trunk/src/main/resources/org/apache/tomcat/util/http/
trunk/src/main/resources/org/apache/tomcat/util/http/HttpMessages.properties
Removed:
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings.properties
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_es.properties
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
trunk/src/main/java/org/apache/catalina/realm/LocalStrings.properties
trunk/src/main/java/org/apache/catalina/realm/LocalStrings_es.properties
trunk/src/main/java/org/apache/catalina/realm/LocalStrings_fr.properties
trunk/src/main/java/org/apache/catalina/realm/LocalStrings_ja.properties
Modified:
trunk/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java
trunk/src/main/java/org/apache/catalina/valves/AccessLogValve.java
trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
trunk/src/main/java/org/apache/catalina/valves/EventOrAsyncConnectionManagerValve.java
trunk/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java
trunk/src/main/java/org/apache/catalina/valves/RequestFilterValve.java
trunk/src/main/java/org/apache/catalina/valves/SSLValve.java
trunk/src/main/java/org/apache/catalina/valves/SemaphoreValve.java
trunk/src/main/java/org/jboss/web/CatalinaMessages.java
Log:
- Move on to another package.
- Add some needed properties files I forgot to commit.
Modified: trunk/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java
===================================================================
---
trunk/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2012-08-24
13:44:02 UTC (rev 2067)
+++
trunk/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2012-08-27
15:04:39 UTC (rev 2068)
@@ -50,9 +50,8 @@
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
-import org.jboss.logging.Logger;
+import org.jboss.web.CatalinaLogger;
/**
@@ -79,7 +78,6 @@
public abstract class AuthenticatorBase
extends ValveBase
implements Authenticator, Lifecycle {
- private static Logger log = Logger.getLogger(AuthenticatorBase.class);
// ----------------------------------------------------- Instance Variables
@@ -301,8 +299,8 @@
// Is there an SSO session against which we can try to reauthenticate?
String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
if (ssoId != null) {
- if (log.isDebugEnabled())
- log.debug("SSO Id " + ssoId + " set; attempting " +
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled())
+ CatalinaLogger.AUTH_LOGGER.debug("SSO Id " + ssoId + "
set; attempting " +
"reauthentication");
/* Try to reauthenticate using data cached by SSO. If this fails,
either the original SSO logon was of DIGEST or SSL (which
@@ -340,8 +338,8 @@
public void invoke(Request request, Response response)
throws IOException, ServletException {
- if (log.isDebugEnabled())
- log.debug("Security checking request " +
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled())
+ CatalinaLogger.AUTH_LOGGER.debug("Security checking request " +
request.getMethod() + " " + request.getRequestURI());
LoginConfig config = this.context.getLoginConfig();
@@ -353,8 +351,8 @@
if (session != null) {
principal = session.getPrincipal();
if (principal != null) {
- if (log.isDebugEnabled())
- log.debug("We have cached auth type " +
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled())
+ CatalinaLogger.AUTH_LOGGER.debug("We have cached auth
type " +
session.getAuthType() +
" for principal " +
session.getPrincipal());
@@ -373,8 +371,8 @@
if (requestURI.startsWith(contextPath) &&
requestURI.endsWith(Constants.FORM_ACTION)) {
if (!authenticate(request, response, config)) {
- if (log.isDebugEnabled())
- log.debug(" Failed authenticate() test ??" + requestURI );
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled())
+ CatalinaLogger.AUTH_LOGGER.debug(" Failed authenticate() test
??" + requestURI );
return;
}
}
@@ -386,8 +384,8 @@
if ((constraints == null) /* &&
(!Constants.FORM_METHOD.equals(config.getAuthMethod())) */ ) {
- if (log.isDebugEnabled())
- log.debug(" Not subject to any constraint");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled())
+ CatalinaLogger.AUTH_LOGGER.debug(" Not subject to any
constraint");
getNext().invoke(request, response);
return;
}
@@ -413,13 +411,13 @@
int i;
// Enforce any user data constraint for this security constraint
- if (log.isDebugEnabled()) {
- log.debug(" Calling hasUserDataPermission()");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Calling
hasUserDataPermission()");
}
if (!realm.hasUserDataPermission(request, response,
constraints)) {
- if (log.isDebugEnabled()) {
- log.debug(" Failed hasUserDataPermission() test");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Failed hasUserDataPermission()
test");
}
/*
* ASSERT: Authenticator already set the appropriate
@@ -443,12 +441,12 @@
}
if(authRequired) {
- if (log.isDebugEnabled()) {
- log.debug(" Calling authenticate()");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Calling authenticate()");
}
if (!authenticate(request, response, config)) {
- if (log.isDebugEnabled()) {
- log.debug(" Failed authenticate() test");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Failed authenticate()
test");
}
/*
* ASSERT: Authenticator already set the appropriate
@@ -459,14 +457,14 @@
}
}
- if (log.isDebugEnabled()) {
- log.debug(" Calling accessControl()");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Calling accessControl()");
}
if (!realm.hasResourcePermission(request, response,
constraints,
this.context)) {
- if (log.isDebugEnabled()) {
- log.debug(" Failed accessControl() test");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Failed accessControl()
test");
}
/*
* ASSERT: AccessControl method has already set the
@@ -477,8 +475,8 @@
}
// Any and all specified constraints have been satisfied
- if (log.isDebugEnabled()) {
- log.debug(" Successfully passed all security constraints");
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Successfully passed all security
constraints");
}
getNext().invoke(request, response);
@@ -566,8 +564,8 @@
if (reauthenticated) {
associate(ssoId, request.getSessionInternal(true));
- if (log.isDebugEnabled()) {
- log.debug(" Reauthenticated cached principal '" +
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
+ CatalinaLogger.AUTH_LOGGER.debug(" Reauthenticated cached principal
'" +
request.getUserPrincipal().getName() +
"' with auth type '" + request.getAuthType()
+ "'");
}
@@ -594,8 +592,8 @@
Principal principal, String authType,
String username, String password) {
- if (log.isDebugEnabled())
- log.debug("Authenticated '" + principal.getName() + "'
with type '"
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled())
+ CatalinaLogger.AUTH_LOGGER.debug("Authenticated '" +
principal.getName() + "' with type '"
+ authType + "'");
// Cache the authentication information in our request
@@ -790,11 +788,11 @@
if (sso == null)
parent = parent.getParent();
}
- if (log.isDebugEnabled()) {
+ if (CatalinaLogger.AUTH_LOGGER.isDebugEnabled()) {
if (sso != null)
- log.debug("Found SingleSignOn Valve at " + sso);
+ CatalinaLogger.AUTH_LOGGER.debug("Found SingleSignOn Valve at "
+ sso);
else
- log.debug("No SingleSignOn Valve is present");
+ CatalinaLogger.AUTH_LOGGER.debug("No SingleSignOn Valve is
present");
}
}
Deleted: trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings.properties
===================================================================
---
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,19 +0,0 @@
-authenticator.alreadyStarted=Security Interceptor has already been started
-authenticator.certificates=No client certificate chain in this request
-authenticator.forbidden=Access to the requested resource has been denied
-authenticator.formlogin=Invalid direct reference to form login page
-authenticator.invalid=Invalid client certificate chain in this request
-authenticator.keystore=Exception loading key store
-authenticator.manager=Exception initializing trust managers
-authenticator.notAuthenticated=Configuration error: Cannot perform access control
without an authenticated principal
-authenticator.notContext=Configuration error: Must be attached to a Context
-authenticator.notStarted=Security Interceptor has not yet been started
-authenticator.requestBodyTooBig=The request body was too large to be cached during the
authentication process
-authenticator.sessionExpired=The time allowed for the login process has been exceeded. If
you wish to continue you must either click back twice and re-click the link you requested
or close and re-open your browser
-authenticator.unauthorized=Cannot authenticate with the provided credentials
-authenticator.userDataConstraint=This request violates a User Data constraint for this
application
-
-formAuthenticator.forwardErrorFail=Unexpected error forwarding to error page
-formAuthenticator.forwardLoginFail=Unexpected error forwarding to login page
-
-digestAuthenticator.cacheRemove=A valid entry has been removed from client nonce cache to
make room for new entries. A replay attack is now possible. To prevent the possibility of
replay attacks, reduce nonceValidity or increase cnonceCacheSize. Further warnings of this
type will be suppressed for 5 minutes
Deleted: trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_es.properties
===================================================================
---
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_es.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_es.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-authenticator.alreadyStarted = El interceptor de seguridad ya ha sido arrancado
-authenticator.certificates = No hay cadena de certificados del cliente en esta
petici\u00F3n
-authenticator.forbidden = El acceso al recurso pedido ha sido denegado
-authenticator.formlogin = Referencia directa al formulario de conexi\u00F3n (p\u00E1gina
de formulario de login) inv\u00E1lida
-authenticator.invalid = No es v\u00E1lida la cadena de certificados del cliente en esta
petici\u00F3n
-authenticator.keystore = Excepci\u00F3n cargando el almac\u00E9n de claves
-authenticator.manager = Excepci\u00F3n inicializando administradores de confianza
-authenticator.notAuthenticated = Error de Configuraci\u00F3n\: No se pueden realizar
funciones de control de acceso sin un principal autenticado
-authenticator.notContext = Error de Configuraci\u00F3n\: Debe de estar unido a un
Contexto
-authenticator.notStarted = El Interceptor de seguridad no sido a\u00FAn iniciado
-authenticator.requestBodyTooBig = El cuerpo del requerimiento era demasiado grande para
realizar cach\u00E9 durante el proceso de autenticaci\u00F3n
-authenticator.sessionExpired = El tiempo permitido para realizar login ha sido excedido.
Si deseas continuar, debes hacer clik dos veces y volver a hacer clik otra vez o cerrar y
reabrir tu navegador
-authenticator.unauthorized = Imposible autenticar mediante las credenciales
suministradas
-authenticator.userDataConstraint = Esta petici\u00F3n viola una Restrici\u00F3n de Datos
de usuario para esta aplicaci\u00F3n
Deleted: trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
===================================================================
---
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,12 +0,0 @@
-authenticator.alreadyStarted=L''intercepteur de s�curit� (security interceptor) a
d�j� �t� d�marr�
-authenticator.certificates=Aucune cha�ne de certificat client (client certificate chain)
dans cette requ�te
-authenticator.forbidden=L''acc�s � la ressource demand�e a �t� interdit
-authenticator.formlogin=R�f�rence directe � la form de connexion (form login page)
invalide
-authenticator.invalid=Cha�ne de certificat client invalide dans cette requ�te
-authenticator.keystore=Exception lors du chargement du r�f�rentiel de clefs (key store)
-authenticator.manager=Exception lors de l''initialisation des gestionnaires
d''authentification (trust managers)
-authenticator.notAuthenticated=Erreur de configuration: Impossible de proc�der � un
contr�le d''acc�s sans un principal authentifi� (authenticated principal)
-authenticator.notContext=Erreur de configuration: Doit �tre attach� � un contexte
-authenticator.notStarted=L''intercepteur de s�curit� (security interceptor)
n''a pas encore �t� d�marr�
-authenticator.unauthorized=Impossible d''authentifier avec les cr�dits fournis
(provided credentials)
-authenticator.userDataConstraint=Cette requ�te viole une contrainte donn�e utilisateur
(user data constraint) pour cette application
Deleted: trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
===================================================================
---
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++
trunk/src/main/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,13 +0,0 @@
-authenticator.alreadyStarted=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
-authenticator.certificates=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u306f\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c\u30c1\u30a7\u30fc\u30f3\u304c\u3042\u308a\u307e\u305b\u3093
-authenticator.forbidden=\u30ea\u30af\u30a8\u30b9\u30c8\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f
-authenticator.formlogin=\u30d5\u30a9\u30fc\u30e0\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u3078\u306e\u7121\u52b9\u306a\u76f4\u63a5\u53c2\u7167\u3067\u3059
-authenticator.invalid=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u7121\u52b9\u306a\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c\u30c1\u30a7\u30fc\u30f3\u304c\u3042\u308a\u307e\u3059
-authenticator.keystore=\u30ad\u30fc\u30b9\u30c8\u30a2\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-authenticator.manager=\u30c8\u30e9\u30b9\u30c8\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u521d\u671f\u5316\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-authenticator.notAuthenticated=\u8a2d\u5b9a\u30a8\u30e9\u30fc:
\u8a8d\u8a3c\u3055\u308c\u305f\u4e3b\u4f53\u306a\u3057\u306b\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093
-authenticator.notContext=\u8a2d\u5b9a\u30a8\u30e9\u30fc:
\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-authenticator.notStarted=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-authenticator.sessionExpired=\u30ed\u30b0\u30a4\u30f3\u30d7\u30ed\u30bb\u30b9\u306b\u8a8d\u3081\u3089\u308c\u3066\u3044\u305f\u6642\u9593\u304c\u904e\u304e\u307e\u3057\u305f\u3002\u7d99\u7d9a\u3057\u305f\u3044\u306a\u3089\u3070\uff0c\u30d0\u30c3\u30af\u30dc\u30bf\u30f3\u30922\u5ea6\u62bc\u3057\u3066\u304b\u3089\u518d\u5ea6\u30ea\u30f3\u30af\u3092\u62bc\u3059\u304b\uff0c\u30d6\u30e9\u30a6\u30b6\u3092\u7acb\u3061\u4e0a\u3052\u76f4\u3057\u3066\u304f\u3060\u3055\u3044
-authenticator.unauthorized=\u7528\u610f\u3055\u308c\u305f\u8a3c\u660e\u66f8\u3067\u8a8d\u8a3c\u3067\u304d\u307e\u305b\u3093
-authenticator.userDataConstraint=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u3001\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u306e\u5236\u9650\u306b\u9055\u53cd\u3057\u3066\u3044\u307e\u3059
Deleted: trunk/src/main/java/org/apache/catalina/realm/LocalStrings.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/realm/LocalStrings.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/realm/LocalStrings.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,84 +0,0 @@
-# $Id: LocalStrings.properties 970 2009-03-27 12:33:33Z remy.maucherat(a)jboss.com $
-
-# language
-
-# package org.apache.catalina.realm
-
-jaasRealm.beginLogin=JAASRealm login requested for username "{0}" using
LoginContext for application "{1}"
-jaasRealm.accountExpired=Username "{0}" NOT authenticated due to expired
account
-jaasRealm.authenticateFailure=Username "{0}" NOT successfully authenticated
-jaasRealm.authenticateSuccess=Username "{0}" successfully authenticated as
Principal "{1}" -- Subject was created too
-jaasRealm.credentialExpired=Username "{0}" NOT authenticated due to expired
credential
-jaasRealm.failedLogin=Username "{0}" NOT authenticated due to failed login
-jaasRealm.loginException=Login exception authenticating username "{0}"
-jaasRealm.unexpectedError=Unexpected error
-jaasRealm.loginContextCreated=JAAS LoginContext created for username "{0}"
-jaasRealm.userPrincipalSuccess=Subject for username "{0}" returned user
Principal "{1}"
-jaasRealm.userPrincipalFailure=Subject for username "{0}" did not return a
valid user Principal
-jaasRealm.cachePrincipal=User Principal "{0}" cached; has {1} role
Principal(s)
-jaasRealm.checkPrincipal=Checking Principal "{0}" [{1}]
-jaasRealm.userPrincipalSuccess=Principal "{0}" is a valid user class. We will
use this as the user Principal.
-jaasRealm.userPrincipalFailure=No valid user Principal found
-jaasRealm.rolePrincipalAdd=Adding role Principal "{0}" to this user
Principal''s roles
-jaasRealm.rolePrincipalSuccess={0} role Principal(s) found
-jaasRealm.rolePrincipalFailure=No valid role Principals found.
-jaasRealm.isInRole.start=Checking if user Principal "{0}" possesses role
"{1}"
-jaasRealm.isInRole.noPrincipalOrRole=No roles Principals found. User Principal or Subject
is null, or user Principal not in cache
-jaasRealm.isInRole.principalCached=User Principal has {0} role Principal(s)
-jaasRealm.isInRole.possessesRole=User Principal has a role Principal called
"{0}"
-jaasRealm.isInRole.match=Matching role Principal found.
-jaasRealm.isInRole.noMatch=Matching role Principal NOT found.
-jaasCallback.digestpassword=Digested password "{0}" as "{1}"
-jaasCallback.username=Returned username "{0}"
-jaasCallback.password=Returned password "{0}"
-jdbcRealm.authenticateFailure=Username {0} NOT successfully authenticated
-jdbcRealm.authenticateSuccess=Username {0} successfully authenticated
-jdbcRealm.close=Exception closing database connection
-jdbcRealm.exception=Exception performing authentication
-jdbcRealm.getPassword.exception=Exception retrieving password for "{0}"
-jdbcRealm.getRoles.exception=Exception retrieving roles for "{0}"
-jdbcRealm.open=Exception opening database connection
-jdbcRealm.open.invalidurl=Driver "{0}" does not support the url
"{1}"
-jndiRealm.authenticateFailure=Username {0} NOT successfully authenticated
-jndiRealm.authenticateSuccess=Username {0} successfully authenticated
-jndiRealm.close=Exception closing directory server connection
-jndiRealm.exception=Exception performing authentication
-jndiRealm.open=Exception opening directory server connection
-memoryRealm.authenticateFailure=Username {0} NOT successfully authenticated
-memoryRealm.authenticateSuccess=Username {0} successfully authenticated
-memoryRealm.loadExist=Memory database file {0} cannot be read
-memoryRealm.loadPath=Loading users from memory database file {0}
-memoryRealm.readXml=Exception while reading memory database file
-memoryRealm.xmlFeatureEncoding=Exception configuring digester to permit java encoding
names in XML files. Only IANA encoding names will be supported.
-realmBase.algorithm=Invalid message digest algorithm {0} specified
-realmBase.alreadyStarted=This Realm has already been started
-realmBase.digest=Error digesting user credentials
-realmBase.forbidden=Access to the requested resource has been denied
-realmBase.hasRoleFailure=Username {0} does NOT have role {1}
-realmBase.hasRoleSuccess=Username {0} has role {1}
-realmBase.notAuthenticated=Configuration error: Cannot perform access control without an
authenticated principal
-realmBase.notStarted=This Realm has not yet been started
-realmBase.authenticateFailure=Username {0} NOT successfully authenticated
-realmBase.authenticateSuccess=Username {0} successfully authenticated
-userDatabaseRealm.authenticateError=Login configuration error authenticating username
{0}
-userDatabaseRealm.lookup=Exception looking up UserDatabase under key {0}
-userDatabaseRealm.noDatabase=No UserDatabase component found under key {0}
-userDatabaseRealm.noEngine=No Engine component found in container hierarchy
-userDatabaseRealm.noGlobal=No global JNDI resources context found
-dataSourceRealm.authenticateFailure=Username {0} NOT successfully authenticated
-dataSourceRealm.authenticateSuccess=Username {0} successfully authenticated
-dataSourceRealm.close=Exception closing database connection
-dataSourceRealm.exception=Exception performing authentication
-dataSourceRealm.getPassword.exception=Exception retrieving password for "{0}"
-dataSourceRealm.getRoles.exception=Exception retrieving roles for "{0}"
-dataSourceRealm.open=Exception opening database connection
-combinedRealm.unexpectedMethod=An unexpected call was made to a method on the combined
realm
-combinedRealm.getName=The getName() method should never be called
-combinedRealm.getPassword=The getPassword() method should never be called
-combinedRealm.getPrincipal=The getPrincipal() method should never be called
-combinedRealm.authStart=Attempting to authenticate user "{0}" with realm
"{1}"
-combinedRealm.authFailed=Failed to authenticate user "{0}" with realm
"{1}"
-combinedRealm.authSucess=Authenticated user "{0}" with realm "{1}"
-combinedRealm.addRealm=Add "{0}" realm, making a total of "{1}"
realms
-lockOutRealm.authLockedUser=An attempt was made to authenticate the locked user
"{0}"
-lockOutRealm.removeWarning=User "{0}" was removed from the failed users cache
after {1} seconds to keep the cache size within the limit set
Deleted: trunk/src/main/java/org/apache/catalina/realm/LocalStrings_es.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/realm/LocalStrings_es.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/realm/LocalStrings_es.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,84 +0,0 @@
-jaasRealm.beginLogin = JAASRealm login requerido para nombre de usuario "{0}"
usando LoginContext para aplicaci\u00F3n "{1}"
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# $Id: LocalStrings_es.properties 789 2008-09-22 16:52:37Z remy.maucherat(a)jboss.com $
-# language es
-# package org.apache.catalina.realm
-jaasRealm.accountExpired = El usuario {0} NO ha sido autentificado porque ha expirado su
cuenta
-jaasRealm.authenticateFailure = Nombre de usuario "{0}" NO autenticado con
\u00E9xito
-jaasRealm.authenticateSuccess = Nombre de usuario "{0}" autenticado con
\u00E9xito como Principal "{1}" -- Tambi\u00E9n se ha creado el Asunto
-jaasRealm.credentialExpired = El usuario {0} NO ha sido autentificado porque ha expirado
su credencial
-jaasRealm.failedLogin = El usuario {0} NO ha sido autentificado porque ha fallado el
login
-jaasRealm.loginException = Excepci\u00F3n de Login autenticando nombre de usuario {0}
-jaasRealm.unexpectedError = Error inesperado
-jaasRealm.loginContextCreated = JAAS LoginContext creado para nombre de usuario
"{0}"
-jaasRealm.userPrincipalSuccess = El asunto para el nombre de usuario "{0}"
devolvi\u00F3 usuario Principal "{1}"
-jaasRealm.userPrincipalFailure = El asunto para el nombre de usuario "{0}" no
devolvi\u00F3 un usuario Principal v\u00E1lido
-jaasRealm.cachePrincipal = Usuario Principal "{0}" en cach\u00E9; tiene {1}
papel de Principal
-jaasRealm.checkPrincipal = Revisando Principal "{0}" [{1}]
-jaasRealm.userPrincipalSuccess = El Principal "{0}" es una clase v\u00E1lida de
usuario. La vamos a usar como usuario Principal.
-jaasRealm.userPrincipalFailure = No se ha hallado usuario Principal
-jaasRealm.rolePrincipalAdd = A\u00F1adiend papel Principal "{0}" a los papeles
de este usuario Principal
-jaasRealm.rolePrincipalSuccess = hallado {0} papeles de Principal
-jaasRealm.rolePrincipalFailure = No se han hallado papeles de Principal v\u00E1lidos.
-jaasRealm.isInRole.start = Revisando si el usuario Principal "{0}" tiene el
papel "{1}"
-jaasRealm.isInRole.noPrincipalOrRole = No se han hallado papeles de Principal. El usuario
Principal o el Asunto es nulo o el usuario Principal no est\u00E1 en cach\u00E9
-jaasRealm.isInRole.principalCached = El Usuario Principal tiene {0} papeles de Principal
-jaasRealm.isInRole.possessesRole = El Usuario Principal tiene un papele de Principal
llamado "{0}"
-jaasRealm.isInRole.match = Hallado papel de Principal coincidente.
-jaasRealm.isInRole.noMatch = NO hallado papel de Principal coincidente.
-jaasCallback.digestpassword = Resumida contrase\u00F1a "{0}" como
"{1}"
-jaasCallback.username = Devuelto nombre de usuario "{0}"
-jaasCallback.password = Devuelta contrase\u00F1a "{0}"
-jdbcRealm.authenticateFailure = El usuario {0} NO ha sido autentificado correctamente
-jdbcRealm.authenticateSuccess = El usuario {0} ha sido autentificado correctamente
-jdbcRealm.close = Excepci\u00F3n al cerrar la conexi\u00F3n a la base de datos
-jdbcRealm.exception = Excepci\u00F3n al realizar la autentificaci\u00F3n
-jdbcRealm.getPassword.exception = Excepci\u00F3n recuperando contrase\u00F1a para
"{0}"
-jdbcRealm.getRoles.exception = Excepci\u00F3n recuperando papeles para "{0}"
-jdbcRealm.open = Excepci\u00F3n abriendo la conexi\u00F3n a la base de datos
-jndiRealm.authenticateFailure = Autentificaci\u00F3n fallida para el usuario {0}
-jndiRealm.authenticateSuccess = Autentificaci\u00F3n correcta para el usuario {0}
-jndiRealm.close = Excepci\u00F3n al cerrar la conexi\u00F3n al servidor de directorio
-jndiRealm.exception = Excepci\u00F3n al realizar la autentificaci\u00F3n
-jndiRealm.open = Excepci\u00F3n al abrir la conexi\u00F3n al servidor de directorio
-memoryRealm.authenticateFailure = Autentificaci\u00F3n fallida para el usuario {0}
-memoryRealm.authenticateSuccess = Autentificaci\u00F3n correcta para el usuario {0}
-memoryRealm.loadExist = El fichero de usuarios {0} no ha podido ser le\u00EDdo
-memoryRealm.loadPath = Cargando los usuarios desde el fichero {0}
-memoryRealm.readXml = Excepci\u00F3n mientras se le\u00EDa el fichero de usuarios
-realmBase.algorithm = El algoritmo resumen (digest) {0} es inv\u00E1lido
-realmBase.alreadyStarted = Este dominio ya ha sido inicializado
-realmBase.digest = Error procesando las credenciales del usuario
-realmBase.forbidden = El acceso al recurso pedido ha sido denegado
-realmBase.hasRoleFailure = El usuario {0} NO desempe\u00F1a el papel de {1}
-realmBase.hasRoleSuccess = El usuario {0} desempe\u00F1a el papel de {1}
-realmBase.notAuthenticated = Error de Configuraci\u00F3n\: No se pueden realizar
funciones de control de acceso sin un principal autentificado
-realmBase.notStarted = Este dominio a\u00FAn no ha sido inicializado
-realmBase.authenticateFailure = Nombre de usuario {0} NO autenticado con \u00E9xito
-realmBase.authenticateSuccess = Nombre de usuario {0} autenticado con \u00E9xito
-userDatabaseRealm.authenticateError = Error de configuraci\u00F3n de Login autenticando
nombre de usuario {0}
-userDatabaseRealm.lookup = Excepci\u00F3n buscando en Base de datos de Usuario mediante
la clave {0}
-userDatabaseRealm.noDatabase = No se ha hallado componente de Base de datos de Usuario
mediante la clave {0}
-userDatabaseRealm.noEngine = No se ha hallado componente de Motor en jerarqu\u00EDa de
contenedor
-userDatabaseRealm.noGlobal = No se ha hallado contexto de recursos globales JNDI
-dataSourceRealm.authenticateFailure = Nombre de usuario {0} NO autenticado con
\u00E9xito
-dataSourceRealm.authenticateSuccess = Nombre de usuario {0} autenticado con \u00E9xito
-dataSourceRealm.close = Excepci\u00F3n cerrando conexi\u00F3n a base de datos
-dataSourceRealm.exception = Excepci\u00F3n realizando autenticaci\u00F3n
-dataSourceRealm.getPassword.exception = Excepci\u00F3n recuperando contrase\u00F1a para
"{0}"
-dataSourceRealm.getRoles.exception = Excepci\u00F3n recuperando papeles para
"{0}"
-dataSourceRealm.open = Excepci\u00F3n abriendo conexi\u00F3n a base de datos
-jaasRealm.authenticatedSuccess = El usuario {0} ha sido autentificado con \u00E9xito
Deleted: trunk/src/main/java/org/apache/catalina/realm/LocalStrings_fr.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/realm/LocalStrings_fr.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/realm/LocalStrings_fr.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,41 +0,0 @@
-# $Id: LocalStrings_fr.properties 520 2008-03-17 21:29:47Z jfrederic.clere(a)jboss.com $
-
-# language
-
-# package org.apache.catalina.realm
-
-jaasRealm.accountExpired=le nom d''utilisateur {0} N''A PAS �t�
authentifi� car le compte a expir�
-jaasRealm.authenticateSuccess=le nom d''utilisateur {0} a �t� authentifi� avec
succ�s
-jaasRealm.credentialExpired=le nom d''utilisateur {0} N''A PAS �t�
authentifi� car son cr�dit a expir� (expired credential)
-jaasRealm.failedLogin=le nom d''utilisateur {0} N''A PAS �t� authentifi�
car son contr�le d''acc�s (login) a �chou�
-jaasRealm.loginException=Exception lors de l''authentification par login du nom
d''utilisateur {0}
-jdbcRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS �t�
authentifi�
-jdbcRealm.authenticateSuccess=le nom d''utilisateur {0} a �t� authentifi� avec
succ�s
-jdbcRealm.close=Exception lors de la fermeture de la connexion � la base de donn�es
-jdbcRealm.exception=Exception pendant le traitement de l''authentification
-jdbcRealm.open=Exception lors de l''ouverture de la base de donn�es
-jndiRealm.authenticateFailure=Le nom d''utilisateur {0} N''A PAS �t�
authentifi�
-jndiRealm.authenticateSuccess=Le nom d''utilisateur {0} a �t� authentifi� avec
succ�s
-jndiRealm.close=Exception lors de la fermeture de la connexion au serveur
d''acc�s (directory server)
-jndiRealm.exception=Exception pendant le traitement de l''authentification
-jndiRealm.open=Exception lors de l''ouverture de la connexion au serveur
d''acc�s (directory server)
-memoryRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS �t�
authentifi�
-memoryRealm.authenticateSuccess=le nom d''utilisateur {0} a �t� authentifi� avec
succ�s
-memoryRealm.loadExist=Le fichier base de donn�es m�moire (memory database) {0} ne peut
�tre lu
-memoryRealm.loadPath=Chargement des utilisateurs depuis le fichier base de donn�es
m�moire (memory database) {0}
-memoryRealm.readXml=Exception lors de la lecture du fichier base de donn�es m�moire
(memory database)
-realmBase.algorithm=L''algorithme d''empreinte de message (message
digest) {0} indiqu� est invalide
-realmBase.alreadyStarted=Ce royaume (Realm) a d�j� �t� d�marr�
-realmBase.digest=Erreur lors du traitement des empreintes (digest) des cr�dits
utilisateur (user credentials)
-realmBase.forbidden=L''acc�s � la ressource demand�e a �t� interdit
-realmBase.hasRoleFailure=Le nom d''utilisateur {0} N''A PAS de r�le {1}
-realmBase.hasRoleSuccess=Le nom d''utilisateur {0} a pour r�le {1}
-realmBase.notAuthenticated=Erreur de configuration: Impossible de conduire un contr�le
d''acc�s sans un authentifi� principal (authenticated principal)
-realmBase.notStarted=Ce royaume (Realm) n''a pas encore �t� d�marr�
-realmBase.authenticateFailure=Le nom d''utilisateur {0} N''A PAS �t�
authentifi�
-realmBase.authenticateSuccess=Le nom d''utilisateur {0} a �t� authentifi� avec
succ�s
-userDatabaseRealm.authenticateError=Erreur de configuration du contr�le d''acc�s
(login) lors de l''authentification du nom d''utilisateur {0}
-userDatabaseRealm.lookup=Exception lors de la recherche dans la base de donn�es
utilisateurs avec la clef {0}
-userDatabaseRealm.noDatabase=Aucun composant base de donn�es utilisateurs trouv� pour la
clef {0}
-userDatabaseRealm.noEngine=Aucun composant moteur (engine component) trouv� dans la
hi�rarchie des conteneurs
-userDatabaseRealm.noGlobal=Aucune ressource globale JNDI trouv�e
Deleted: trunk/src/main/java/org/apache/catalina/realm/LocalStrings_ja.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/realm/LocalStrings_ja.properties 2012-08-24
13:44:02 UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/realm/LocalStrings_ja.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -1,47 +0,0 @@
-# $Id: LocalStrings_ja.properties 520 2008-03-17 21:29:47Z jfrederic.clere(a)jboss.com $
-
-# language ja
-
-# package org.apache.catalina.realm
-
-jaasRealm.accountExpired=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u671f\u9650\u304c\u5207\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093
-jaasRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-jaasRealm.credentialExpired=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a3c\u660e\u66f8\u306e\u671f\u9650\u304c\u5207\u308c\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093
-jaasRealm.failedLogin=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u30ed\u30b0\u30a4\u30f3\u306b\u5931\u6557\u3057\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
-jaasRealm.loginException=\u30e6\u30fc\u30b6\u540d {0}
\u306e\u8a8d\u8a3c\u4e2d\u306b\u30ed\u30b0\u30a4\u30f3\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-jaasRealm.unexpectedError=\u4e88\u6e2c\u3057\u306a\u3044\u30a8\u30e9\u30fc\u3067\u3059
-jdbcRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-jdbcRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-jdbcRealm.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-jdbcRealm.exception=\u8a8d\u8a3c\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-jdbcRealm.open=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30aa\u30fc\u30d7\u30f3\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-jndiRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-jndiRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-jndiRealm.close=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u63a5\u7d9a\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-jndiRealm.exception=\u8a8d\u8a3c\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-jndiRealm.open=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u63a5\u7d9a\u30aa\u30fc\u30d7\u30f3\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-memoryRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-memoryRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-memoryRealm.loadExist=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
{0} \u3092\u8aad\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
-memoryRealm.loadPath=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
{0} \u304b\u3089\u30e6\u30fc\u30b6\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059
-memoryRealm.readXml=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u307f\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-realmBase.algorithm=\u7121\u52b9\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0
{0} \u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
-realmBase.alreadyStarted=\u3053\u306e\u30ec\u30eb\u30e0\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
-realmBase.digest=\u30e6\u30fc\u30b6\u306e\u8a3c\u660e\u66f8\u306e\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a8\u30e9\u30fc
-realmBase.forbidden=\u8981\u6c42\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f
-realmBase.hasRoleFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30ed\u30fc\u30eb {1}
\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093
-realmBase.hasRoleSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30ed\u30fc\u30eb {1}
\u3092\u6301\u3063\u3066\u3044\u307e\u3059
-realmBase.notAuthenticated=\u8a2d\u5b9a\u30a8\u30e9\u30fc:
\u8a8d\u8a3c\u3055\u308c\u305f\u4e3b\u4f53\u306a\u3057\u3067\u306f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u304c\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093
-realmBase.notStarted=\u3053\u306e\u30ec\u30eb\u30e0\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-realmBase.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-realmBase.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-userDatabaseRealm.authenticateError=\u30e6\u30fc\u30b6\u540d {0}
\u3092\u8a8d\u8a3c\u4e2d\u306b\u30ed\u30b0\u30a4\u30f3\u8a2d\u5b9a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-userDatabaseRealm.lookup=\u30ad\u30fc {0}
\u3067\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u691c\u7d22\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-userDatabaseRealm.noDatabase=\u30ad\u30fc {0}
\u3067\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-userDatabaseRealm.noEngine=\u30b3\u30f3\u30c6\u30ca\u968e\u5c64\u4e2d\u306b\u30a8\u30f3\u30b8\u30f3\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-userDatabaseRealm.noGlobal=\u30b0\u30ed\u30fc\u30d0\u30eb\u306aJNDI\u30ea\u30bd\u30fc\u30b9\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-dataSourceRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-dataSourceRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0}
\u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-dataSourceRealm.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-dataSourceRealm.exception=\u8a8d\u8a3c\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-dataSourceRealm.open=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u3092\u30aa\u30fc\u30d7\u30f3\u4e2d\u306e\u4f8b\u5916\u3067\u3059
Modified: trunk/src/main/java/org/apache/catalina/valves/AccessLogValve.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/valves/AccessLogValve.java 2012-08-24 13:44:02
UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/valves/AccessLogValve.java 2012-08-27 15:04:39
UTC (rev 2068)
@@ -19,6 +19,8 @@
package org.apache.catalina.valves;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -27,7 +29,6 @@
import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
@@ -42,7 +43,6 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
import org.apache.coyote.RequestInfo;
import org.jboss.logging.Logger;
@@ -191,13 +191,6 @@
/**
- * The string manager for this package.
- */
- protected StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
- /**
* Has this component been started yet?
*/
protected boolean started = false;
@@ -848,8 +841,7 @@
// Validate and update our current component state
if (started)
- throw new LifecycleException(sm
- .getString("accessLogValve.alreadyStarted"));
+ throw new LifecycleException(MESSAGES.valveAlreadyStarted());
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
@@ -889,8 +881,7 @@
// Validate and update our current component state
if (!started)
- throw new LifecycleException(sm
- .getString("accessLogValve.notStarted"));
+ throw new LifecycleException(MESSAGES.valveNotStarted());
lifecycle.fireLifecycleEvent(STOP_EVENT, null);
started = false;
Modified: trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2012-08-24
13:44:02 UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2012-08-27
15:04:39 UTC (rev 2068)
@@ -19,6 +19,8 @@
package org.apache.catalina.valves;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.IOException;
import java.io.Writer;
@@ -30,7 +32,6 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
-import org.apache.catalina.util.StringManager;
/**
* <p>Implementation of a Valve that outputs HTML error pages.</p>
@@ -62,13 +63,6 @@
"org.apache.catalina.valves.ErrorReportValve/1.0";
- /**
- * The StringManager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ------------------------------------------------------------- Properties
@@ -164,10 +158,36 @@
// Do nothing if there is no report for the specified status code
String report = null;
- try {
- report = sm.getString("http." + statusCode, message);
- } catch (Throwable t) {
- ;
+ switch (statusCode) {
+ case 404: report = MESSAGES.http404(message); break;
+ case 500: report = MESSAGES.http500(message); break;
+ case 400: report = MESSAGES.http400(message); break;
+ case 401: report = MESSAGES.http401(message); break;
+ case 402: report = MESSAGES.http402(message); break;
+ case 403: report = MESSAGES.http403(message); break;
+ case 405: report = MESSAGES.http405(message); break;
+ case 406: report = MESSAGES.http406(message); break;
+ case 407: report = MESSAGES.http407(message); break;
+ case 408: report = MESSAGES.http408(message); break;
+ case 409: report = MESSAGES.http409(message); break;
+ case 410: report = MESSAGES.http410(message); break;
+ case 411: report = MESSAGES.http411(message); break;
+ case 412: report = MESSAGES.http412(message); break;
+ case 413: report = MESSAGES.http413(message); break;
+ case 414: report = MESSAGES.http414(message); break;
+ case 415: report = MESSAGES.http415(message); break;
+ case 416: report = MESSAGES.http416(message); break;
+ case 417: report = MESSAGES.http417(message); break;
+ case 422: report = MESSAGES.http422(message); break;
+ case 423: report = MESSAGES.http423(message); break;
+ case 501: report = MESSAGES.http501(message); break;
+ case 502: report = MESSAGES.http502(message); break;
+ case 503: report = MESSAGES.http503(message); break;
+ case 504: report = MESSAGES.http504(message); break;
+ case 505: report = MESSAGES.http505(message); break;
+ case 507: report = MESSAGES.http507(message); break;
+ default:
+ return;
}
if (report == null)
return;
@@ -176,29 +196,28 @@
sb.append("<html><head><title>");
sb.append(ServerInfo.getServerInfo()).append(" - ");
- sb.append(sm.getString("errorReportValve.errorReport"));
+ sb.append(MESSAGES.errorReport());
sb.append("</title>");
sb.append("<style><!--");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
sb.append("--></style> ");
sb.append("</head><body>");
sb.append("<h1>");
- sb.append(sm.getString("errorReportValve.statusHeader",
- "" + statusCode,
message)).append("</h1>");
+ sb.append(MESSAGES.statusHeader(statusCode,
message)).append("</h1>");
sb.append("<HR size=\"1\"
noshade=\"noshade\">");
sb.append("<p><b>type</b> ");
if (throwable != null) {
- sb.append(sm.getString("errorReportValve.exceptionReport"));
+ sb.append(MESSAGES.exceptionReport());
} else {
- sb.append(sm.getString("errorReportValve.statusReport"));
+ sb.append(MESSAGES.statusReport());
}
sb.append("</p>");
sb.append("<p><b>");
- sb.append(sm.getString("errorReportValve.message"));
+ sb.append(MESSAGES.statusMessage());
sb.append("</b> <u>");
sb.append(message).append("</u></p>");
sb.append("<p><b>");
- sb.append(sm.getString("errorReportValve.description"));
+ sb.append(MESSAGES.statusDescritpion());
sb.append("</b> <u>");
sb.append(report);
sb.append("</u></p>");
@@ -207,7 +226,7 @@
String stackTrace = getPartialServletStackTrace(throwable);
sb.append("<p><b>");
- sb.append(sm.getString("errorReportValve.exception"));
+ sb.append(MESSAGES.statusException());
sb.append("</b> <pre>");
sb.append(RequestUtil.filter(stackTrace));
sb.append("</pre></p>");
@@ -217,7 +236,7 @@
while (rootCause != null && (loops < 10)) {
stackTrace = getPartialServletStackTrace(rootCause);
sb.append("<p><b>");
- sb.append(sm.getString("errorReportValve.rootCause"));
+ sb.append(MESSAGES.statusRootCause());
sb.append("</b> <pre>");
sb.append(RequestUtil.filter(stackTrace));
sb.append("</pre></p>");
@@ -227,10 +246,9 @@
}
sb.append("<p><b>");
- sb.append(sm.getString("errorReportValve.note"));
+ sb.append(MESSAGES.statusNote());
sb.append("</b> <u>");
- sb.append(sm.getString("errorReportValve.rootCauseInLogs",
- ServerInfo.getServerInfo()));
+ sb.append(MESSAGES.statusRootCauseInLogs(ServerInfo.getServerInfo()));
sb.append("</u></p>");
}
Modified:
trunk/src/main/java/org/apache/catalina/valves/EventOrAsyncConnectionManagerValve.java
===================================================================
---
trunk/src/main/java/org/apache/catalina/valves/EventOrAsyncConnectionManagerValve.java 2012-08-24
13:44:02 UTC (rev 2067)
+++
trunk/src/main/java/org/apache/catalina/valves/EventOrAsyncConnectionManagerValve.java 2012-08-27
15:04:39 UTC (rev 2068)
@@ -19,6 +19,8 @@
package org.apache.catalina.valves;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -38,7 +40,6 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
import org.jboss.servlet.http.HttpEvent;
@@ -68,13 +69,6 @@
/**
- * The string manager for this package.
- */
- protected StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
- /**
* The lifecycle event support for this component.
*/
protected LifecycleSupport lifecycle = new LifecycleSupport(this);
@@ -154,7 +148,7 @@
// Validate and update our current component state
if (started)
throw new LifecycleException
- (sm.getString("semaphoreValve.alreadyStarted"));
+ (MESSAGES.valveAlreadyStarted());
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
@@ -178,7 +172,7 @@
// Validate and update our current component state
if (!started)
throw new LifecycleException
- (sm.getString("semaphoreValve.notStarted"));
+ (MESSAGES.valveNotStarted());
lifecycle.fireLifecycleEvent(STOP_EVENT, null);
started = false;
@@ -210,9 +204,7 @@
try {
request.getEvent().close();
} catch (Exception e) {
- container.getLogger().warn(
- sm.getString("cometConnectionManagerValve.event"),
- e);
+ container.getLogger().warn(MESSAGES.eventValveExceptionDuringEvent(),
e);
}
}
cometRequests.clear();
@@ -359,8 +351,7 @@
try {
req.getEvent().close();
} catch (Exception e) {
- req.getWrapper().getParent().getLogger().warn(sm.getString(
- "cometConnectionManagerValve.listenerEvent"), e);
+
req.getWrapper().getParent().getLogger().warn(MESSAGES.eventValveSessionListenerException(),
e);
}
}
}
Modified: trunk/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java 2012-08-24
13:44:02 UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java 2012-08-27
15:04:39 UTC (rev 2068)
@@ -19,6 +19,8 @@
package org.apache.catalina.valves;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.IOException;
import java.sql.Connection;
import java.sql.Driver;
@@ -35,7 +37,6 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
/**
* <p>
@@ -228,12 +229,6 @@
/**
- * The string manager for this package.
- */
- private StringManager sm = StringManager.getManager(Constants.Package);
-
-
- /**
* Has this component been started yet?
*/
private boolean started = false;
@@ -517,7 +512,7 @@
return;
} catch (SQLException e) {
// Log the problem for posterity
-
container.getLogger().error(sm.getString("jdbcAccessLogValve.exception"), e);
+ container.getLogger().error(MESSAGES.jdbcAccessLogValveInsertError(),
e);
// Close the connection so that it gets reopened next time
if (conn != null)
@@ -637,7 +632,7 @@
try {
conn.close();
} catch (SQLException e) {
-
container.getLogger().error(sm.getString("jdbcAccessLogValeve.close"), e); //
Just log it here
+
container.getLogger().error(MESSAGES.jdbcAccessLogValveConnectionCloseError(), e); // Just
log it here
} finally {
this.conn = null;
}
@@ -653,7 +648,7 @@
if (started)
throw new LifecycleException
- (sm.getString("accessLogValve.alreadyStarted"));
+ (MESSAGES.valveAlreadyStarted());
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
@@ -676,7 +671,7 @@
if (!started)
throw new LifecycleException
- (sm.getString("accessLogValve.notStarted"));
+ (MESSAGES.valveNotStarted());
lifecycle.fireLifecycleEvent(STOP_EVENT, null);
started = false;
Modified: trunk/src/main/java/org/apache/catalina/valves/RequestFilterValve.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/valves/RequestFilterValve.java 2012-08-24
13:44:02 UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/valves/RequestFilterValve.java 2012-08-27
15:04:39 UTC (rev 2068)
@@ -19,6 +19,8 @@
package org.apache.catalina.valves;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.regex.Pattern;
@@ -29,7 +31,6 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.util.StringManager;
/**
* Implementation of a Valve that performs filtering based on comparing the
@@ -79,13 +80,6 @@
"org.apache.catalina.valves.RequestFilterValve/1.0";
- /**
- * The StringManager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ----------------------------------------------------- Instance Variables
@@ -227,7 +221,7 @@
reList.add(Pattern.compile(pattern));
} catch (PatternSyntaxException e) {
IllegalArgumentException iae = new IllegalArgumentException
- (sm.getString("requestFilterValve.syntax", pattern));
+ (MESSAGES.requestFilterValvePatternError(pattern));
iae.initCause(e);
throw iae;
}
Modified: trunk/src/main/java/org/apache/catalina/valves/SSLValve.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/valves/SSLValve.java 2012-08-24 13:44:02 UTC
(rev 2067)
+++ trunk/src/main/java/org/apache/catalina/valves/SSLValve.java 2012-08-27 15:04:39 UTC
(rev 2068)
@@ -62,8 +62,6 @@
*/
public class SSLValve extends ValveBase {
- private static Logger log = Logger.getLogger(SSLValve.class);
-
//------------------------------------------------------ Constructor
public SSLValve() {
}
Modified: trunk/src/main/java/org/apache/catalina/valves/SemaphoreValve.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/valves/SemaphoreValve.java 2012-08-24 13:44:02
UTC (rev 2067)
+++ trunk/src/main/java/org/apache/catalina/valves/SemaphoreValve.java 2012-08-27 15:04:39
UTC (rev 2068)
@@ -19,6 +19,8 @@
package org.apache.catalina.valves;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.IOException;
import java.util.concurrent.Semaphore;
@@ -30,7 +32,6 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
/**
@@ -59,13 +60,6 @@
/**
- * The string manager for this package.
- */
- private StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
- /**
* Semaphore.
*/
protected Semaphore semaphore = null;
@@ -169,7 +163,7 @@
// Validate and update our current component state
if (started)
throw new LifecycleException
- (sm.getString("semaphoreValve.alreadyStarted"));
+ (MESSAGES.valveAlreadyStarted());
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
@@ -191,7 +185,7 @@
// Validate and update our current component state
if (!started)
throw new LifecycleException
- (sm.getString("semaphoreValve.notStarted"));
+ (MESSAGES.valveNotStarted());
lifecycle.fireLifecycleEvent(STOP_EVENT, null);
started = false;
Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java
===================================================================
--- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-08-24 13:44:02 UTC (rev
2067)
+++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-08-27 15:04:39 UTC (rev
2068)
@@ -108,4 +108,175 @@
@Message(id = 21, value = "Missing MD5 digest")
IllegalArgumentException noMD5Digest(@Cause NoSuchAlgorithmException e);
+ @Message(id = 22, value = "The client may continue (%s).")
+ String http100(String resource);
+
+ @Message(id = 23, value = "The server is switching protocols according to the
'Upgrade' header (%s).")
+ String http101(String resource);
+
+ @Message(id = 24, value = "The request succeeded and a new resource (%s) has
been created on the server.")
+ String http201(String resource);
+
+ @Message(id = 25, value = "This request was accepted for processing, but has not
been completed (%s).")
+ String http202(String resource);
+
+ @Message(id = 26, value = "The meta information presented by the client did not
originate from the server (%s).")
+ String http203(String resource);
+
+ @Message(id = 27, value = "The request succeeded but there is no information to
return (%s).")
+ String http204(String resource);
+
+ @Message(id = 28, value = "The client should reset the document view which
caused this request to be sent (%s).")
+ String http205(String resource);
+
+ @Message(id = 29, value = "The server has fulfilled a partial GET request for
this resource (%s).")
+ String http206(String resource);
+
+ @Message(id = 30, value = "Multiple status values have been returned
(%s).")
+ String http207(String resource);
+
+ @Message(id = 31, value = "The requested resource (%s) corresponds to any one of
a set of representations, each with its own specific location.")
+ String http300(String resource);
+
+ @Message(id = 32, value = "The requested resource (%s) has moved permanently to
a new location.")
+ String http301(String resource);
+
+ @Message(id = 33, value = "The requested resource (%s) has moved temporarily to
a new location.")
+ String http302(String resource);
+
+ @Message(id = 34, value = "The response to this request can be found under a
different URI (%s).")
+ String http303(String resource);
+
+ @Message(id = 35, value = "The requested resource (%s) is available and has not
been modified.")
+ String http304(String resource);
+
+ @Message(id = 36, value = "The requested resource (%s) must be accessed through
the proxy given by the 'Location' header.")
+ String http305(String resource);
+
+ @Message(id = 37, value = "The request sent by the client was syntactically
incorrect (%s).")
+ String http400(String resource);
+
+ @Message(id = 38, value = "This request requires HTTP authentication
(%s).")
+ String http401(String resource);
+
+ @Message(id = 39, value = "Payment is required for access to this resource
(%s).")
+ String http402(String resource);
+
+ @Message(id = 40, value = "Access to the specified resource (%s) has been
forbidden.")
+ String http403(String resource);
+
+ @Message(id = 41, value = "The requested resource (%s) is not available.")
+ String http404(String resource);
+
+ @Message(id = 42, value = "The specified HTTP method is not allowed for the
requested resource (%s).")
+ String http405(String resource);
+
+ @Message(id = 43, value = "The resource identified by this request is only
capable of generating responses with characteristics not acceptable according to the
request 'Accept' headers (%s).")
+ String http406(String resource);
+
+ @Message(id = 44, value = "The client must first authenticate itself with the
proxy (%s).")
+ String http407(String resource);
+
+ @Message(id = 45, value = "The client did not produce a request within the time
that the server was prepared to wait (%s).")
+ String http408(String resource);
+
+ @Message(id = 46, value = "The request could not be completed due to a conflict
with the current state of the resource (%s).")
+ String http409(String resource);
+
+ @Message(id = 47, value = "The requested resource (%s) is no longer available,
and no forwarding address is known.")
+ String http410(String resource);
+
+ @Message(id = 48, value = "This request cannot be handled without a defined
content length (%s).")
+ String http411(String resource);
+
+ @Message(id = 49, value = "A specified precondition has failed for this request
(%s).")
+ String http412(String resource);
+
+ @Message(id = 50, value = "The request entity is larger than the server is
willing or able to process (%s).")
+ String http413(String resource);
+
+ @Message(id = 51, value = "The server refused this request because the request
URI was too long (%s).")
+ String http414(String resource);
+
+ @Message(id = 52, value = "The server refused this request because the request
entity is in a format not supported by the requested resource for the requested method
(%s).")
+ String http415(String resource);
+
+ @Message(id = 53, value = "The requested byte range cannot be satisfied
(%s).")
+ String http416(String resource);
+
+ @Message(id = 54, value = "The expectation given in the 'Expect' request
header (%s) could not be fulfilled.")
+ String http417(String resource);
+
+ @Message(id = 55, value = "The server understood the content type and syntax of
the request but was unable to process the contained instructions (%s).")
+ String http422(String resource);
+
+ @Message(id = 56, value = "The source or destination resource of a method is
locked (%s).")
+ String http423(String resource);
+
+ @Message(id = 57, value = "The server encountered an internal error (%s) that
prevented it from fulfilling this request.")
+ String http500(String resource);
+
+ @Message(id = 58, value = "The server does not support the functionality needed
to fulfill this request (%s).")
+ String http501(String resource);
+
+ @Message(id = 59, value = "This server received an invalid response from a
server it consulted when acting as a proxy or gateway (%s).")
+ String http502(String resource);
+
+ @Message(id = 60, value = "The requested service (%s) is not currently
available.")
+ String http503(String resource);
+
+ @Message(id = 61, value = "The server received a timeout from an upstream server
while acting as a gateway or proxy (%s).")
+ String http504(String resource);
+
+ @Message(id = 62, value = "The server does not support the requested HTTP
protocol version (%s).")
+ String http505(String resource);
+
+ @Message(id = 63, value = "The resource does not have sufficient space to record
the state of the resource after execution of this method (%s).")
+ String http507(String resource);
+
+ @Message(id = 64, value = "Error report")
+ String errorReport();
+
+ @Message(id = 65, value = "HTTP Status %s - %s")
+ String statusHeader(int statusCode, String message);
+
+ @Message(id = 66, value = "Exception report")
+ String exceptionReport();
+
+ @Message(id = 67, value = "Status report")
+ String statusReport();
+
+ @Message(id = 68, value = "message")
+ String statusMessage();
+
+ @Message(id = 69, value = "description")
+ String statusDescritpion();
+
+ @Message(id = 70, value = "exception")
+ String statusException();
+
+ @Message(id = 71, value = "root cause")
+ String statusRootCause();
+
+ @Message(id = 72, value = "note")
+ String statusNote();
+
+ @Message(id = 73, value = "The full stack trace of the root cause is available
in the %s logs.")
+ String statusRootCauseInLogs(String log);
+
+ @Message(id = 74, value = "Exception processing event.")
+ String eventValveExceptionDuringEvent();
+
+ @Message(id = 75, value = "Exception processing session listener event.")
+ String eventValveSessionListenerException();
+
+ @Message(id = 76, value = "Exception performing insert access entry.")
+ String jdbcAccessLogValveInsertError();
+
+ @Message(id = 77, value = "Exception closing database connection.")
+ String jdbcAccessLogValveConnectionCloseError();
+
+ @Message(id = 78, value = "Syntax error in request filter pattern %s")
+ String requestFilterValvePatternError(String pattern);
+
}
Added: trunk/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties
===================================================================
--- trunk/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties
(rev 0)
+++
trunk/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -0,0 +1,2 @@
+en=ISO-8859-1
+fr=ISO-8859-1
Added: trunk/src/main/resources/org/apache/tomcat/util/http/HttpMessages.properties
===================================================================
--- trunk/src/main/resources/org/apache/tomcat/util/http/HttpMessages.properties
(rev 0)
+++
trunk/src/main/resources/org/apache/tomcat/util/http/HttpMessages.properties 2012-08-27
15:04:39 UTC (rev 2068)
@@ -0,0 +1,46 @@
+# HttpMessages
+sc.100=Continue
+sc.101=Switching Protocols
+sc.200=OK
+sc.201=Created
+sc.202=Accepted
+sc.203=Non-Authoritative Information
+sc.204=No Content
+sc.205=Reset Content
+sc.206=Partial Content
+sc.207=Multi-Status
+sc.300=Multiple Choices
+sc.301=Moved Permanently
+sc.302=Moved Temporarily
+sc.303=See Other
+sc.304=Not Modified
+sc.305=Use Proxy
+sc.307=Temporary Redirect
+sc.400=Bad Request
+sc.401=Unauthorized
+sc.402=Payment Required
+sc.403=Forbidden
+sc.404=Not Found
+sc.405=Method Not Allowed
+sc.406=Not Acceptable
+sc.407=Proxy Authentication Required
+sc.408=Request Timeout
+sc.409=Conflict
+sc.410=Gone
+sc.411=Length Required
+sc.412=Precondition Failed
+sc.413=Request Entity Too Large
+sc.414=Request-URI Too Long
+sc.415=Unsupported Media Type
+sc.416=Requested Range Not Satisfiable
+sc.417=Expectation Failed
+sc.422=Unprocessable Entity
+sc.423=Locked
+sc.424=Failed Dependency
+sc.500=Internal Server Error
+sc.501=Not Implemented
+sc.502=Bad Gateway
+sc.503=Service Unavailable
+sc.504=Gateway Timeout
+sc.505=HTTP Version Not Supported
+sc.507=Insufficient Storage