Author: remy.maucherat(a)jboss.com
Date: 2012-09-06 10:06:07 -0400 (Thu, 06 Sep 2012)
New Revision: 2079
Removed:
trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties
trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties
trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties
trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties
Modified:
trunk/src/main/java/org/apache/catalina/session/FileStore.java
trunk/src/main/java/org/apache/catalina/session/JDBCStore.java
trunk/src/main/java/org/apache/catalina/session/ManagerBase.java
trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java
trunk/src/main/java/org/apache/catalina/session/StandardManager.java
trunk/src/main/java/org/apache/catalina/session/StandardSession.java
trunk/src/main/java/org/apache/catalina/session/StoreBase.java
trunk/src/main/java/org/jboss/web/CatalinaLogger.java
trunk/src/main/java/org/jboss/web/CatalinaMessages.java
Log:
New i18n for session package.
Modified: trunk/src/main/java/org/apache/catalina/session/FileStore.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/FileStore.java 2012-09-05 08:00:43 UTC
(rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/FileStore.java 2012-09-06 14:06:07 UTC
(rev 2079)
@@ -19,6 +19,8 @@
package org.apache.catalina.session;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -34,7 +36,6 @@
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
import org.apache.catalina.Loader;
import org.apache.catalina.Session;
import org.apache.catalina.Store;
@@ -254,8 +255,7 @@
return (null);
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
-
manager.getContainer().getLogger().debug(sm.getString(getStoreName()+".loading",
- id, file.getAbsolutePath()));
+ manager.getContainer().getLogger().debug(MESSAGES.fileStoreSessionLoad(id,
file.getAbsolutePath()));
}
FileInputStream fis = null;
@@ -276,7 +276,7 @@
ois = new ObjectInputStream(bis);
} catch (FileNotFoundException e) {
if (manager.getContainer().getLogger().isDebugEnabled())
- manager.getContainer().getLogger().debug("No persisted data file
found");
+
manager.getContainer().getLogger().debug(MESSAGES.fileStoreFileNotFound());
return (null);
} catch (IOException e) {
if (ois != null) {
@@ -325,8 +325,7 @@
return;
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
-
manager.getContainer().getLogger().debug(sm.getString(getStoreName()+".removing",
- id, file.getAbsolutePath()));
+ manager.getContainer().getLogger().debug(MESSAGES.fileStoreSessionRemove(id,
file.getAbsolutePath()));
}
file.delete();
@@ -349,8 +348,8 @@
return;
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
-
manager.getContainer().getLogger().debug(sm.getString(getStoreName()+".saving",
- session.getIdInternal(), file.getAbsolutePath()));
+ manager.getContainer().getLogger().debug
+ (MESSAGES.fileStoreSessionSave(session.getIdInternal(),
file.getAbsolutePath()));
}
FileOutputStream fos = null;
ObjectOutputStream oos = null;
@@ -404,8 +403,7 @@
servletContext.getAttribute(ServletContext.TEMPDIR);
file = new File(work, this.directory);
} else {
- throw new IllegalArgumentException
- ("Parent Container is not a Context");
+ throw MESSAGES.parentNotContext();
}
}
if (!file.exists() || !file.isDirectory()) {
Modified: trunk/src/main/java/org/apache/catalina/session/JDBCStore.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/JDBCStore.java 2012-09-05 08:00:43 UTC
(rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/JDBCStore.java 2012-09-06 14:06:07 UTC
(rev 2079)
@@ -17,6 +17,8 @@
package org.apache.catalina.session;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Loader;
@@ -471,7 +473,7 @@
// Break out after the finally block
numberOfTries = 0;
} catch (SQLException e) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName()
+ ".SQLException", e));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e);
keys = new String[0];
// Close the connection so that it gets reopened next time
if (dbConnection != null)
@@ -530,7 +532,7 @@
// Break out after the finally block
numberOfTries = 0;
} catch (SQLException e) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName()
+ ".SQLException", e));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e);
if (dbConnection != null)
close(dbConnection);
} finally {
@@ -605,20 +607,19 @@
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
-
manager.getContainer().getLogger().debug(sm.getString(getStoreName() +
".loading",
- id, sessionTable));
+
manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreSessionLoad(id,
sessionTable));
}
_session = (StandardSession) manager.createEmptySession();
_session.readObjectData(ois);
_session.setManager(manager);
} else if (manager.getContainer().getLogger().isDebugEnabled()) {
- manager.getContainer().getLogger().debug(getStoreName() + ":
No persisted data object found");
+
manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreIdNotFound());
}
// Break out after the finally block
numberOfTries = 0;
} catch (SQLException e) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName()
+ ".SQLException", e));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e);
if (dbConnection != null)
close(dbConnection);
} finally {
@@ -679,7 +680,7 @@
// Break out after the finally block
numberOfTries = 0;
} catch (SQLException e) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName()
+ ".SQLException", e));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e);
if (dbConnection != null)
close(dbConnection);
} finally {
@@ -690,7 +691,7 @@
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
- manager.getContainer().getLogger().debug(sm.getString(getStoreName() +
".removing", id, sessionTable));
+ manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreSessionRemove(id,
sessionTable));
}
}
@@ -721,7 +722,7 @@
// Break out after the finally block
numberOfTries = 0;
} catch (SQLException e) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName()
+ ".SQLException", e));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e);
if (dbConnection != null)
close(dbConnection);
} finally {
@@ -789,7 +790,7 @@
// Break out after the finally block
numberOfTries = 0;
} catch (SQLException e) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName()
+ ".SQLException", e));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(), e);
if (dbConnection != null)
close(dbConnection);
} catch (IOException e) {
@@ -812,8 +813,7 @@
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
- manager.getContainer().getLogger().debug(sm.getString(getStoreName() +
".saving",
- session.getIdInternal(), sessionTable));
+
manager.getContainer().getLogger().debug(MESSAGES.jdbcStoreSessionSave(session.getIdInternal(),
sessionTable));
}
}
@@ -829,15 +829,14 @@
protected Connection getConnection() {
try {
if (dbConnection == null || dbConnection.isClosed()) {
- manager.getContainer().getLogger().info(sm.getString(getStoreName() +
".checkConnectionDBClosed"));
+
manager.getContainer().getLogger().info(MESSAGES.jdbcStoreConnectionWasClosed());
open();
if (dbConnection == null || dbConnection.isClosed()) {
- manager.getContainer().getLogger().info(sm.getString(getStoreName() +
".checkConnectionDBReOpenFail"));
+
manager.getContainer().getLogger().info(MESSAGES.jdbcStoreConnectionReopenFailed());
}
}
} catch (SQLException ex) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName() +
".checkConnectionSQLException",
- ex.toString()));
+ manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(),
ex);
}
return dbConnection;
@@ -861,14 +860,11 @@
Class clazz = Class.forName(driverName);
driver = (Driver) clazz.newInstance();
} catch (ClassNotFoundException ex) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName() +
".checkConnectionClassNotFoundException",
- ex.toString()));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDriverFailure(driverName),
ex);
} catch (InstantiationException ex) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName() +
".checkConnectionClassNotFoundException",
- ex.toString()));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDriverFailure(driverName),
ex);
} catch (IllegalAccessException ex) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName() +
".checkConnectionClassNotFoundException",
- ex.toString()));
+
manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDriverFailure(driverName),
ex);
}
}
@@ -941,7 +937,7 @@
try {
dbConnection.close();
} catch (SQLException e) {
- manager.getContainer().getLogger().error(sm.getString(getStoreName() +
".close", e.toString())); // Just log it here
+ manager.getContainer().getLogger().error(MESSAGES.jdbcStoreDatabaseError(),
e);
} finally {
this.dbConnection = null;
}
Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties 2012-09-05
08:00:43 UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/LocalStrings.properties 2012-09-06
14:06:07 UTC (rev 2079)
@@ -1,68 +0,0 @@
-applicationSession.session.ise=invalid session state
-applicationSession.value.iae=null value
-fileStore.alreadyStarted=File Store has already been started
-fileStore.notStarted=File Store has not yet been started
-fileStore.saving=Saving Session {0} to file {1}
-fileStore.loading=Loading Session {0} from file {1}
-fileStore.removing=Removing Session {0} at file {1}
-JDBCStore.alreadyStarted=JDBC Store has already been started
-JDBCStore.close=Exception closing database connection {0}
-JDBCStore.notStarted=JDBC Store has not yet been started
-JDBCStore.saving=Saving Session {0} to database {1}
-JDBCStore.loading=Loading Session {0} from database {1}
-JDBCStore.removing=Removing Session {0} at database {1}
-JDBCStore.SQLException=SQL Error {0}
-JDBCStore.checkConnectionDBClosed=The database connection is null or was found to be
closed. Trying to re-open it.
-JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The database
could be down.
-JDBCStore.checkConnectionSQLException=A SQL exception occurred {0}
-JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found {0}
-managerBase.complete=Seeding of random number generator has been completed
-managerBase.getting=Getting message digest component for algorithm {0}
-managerBase.gotten=Completed getting message digest component
-managerBase.random=Exception initializing random number generator of class {0}
-managerBase.seeding=Seeding random number generator class {0}
-serverSession.value.iae=null value
-standardManager.alreadyStarted=Manager has already been started
-standardManager.createSession.ise=createSession: Too many active sessions
-standardManager.expireException=processsExpire: Exception during session expiration
-standardManager.loading=Loading persisted sessions from {0}
-standardManager.loading.cnfe=ClassNotFoundException while loading persisted sessions:
{0}
-standardManager.loading.ioe=IOException while loading persisted sessions: {0}
-standardManager.notStarted=Manager has not yet been started
-standardManager.sessionTimeout=Invalid session timeout setting {0}
-standardManager.unloading=Saving persisted sessions to {0}
-standardManager.unloading.ioe=IOException while saving persisted sessions: {0}
-standardManager.managerLoad=Exception loading sessions from persistent storage
-standardManager.managerUnload=Exception unloading sessions to persistent storage
-standardSession.attributeEvent=Session attribute event listener threw exception
-standardSession.bindingEvent=Session binding event listener threw exception
-standardSession.invalidate.ise=invalidate: Session already invalidated
-standardSession.isNew.ise=isNew: Session already invalidated
-standardSession.getAttribute.ise=getAttribute: Session already invalidated
-standardSession.getAttributeNames.ise=getAttributeNames: Session already invalidated
-standardSession.getCreationTime.ise=getCreationTime: Session already invalidated
-standardSession.getLastAccessedTime.ise=getLastAccessedTime: Session already invalidated
-standardSession.getId.ise=getId: Session already invalidated
-standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: Session already
invalidated
-standardSession.getValueNames.ise=getValueNames: Session already invalidated
-standardSession.logoutfail=Exception logging out user when expiring session
-standardSession.notSerializable=Cannot serialize session attribute {0} for session {1}
-standardSession.removeAttribute.ise=removeAttribute: Session already invalidated
-standardSession.sessionEvent=Session event listener threw exception
-standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0}
-standardSession.setAttribute.ise=setAttribute: Session already invalidated
-standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null
-standardSession.sessionCreated=Created Session id = {0}
-persistentManager.loading=Loading {0} persisted sessions
-persistentManager.unloading=Saving {0} persisted sessions
-persistentManager.expiring=Expiring {0} sessions before saving them
-persistentManager.deserializeError=Error deserializing Session {0}: {1}
-persistentManager.serializeError=Error serializing Session {0}: {1}
-persistentManager.swapMaxIdle=Swapping session {0} to Store, idle for {1} seconds
-persistentManager.backupMaxIdle=Backing up session {0} to Store, idle for {1} seconds
-persistentManager.backupException=Exception occurred when backing up Session {0}: {1}
-persistentManager.tooManyActive=Too many active sessions, {0}, looking for idle sessions
to swap out
-persistentManager.swapTooManyActive=Swapping out session {0}, idle for {1} seconds too
many sessions active
-persistentManager.processSwaps=Checking for sessions to swap out, {0} active sessions in
memory
-persistentManager.activeSession=Session {0} has been idle for {1} seconds
-persistentManager.swapIn=Swapping session {0} in from Store
Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties 2012-09-05
08:00:43 UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/LocalStrings_es.properties 2012-09-06
14:06:07 UTC (rev 2079)
@@ -1,81 +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.
-applicationSession.session.ise = estado inv\u00E1lido de sesi\u00F3n
-applicationSession.value.iae = valor nulo
-fileStore.alreadyStarted = Ya ha sido arrancado el Almac\u00E9n de Archivos
-fileStore.notStarted = A\u00FAn no se ha arrancado el Almac\u00E9n de Archivos
-fileStore.saving = Salvando Sesi\u00F3n {0} en archivo {1}
-fileStore.loading = Cargando Sesi\u00F3n {0} desde archivo {1}
-fileStore.removing = Quitando Sesi\u00F3n {0} en archivo {1}
-JDBCStore.alreadyStarted = Ya ha sido arrancado el Almac\u00E9n JDBC
-JDBCStore.close = Excepci\u00F3n cerrando conexi\u00F3n a base de datos {0}
-JDBCStore.notStarted = A\u00FAn no se ha arrancado el Almac\u00E9n JDBC
-JDBCStore.saving = Salvando Sesi\u00F3n {0} en base de datos {1}
-JDBCStore.loading = Cargando Sesi\u00F3n {0} desde base de datos {1}
-JDBCStore.removing = Quitando Sesi\u00F3n {0} en base de datos {1}
-JDBCStore.SQLException = Error SQL {0}
-JDBCStore.checkConnectionDBClosed = La conexi\u00F3na a base de datos es nula o est\u00E1
cerrada. Intentando reabrirla.
-JDBCStore.checkConnectionDBReOpenFail = Fall\u00F3 la reapertura de la base de datos.
Puede que la base de datos est\u00E9 ca\u00EDda.
-JDBCStore.checkConnectionSQLException = Ha tenido lugar una excepci\u00F3n SQL {0}
-JDBCStore.checkConnectionClassNotFoundException = No se ha hallado la clase del manejador
(driver) JDBC {0}
-managerBase.complete = Se ha completado la siembra del generador de n\u00FAmeros
aleatorios
-managerBase.getting = Obteniendo mensaje de componente de resumen (digest) para algoritmo
{0}
-managerBase.gotten = Completada la obtenci\u00F3n de mensaje de componente de resumen
(digest)
-managerBase.random = Excepci\u00F3n inicializando generador de n\u00FAmeros aleatorios de
clase {0}
-managerBase.seeding = Sembrando clase de generador de n\u00FAmeros aleatorios {0}
-serverSession.value.iae = valor nulo
-standardManager.alreadyStarted = Ya ha sido arrancado el Gestor
-standardManager.createSession.ise = createSession\: Demasiadas sesiones activas
-standardManager.expireException = processsExpire\: Excepci\u00F3n durante la
expiraci\u00F3n de sesi\u00F3n
-standardManager.loading = Cargando sesiones persistidas desde {0}
-standardManager.loading.cnfe = ClassNotFoundException al cargar sesiones persistidas\:
{0}
-standardManager.loading.ioe = IOException al cargar sesiones persistidas\: {0}
-standardManager.notStarted = A\u00FAn no se ha arrancado el Gestor
-standardManager.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de sesi\u00F3n
{0}
-standardManager.unloading = Salvando sesiones persistidas a {0}
-standardManager.unloading.ioe = IOException al salvar sesiones persistidas\: {0}
-standardManager.managerLoad = Excepci\u00F3n cargando sesiones desde almacenamiento
persistente
-standardManager.managerUnload = Excepci\u00F3n descargando sesiones a almacenamiento
persistente
-standardSession.attributeEvent = El oyente de eventos de atributo de Sesi\u00F3n
lanz\u00F3 una excepci\u00F3n
-standardSession.bindingEvent = El oyente de eventos de ligado de Sesi\u00F3n lanz\u00F3
una excepci\u00F3n
-standardSession.invalidate.ise = invalidate\: La Sesi\u00F3n ya ha sido invalidada
-standardSession.isNew.ise = isNew\: La Sesi\u00F3n ya ha sido invalidada
-standardSession.getAttribute.ise = getAttribute\: La Sesi\u00F3n ya ha sido invalidada
-standardSession.getAttributeNames.ise = getAttributeNames\: La Sesi\u00F3n ya ha sido
invalidada
-standardSession.getCreationTime.ise = getCreationTime\: La Sesi\u00F3n ya ha sido
invalidada
-standardSession.getLastAccessedTime.ise = getLastAccessedTime\: La Sesi\u00F3n ya ha sido
invalidada
-standardSession.getId.ise = getId\: La Sesi\u00F3n ya ha sido invalidada
-standardSession.getMaxInactiveInterval.ise = getMaxInactiveInterval\: La Sesi\u00F3n ya
ha sido invalidada
-standardSession.getValueNames.ise = getValueNames\: La Sesi\u00F3n ya ha sido invalidada
-standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n {0} para
sesi\u00F3n {1}
-standardSession.removeAttribute.ise = removeAttribute\: La Sesi\u00F3n ya ha sido
invalidada
-standardSession.sessionEvent = El oyente de evento de Sesi\u00F3n lanz\u00F3 una
execpci\u00F3n
-standardSession.setAttribute.iae = setAttribute\: Atributo no serializable
-standardSession.setAttribute.ise = setAttribute\: La Sesi\u00F3n ya ha sido invalidada
-standardSession.setAttribute.namenull = setAttribute\: el nuevo par\u00E1metro no puede
ser nulo
-standardSession.sessionCreated = Creada Sesi\u00F3n id \= {0}
-persistentManager.loading = Cargando {0} sesiones persistidas
-persistentManager.unloading = Salvando {0} sesiones persistidas
-persistentManager.expiring = Expirando {0} sesiones antes de salvarlas
-persistentManager.deserializeError = Error des-serializando Sesi\u00F3n {0}\: {1}
-persistentManager.serializeError = Error serializando Sesi\u00F3n {0}\: {1}
-persistentManager.swapMaxIdle = Intercambiando sesi\u00F3n {0} a fuera a Almac\u00E9n,
ociosa durante {1} segundos
-persistentManager.backupMaxIdle = Respaldando sesi\u00F3n {0} a Almac\u00E9n, ociosa
durante {1} segundos
-persistentManager.backupException = Ha tenido lugar una excepci\u00F3n al respaldar la
Sesi\u00F3n {0}\: {1}
-persistentManager.tooManyActive = Demasiadas sesiones activas, {0}, buscando sesiones
ociosas para intercambiar
-persistentManager.swapTooManyActive = Intercambiando sesi\u00F3n {0} a fuera, ociosa
durante {1} segundos\: Demasiadas sesiones activas
-persistentManager.processSwaps = Mirando qu\u00E9 sesiones intercambiar a fuera, {0}
sesiones activas en memoria
-persistentManager.activeSession = La sesi\u00F3n {0} ha estado ociosa durante {1}
segundos
-persistentManager.swapIn = Intercambiando sesi\u00F3n {0} a dentro desde Almac\u00E9n
Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties 2012-09-05
08:00:43 UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties 2012-09-06
14:06:07 UTC (rev 2079)
@@ -1,65 +0,0 @@
-applicationSession.session.ise=�tat de session invalide
-applicationSession.value.iae=valeur nulle
-fileStore.alreadyStarted=Le "File Store" a d�j� �t� d�marr�
-fileStore.notStarted=Le "File Store" n''a pas encore �t� d�marr�
-fileStore.saving=Sauvegarde de la Session {0} vers le fichier {1}
-fileStore.loading=Chargement de la Session {0} depuis le fichier {1}
-fileStore.removing=Retrait de la Session {0} du fichier {1}
-JDBCStore.alreadyStarted=Le "JDBC Store" a d�j� �t� d�marr�
-JDBCStore.notStarted=Le "JDBC Store" n''a pas encore �t� d�marr�
-JDBCStore.saving=Sauvegarde de la Session {0} vers la base de donn�es {1}
-JDBCStore.loading=Chargement de la Session {0} depuis la base de donn�es {1}
-JDBCStore.removing=Retrait de la Session {0} de la base de donn�es {1}
-JDBCStore.SQLException=Erreur SQL {0}
-JDBCStore.checkConnectionDBClosed=La connexion � la base de donn�es est nulle ou a �t�
trouv� ferm�. Tentative de r�ouverture.
-JDBCStore.checkConnectionDBReOpenFail=La tentative de r�ouverture re-open de la base de
donn�es a �chou�. La base de donn�es est peut �tre arr�t�e.
-JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite {0}
-JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a pas
�t� trouv�e {0}
-managerBase.complete=L''alimentation du g�n�rateur de nombre al�atoire est
termin�
-managerBase.getting=Prise du composant d''algorithme empreinte de message
(message digest) pour l''algorithme {0}
-managerBase.gotten=Prise du composant d''algorithme empreinte de message (message
digest) termin�e
-managerBase.random=Exception durant l''initialisation de la classe du g�n�rateur
de nombre al�atoire {0}
-managerBase.seeding=Alimentation de la classe du g�n�rateur de nombre al�atoire {0}
-serverSession.value.iae=valeur nulle
-standardManager.alreadyStarted=Le "Manager" a �t� d�marr�
-standardManager.createSession.ise="createSession": Trop de sessions actives
-standardManager.expireException="processsExpire": Exception lors de
l''expiration de la session
-standardManager.loading=Chargement des sessions qui ont persist�s depuis {0}
-standardManager.loading.cnfe="ClassNotFoundException" lors du chargement de
sessions persistantes: {0}
-standardManager.loading.ioe="IOException" lors du chargement des sessions
persistantes: {0}
-standardManager.notStarted=Le "Manager" n''a pas encore �t� d�marr�
-standardManager.sessionTimeout=R�glage du d�lai d''inactivit� (timeout) de
session invalide {0}
-standardManager.unloading=Sauvegarde des sessions ayant persist�es vers {0}
-standardManager.unloading.ioe="IOException" lors de la sauvegarde de sessions
persistantes: {0}
-standardManager.managerLoad=Exception au chargement des sessions depuis le stockage
persistant (persistent storage)
-standardManager.managerUnload=Exception au d�chargement des sessions vers le stockage
persistant (persistent storage)
-standardSession.attributeEvent=L''�couteur d''�v�nement Attribut de
Session (attribute event listener) a g�n�r� une exception
-standardSession.invalidate.ise="invalidate": Session d�j� invalid�e
-standardSession.isNew.ise="isNew": Session d�j� invalid�e
-standardSession.getAttribute.ise="getAttribute": Session d�j� invalid�e
-standardSession.getAttributeNames.ise="getAttributeNames": Session d�j�
invalid�e
-standardSession.getCreationTime.ise="getCreationTime": Session d�j� invalid�e
-standardSession.getLastAccessedTime.ise="getLastAccessedTime": Session
d\u00E9j\u00E0 invalid\u00E9e
-standardSession.getId.ise=getId: Session d�j� invalid�e
-standardSession.getMaxInactiveInterval.ise="getMaxInactiveInterval": Session
d�j� invalid�e
-standardSession.getValueNames.ise="getValueNames": Session d�j� invalid�e
-standardSession.notSerializable=Impossible de s�rialiser l''attribut de session
{0} pour la session {1}
-standardSession.removeAttribute.ise="removeAttribute": Session d�j� invalid�e
-standardSession.sessionEvent=L''�couteur d''�v�nement de session (session
event listener) a g�n�r� une exception
-standardSession.setAttribute.iae="setAttribute": attribut non s�rialisable
-standardSession.setAttribute.ise="setAttribute": Session d�j� invalid�e
-standardSession.setAttribute.namenull="setAttribute": le nom de param�tre ne
peut �tre nul
-standardSession.sessionCreated=Cr�ation de l''Id de Session = {0}
-persistentManager.loading=Chargement de {0} sessions persistantes
-persistentManager.unloading=Sauvegarde de {0} sessions persistantes
-persistentManager.expiring=Expiration de {0} sessions avant leur sauvegarde
-persistentManager.deserializeError=Erreur lors de la d�s�rialisation de la session {0}:
{1}
-persistentManager.serializeError=Erreur lors de la s�rialisation de la session {0}: {1}
-persistentManager.swapMaxIdle=Basculement de la session {0} vers le stockage (Store), en
attente pour {1} secondes
-persistentManager.backupMaxIdle=Sauvegarde de la session {0} vers le stockage (Store), en
attente pour {1} secondes
-persistentManager.backupException=Exception lors de la sauvegarde de la session {0}: {1}
-persistentManager.tooManyActive=Trop de sessions actives, {0}, � la recherche de sessions
en attente pour basculement vers stockage (swap out)
-persistentManager.swapTooManyActive=Basculement vers stockage (swap out) de la session
{0}, en attente pour {1} secondes trop de sessions actives
-persistentManager.processSwaps=Recherche de sessions � basculer vers stockage (swap out),
{0} sessions actives en m�moire
-persistentManager.activeSession=La session {0} a �t� en attente durant {1} secondes
-persistentManager.swapIn=Basculement depuis le stockage (swap in) de la session {0}
Deleted: trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties 2012-09-05
08:00:43 UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties 2012-09-06
14:06:07 UTC (rev 2079)
@@ -1,67 +0,0 @@
-applicationSession.session.ise=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u72b6\u614b\u3067\u3059
-applicationSession.value.iae=null\u5024\u3067\u3059
-fileStore.alreadyStarted=\u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30a2\u304c\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
-fileStore.notStarted=\u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30a2\u304c\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-fileStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1}
\u306b\u4fdd\u5b58\u3057\u307e\u3059
-fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1}
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1}
\u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.alreadyStarted=JDBC\u30b9\u30c8\u30a2\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
-JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a {0}
\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-JDBCStore.notStarted=JDBC\u30b9\u30c8\u30a2\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u307e\u305b\u3093
-JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u306b\u4fdd\u5b58\u3057\u307e\u3059
-JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1}
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-JDBCStore.removing= \u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.SQLException=SQL\u30a8\u30e9\u30fc {0}
-JDBCStore.checkConnectionDBClosed=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u304cnull\u3067\u3042\u308b\u304b\u3001\u30af\u30ed\u30fc\u30ba\u3055\u308c\u3066\u3044\u308b\u306e\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u518d\u30aa\u30fc\u30d7\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-JDBCStore.checkConnectionDBReOpenFail=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u518d\u30aa\u30fc\u30d7\u30f3\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u30c0\u30a6\u30f3\u3057\u3066\u3044\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-JDBCStore.checkConnectionSQLException=SQL\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
{0}
-JDBCStore.checkConnectionClassNotFoundException=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
{0}
-managerBase.complete=\u4e71\u6570\u767a\u751f\u5668\u306e\u30b7\u30fc\u30c9\u306e\u751f\u6210\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f
-managerBase.getting=\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0 {0}
\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u53d6\u5f97\u3057\u307e\u3059
-managerBase.gotten=\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u53d6\u5f97\u3092\u5b8c\u4e86\u3057\u307e\u3057\u305f
-managerBase.random=\u30af\u30e9\u30b9 {0}
\u306e\u4e71\u6570\u767a\u751f\u5668\u306e\u521d\u671f\u5316\u306e\u4f8b\u5916\u3067\u3059
-managerBase.seeding=\u4e71\u6570\u767a\u751f\u5668\u30af\u30e9\u30b9 {0}
\u306e\u30b7\u30fc\u30c9\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059
-serverSession.value.iae=null\u5024\u3067\u3059
-standardManager.alreadyStarted=\u30de\u30cd\u30fc\u30b8\u30e3\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
-standardManager.createSession.ise=createSession:
\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059
-standardManager.expireException=processsExpire:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u7d42\u4e86\u51e6\u7406\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-standardManager.loading={0}
\u304b\u3089\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
-standardManager.loading.cnfe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306bClassNotFoundException\u304c\u767a\u751f\u3057\u307e\u3057\u305f:
{0}
-standardManager.loading.ioe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306eIOException\u3067\u3059:
{0}
-standardManager.notStarted=\u30de\u30cd\u30fc\u30b8\u30e3\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-standardManager.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059
{0}
-standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092
{0} \u306b\u4fdd\u5b58\u3057\u307e\u3059
-standardManager.unloading.ioe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4fdd\u5b58\u4e2d\u306eIOException\u3067\u3059:
{0}
-standardManager.managerLoad=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u304b\u3089\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-standardManager.managerUnload=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30a2\u30f3\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-standardSession.attributeEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-standardSession.bindingEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-standardSession.invalidate.ise=invalidate:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.isNew.ise=isNew:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getAttribute.ise=getAttribute:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getAttributeNames.ise=getAttributeNames:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getCreationTime.ise=getCreationTime:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getLastAccessedTime.ise=getLastAccessedTime:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getId.ise=getId:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.getValueNames.ise=getValueNames:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.notSerializable=\u30bb\u30c3\u30b7\u30e7\u30f3 {1}
\u306e\u305f\u3081\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027 {0}
\u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u307e\u305b\u3093
-standardSession.removeAttribute.ise=removeAttribute:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.sessionEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-standardSession.setAttribute.iae=setAttribute:
\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u306a\u3044\u5c5e\u6027\u3067\u3059
-standardSession.setAttribute.ise=setAttribute:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.setAttribute.namenull=setAttribute:
name\u30d1\u30e9\u30e1\u30bf\u306fnull\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-standardSession.sessionCreated=\u30bb\u30c3\u30b7\u30e7\u30f3ID = {0}
\u3092\u751f\u6210\u3057\u307e\u3057\u305f
-persistentManager.loading={0}
\u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059
-persistentManager.unloading={0}
\u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3057\u307e\u3059
-persistentManager.expiring= {0}
\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3059\u308b\u524d\u306b\u671f\u9650\u5207\u308c\u306b\u306a\u308a\u307e\u3057\u305f
-persistentManager.deserializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059:
{1}
-persistentManager.serializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059: {1}
-persistentManager.swapMaxIdle={1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3
{0}
\u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30b9\u30ef\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-persistentManager.backupMaxIdle={1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3
{0}
\u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-persistentManager.backupException=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3059\u308b\u6642\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f:
{1}
-persistentManager.tooManyActive=\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059\u3001{0}\u3001\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3059\u308b\u305f\u3081\u306b\u30a2\u30a4\u30c9\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u63a2\u3057\u3066\u3044\u307e\u3059
-persistentManager.swapTooManyActive=\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u308b\u306e\u3067\u3001{1}\u79d2\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3
{0} \u3092\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3057\u307e\u3059
-persistentManager.processSwaps=\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30b9\u30ef\u30c3\u30d7\u3059\u308b\u305f\u3081\u306b\u30c1\u30a7\u30c3\u30af\u3057\u3066\u3044\u307e\u3059,
\u30e1\u30e2\u30ea\u4e2d\u306b {0}
\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u5b58\u5728\u3057\u307e\u3059
-persistentManager.activeSession=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u306f{1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u307e\u3059
-persistentManager.swapIn=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30b9\u30ef\u30c3\u30d7\u30a4\u30f3\u3057\u3066\u3044\u307e\u3059
Modified: trunk/src/main/java/org/apache/catalina/session/ManagerBase.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/ManagerBase.java 2012-09-05 08:00:43
UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/ManagerBase.java 2012-09-06 14:06:07
UTC (rev 2079)
@@ -40,9 +40,8 @@
import org.apache.catalina.Session;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.util.StringManager;
import org.apache.tomcat.util.modeler.Registry;
-import org.jboss.logging.Logger;
+import org.jboss.web.CatalinaLogger;
/**
@@ -55,7 +54,6 @@
*/
public abstract class ManagerBase implements Manager, MBeanRegistration {
- protected Logger log = Logger.getLogger(ManagerBase.class);
private static final char[] SESSION_ID_ALPHABET =
System.getProperty("org.apache.catalina.session.ManagerBase.SESSION_ID_ALPHABET",
@@ -156,12 +154,6 @@
protected int processExpiresFrequency = 6;
/**
- * The string manager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
- /**
* The property change support for this component.
*/
protected PropertyChangeSupport support = new PropertyChangeSupport(this);
@@ -384,16 +376,16 @@
Session sessions[] = findSessions();
int expireHere = 0 ;
- if(log.isDebugEnabled())
- log.debug("Start expire sessions " + getName() + " at " +
timeNow + " sessioncount " + sessions.length);
+ if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled())
+ CatalinaLogger.SESSION_LOGGER.debug("Start expire sessions " +
getName() + " at " + timeNow + " sessioncount " + sessions.length);
for (int i = 0; i < sessions.length; i++) {
if (sessions[i] != null && !sessions[i].isValid()) {
expireHere++;
}
}
long timeEnd = System.currentTimeMillis();
- if(log.isDebugEnabled())
- log.debug("End expire sessions " + getName() + "
processingTime " + (timeEnd - timeNow) + " expired sessions: " +
expireHere);
+ if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled())
+ CatalinaLogger.SESSION_LOGGER.debug("End expire sessions " +
getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions:
" + expireHere);
processingTime += ( timeEnd - timeNow );
}
@@ -411,8 +403,6 @@
if( initialized ) return;
initialized=true;
- log = Logger.getLogger(ManagerBase.class);
-
StandardContext ctx=(StandardContext)this.getContainer();
distributable = ctx.getDistributable();
if (org.apache.tomcat.util.Constants.ENABLE_MODELER) {
@@ -429,13 +419,13 @@
+ path + ",host=" + hst.getName());
Registry.getRegistry(null, null).registerComponent(this, oname, null
);
} catch (Exception e) {
- log.error("Error registering ",e);
+
CatalinaLogger.SESSION_LOGGER.failedSessionManagerJmxRegistration(oname, e);
}
}
}
- if(log.isDebugEnabled())
- log.debug("Registering " + oname );
+ if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled())
+ CatalinaLogger.SESSION_LOGGER.debug("Registering " + oname );
}
@@ -811,8 +801,6 @@
public String getSessionAttribute( String sessionId, String key ) {
Session s = (Session) sessions.get(sessionId);
if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
return null;
}
Object o=s.getSession().getAttribute(key);
@@ -836,9 +824,6 @@
public HashMap getSession(String sessionId) {
Session s = (Session) sessions.get(sessionId);
if (s == null) {
- if (log.isInfoEnabled()) {
- log.info("Session not found " + sessionId);
- }
return null;
}
@@ -860,8 +845,6 @@
public void expireSession( String sessionId ) {
Session s=(Session)sessions.get(sessionId);
if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
return;
}
s.expire();
@@ -871,8 +854,6 @@
public String getLastAccessedTime( String sessionId ) {
Session s=(Session)sessions.get(sessionId);
if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
return "";
}
return new Date(s.getLastAccessedTime()).toString();
@@ -881,8 +862,6 @@
public String getCreationTime( String sessionId ) {
Session s=(Session)sessions.get(sessionId);
if( s==null ) {
- if(log.isInfoEnabled())
- log.info("Session not found " + sessionId);
return "";
}
return new Date(s.getCreationTime()).toString();
Modified: trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java 2012-09-05
08:00:43 UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/PersistentManagerBase.java 2012-09-06
14:06:07 UTC (rev 2079)
@@ -18,6 +18,8 @@
package org.apache.catalina.session;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.IOException;
@@ -36,7 +38,8 @@
import org.apache.catalina.Store;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.LifecycleSupport;
-import org.jboss.logging.Logger;
+import org.jboss.web.CatalinaLogger;
+
/**
* Extends the <b>ManagerBase</b> class to implement most of the
* functionality required by a Manager which supports any kind of
@@ -55,8 +58,6 @@
extends ManagerBase
implements Lifecycle, PropertyChangeListener {
- private static Logger log = Logger.getLogger(PersistentManagerBase.class);
-
// ---------------------------------------------------- Security Classes
private class PrivilegedStoreClear
@@ -370,7 +371,7 @@
if ( super.findSession(id) != null )
return true;
} catch (IOException e) {
- log.error("checking isLoaded for id, " + id + ",
"+e.getMessage(), e);
+ CatalinaLogger.SESSION_LOGGER.persistentManagerIsLoadedException(id, e);
}
return false;
}
@@ -524,15 +525,13 @@
AccessController.doPrivileged(new PrivilegedStoreClear());
}catch(PrivilegedActionException ex){
Exception exception = ex.getException();
- log.error("Exception clearing the Store: " + exception);
- exception.printStackTrace();
+
CatalinaLogger.SESSION_LOGGER.persistentManagerStoreClearException(exception);
}
} else {
store.clear();
}
} catch (IOException e) {
- log.error("Exception clearing the Store: " + e);
- e.printStackTrace();
+ CatalinaLogger.SESSION_LOGGER.persistentManagerStoreClearException(e);
}
}
@@ -546,8 +545,8 @@
long timeNow = System.currentTimeMillis();
Session sessions[] = findSessions();
int expireHere = 0 ;
- if(log.isDebugEnabled())
- log.debug("Start expire sessions " + getName() + " at "
+ timeNow + " sessioncount " + sessions.length);
+ if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled())
+ CatalinaLogger.SESSION_LOGGER.debug("Start expire sessions " +
getName() + " at " + timeNow + " sessioncount " + sessions.length);
for (int i = 0; i < sessions.length; i++) {
if (!sessions[i].isValid()) {
expiredSessions++;
@@ -560,8 +559,8 @@
}
long timeEnd = System.currentTimeMillis();
- if(log.isDebugEnabled())
- log.debug("End expire sessions " + getName() + "
processingTime " + (timeEnd - timeNow) + " expired sessions: " +
expireHere);
+ if(CatalinaLogger.SESSION_LOGGER.isDebugEnabled())
+ CatalinaLogger.SESSION_LOGGER.debug("End expire sessions " +
getName() + " processingTime " + (timeEnd - timeNow) + " expired sessions:
" + expireHere);
processingTime += (timeEnd - timeNow);
}
@@ -658,15 +657,13 @@
AccessController.doPrivileged(new PrivilegedStoreKeys());
}catch(PrivilegedActionException ex){
Exception exception = ex.getException();
- log.error("Exception in the Store during load: "
- + exception);
- exception.printStackTrace();
+ CatalinaLogger.SESSION_LOGGER.persistentManagerLoadFailed(exception);
}
} else {
ids = store.keys();
}
} catch (IOException e) {
- log.error("Can't load sessions from store, " + e.getMessage(),
e);
+ CatalinaLogger.SESSION_LOGGER.persistentManagerLoadFailed(e);
return;
}
@@ -674,14 +671,11 @@
if (n == 0)
return;
- if (log.isDebugEnabled())
- log.debug(sm.getString("persistentManager.loading",
String.valueOf(n)));
-
for (int i = 0; i < n; i++)
try {
swapIn(ids[i]);
} catch (IOException e) {
- log.error("Failed load session from store, " + e.getMessage(),
e);
+ CatalinaLogger.SESSION_LOGGER.persistentManagerLoadFailed(e);
}
}
@@ -716,16 +710,13 @@
AccessController.doPrivileged(new PrivilegedStoreRemove(id));
}catch(PrivilegedActionException ex){
Exception exception = ex.getException();
- log.error("Exception in the Store during removeSession: "
- + exception);
- exception.printStackTrace();
+
CatalinaLogger.SESSION_LOGGER.persistentManagerSessionRemoveFailed(id, exception);
}
} else {
store.remove(id);
}
} catch (IOException e) {
- log.error("Exception removing session " + e.getMessage());
- e.printStackTrace();
+ CatalinaLogger.SESSION_LOGGER.persistentManagerSessionRemoveFailed(id, e);
}
}
@@ -748,9 +739,7 @@
if (n == 0)
return;
- if (log.isDebugEnabled())
- log.debug(sm.getString("persistentManager.unloading",
- String.valueOf(n)));
+ CatalinaLogger.SESSION_LOGGER.persistentManagerSessionUnloadCount(n);
for (int i = 0; i < n; i++)
try {
@@ -810,9 +799,7 @@
new PrivilegedStoreLoad(id));
} catch (PrivilegedActionException ex) {
Exception e = ex.getException();
- log.error(sm.getString(
- "persistentManager.swapInException", id),
- e);
+
CatalinaLogger.SESSION_LOGGER.persistentManagerSwapInFailed(id, e);
if (e instanceof IOException){
throw (IOException)e;
} else if (e instanceof ClassNotFoundException) {
@@ -823,24 +810,18 @@
session = store.load(id);
}
} catch (ClassNotFoundException e) {
- String msg = sm.getString(
- "persistentManager.deserializeError", id);
- log.error(msg, e);
- throw new IllegalStateException(msg, e);
+ throw MESSAGES.persistentManagerDeserializeError(id, e);
}
if (session != null && !session.isValid()) {
- log.error(sm.getString(
- "persistentManager.swapInInvalid", id));
+ CatalinaLogger.SESSION_LOGGER.persistentManagerSwapInInvalid(id);
session.expire();
removeSession(id);
session = null;
}
if (session != null) {
- if(log.isDebugEnabled())
- log.debug(sm.getString("persistentManager.swapIn",
id));
-
+ CatalinaLogger.SESSION_LOGGER.sessionSwapIn(id);
session.setManager(this);
// make sure the listeners know about it.
((StandardSession)session).tellNew();
@@ -904,16 +885,13 @@
AccessController.doPrivileged(new PrivilegedStoreSave(session));
}catch(PrivilegedActionException ex){
Exception exception = ex.getException();
- log.error("Exception in the Store during writeSession: "
- + exception);
- exception.printStackTrace();
+
CatalinaLogger.SESSION_LOGGER.persistentManagerStoreSaveError(session.getIdInternal(),
exception);
}
} else {
store.save(session);
}
} catch (IOException e) {
- log.error(sm.getString
- ("persistentManager.serializeError", session.getIdInternal(),
e));
+
CatalinaLogger.SESSION_LOGGER.persistentManagerStoreSaveError(session.getIdInternal(),
e);
throw e;
}
@@ -970,7 +948,6 @@
// Validate and update our current component state
if (started) {
- log.info(sm.getString("standardManager.alreadyStarted"));
return;
}
if( ! initialized )
@@ -980,7 +957,7 @@
started = true;
if (store == null)
- log.error("No Store configured, persistence disabled");
+ CatalinaLogger.SESSION_LOGGER.noStoreConfigured();
else if (store instanceof Lifecycle)
((Lifecycle)store).start();
@@ -997,12 +974,8 @@
*/
public void stop() throws LifecycleException {
- if (log.isDebugEnabled())
- log.debug("Stopping");
-
// Validate and update our current component state
if (!isStarted()) {
- log.info(sm.getString("standardManager.notStarted"));
return;
}
@@ -1052,8 +1025,7 @@
setMaxInactiveInterval
( ((Integer) event.getNewValue()).intValue()*60 );
} catch (NumberFormatException e) {
- log.error(sm.getString("standardManager.sessionTimeout",
- event.getNewValue().toString()));
+
CatalinaLogger.SESSION_LOGGER.managerInvalidSessionTimeout(event.getNewValue().toString());
}
}
@@ -1089,10 +1061,7 @@
// Session is currently being accessed - skip it
continue;
}
- if (log.isDebugEnabled())
- log.debug(sm.getString
- ("persistentManager.swapMaxIdle",
- session.getIdInternal(), new Integer(timeIdle)));
+
CatalinaLogger.SESSION_LOGGER.sessionSwapOut(session.getIdInternal(), timeIdle);
try {
swapOut(session);
} catch (IOException e) {
@@ -1120,10 +1089,7 @@
if (getMaxActiveSessions() >= sessions.length)
return;
- if(log.isDebugEnabled())
- log.debug(sm.getString
- ("persistentManager.tooManyActive",
- new Integer(sessions.length)));
+ CatalinaLogger.SESSION_LOGGER.persistentManagerCheckIdle(sessions.length);
int toswap = sessions.length - getMaxActiveSessions();
long timeNow = System.currentTimeMillis();
@@ -1139,10 +1105,7 @@
// Session is currently being accessed - skip it
continue;
}
- if(log.isDebugEnabled())
- log.debug(sm.getString
- ("persistentManager.swapTooManyActive",
- session.getIdInternal(), new Integer(timeIdle)));
+
CatalinaLogger.SESSION_LOGGER.persistentManagerSwapIdleSession(session.getIdInternal(),
timeIdle);
try {
swapOut(session);
} catch (IOException e) {
@@ -1177,11 +1140,7 @@
int timeIdle = // Truncate, do not round up
(int) ((timeNow - session.getLastAccessedTime()) / 1000L);
if (timeIdle > maxIdleBackup) {
- if (log.isDebugEnabled())
- log.debug(sm.getString
- ("persistentManager.backupMaxIdle",
- session.getIdInternal(), new Integer(timeIdle)));
-
+
CatalinaLogger.SESSION_LOGGER.persistentManagerBackupSession(session.getIdInternal(),
timeIdle);
try {
writeSession(session);
} catch (IOException e) {
Modified: trunk/src/main/java/org/apache/catalina/session/StandardManager.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/StandardManager.java 2012-09-05
08:00:43 UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/StandardManager.java 2012-09-06
14:06:07 UTC (rev 2079)
@@ -18,6 +18,8 @@
package org.apache.catalina.session;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.BufferedInputStream;
@@ -48,6 +50,8 @@
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.CustomObjectInputStream;
import org.apache.catalina.util.LifecycleSupport;
+import org.jboss.web.CatalinaLogger;
+
/**
* Standard implementation of the <b>Manager</b> interface that provides
* simple session persistence across restarts of this component (such as
@@ -290,8 +294,7 @@
if ((maxActiveSessions >= 0) &&
(sessions.size() >= maxActiveSessions)) {
rejectedSessions++;
- throw new IllegalStateException
- (sm.getString("standardManager.createSession.ise"));
+ throw MESSAGES.managerMaxActiveSessions();
}
return (super.createSession(sessionId, random));
@@ -319,9 +322,6 @@
} else if (exception instanceof IOException){
throw (IOException)exception;
}
- if (log.isDebugEnabled())
- log.debug("Unreported exception in load() "
- + exception);
}
} else {
doLoad();
@@ -339,9 +339,6 @@
* @exception IOException if an input/output error occurs
*/
protected void doLoad() throws ClassNotFoundException, IOException {
- if (log.isDebugEnabled())
- log.debug("Start: Loading persisted sessions");
-
// Initialize our internal data structures
sessions.clear();
@@ -349,8 +346,6 @@
File file = file();
if (file == null)
return;
- if (log.isDebugEnabled())
- log.debug(sm.getString("standardManager.loading", pathname));
FileInputStream fis = null;
ObjectInputStream ois = null;
Loader loader = null;
@@ -363,20 +358,14 @@
if (loader != null)
classLoader = loader.getClassLoader();
if (classLoader != null) {
- if (log.isDebugEnabled())
- log.debug("Creating custom object input stream for class loader
");
ois = new CustomObjectInputStream(bis, classLoader);
} else {
- if (log.isDebugEnabled())
- log.debug("Creating standard object input stream");
ois = new ObjectInputStream(bis);
}
} catch (FileNotFoundException e) {
- if (log.isDebugEnabled())
- log.debug("No persisted data file found");
return;
} catch (IOException e) {
- log.error(sm.getString("standardManager.loading.ioe", e), e);
+ CatalinaLogger.SESSION_LOGGER.managerLoadFailed(e);
if (ois != null) {
try {
ois.close();
@@ -393,8 +382,6 @@
try {
Integer count = (Integer) ois.readObject();
int n = count.intValue();
- if (log.isDebugEnabled())
- log.debug("Loading " + n + " persisted
sessions");
for (int i = 0; i < n; i++) {
StandardSession session = getNewSession();
session.readObjectData(ois);
@@ -406,7 +393,7 @@
}
}
} catch (ClassNotFoundException e) {
- log.error(sm.getString("standardManager.loading.cnfe", e), e);
+ CatalinaLogger.SESSION_LOGGER.managerLoadFailed(e);
if (ois != null) {
try {
ois.close();
@@ -417,7 +404,7 @@
}
throw e;
} catch (IOException e) {
- log.error(sm.getString("standardManager.loading.ioe", e), e);
+ CatalinaLogger.SESSION_LOGGER.managerLoadFailed(e);
if (ois != null) {
try {
ois.close();
@@ -441,9 +428,6 @@
file.delete();
}
}
-
- if (log.isDebugEnabled())
- log.debug("Finish: Loading persisted sessions");
}
@@ -463,9 +447,6 @@
if (exception instanceof IOException){
throw (IOException)exception;
}
- if (log.isDebugEnabled())
- log.debug("Unreported exception in unLoad() "
- + exception);
}
} else {
doUnload();
@@ -482,22 +463,17 @@
*/
protected void doUnload() throws IOException {
- if (log.isDebugEnabled())
- log.debug("Unloading persisted sessions");
-
// Open an output stream to the specified pathname, if any
File file = file();
if (file == null)
return;
- if (log.isDebugEnabled())
- log.debug(sm.getString("standardManager.unloading", pathname));
FileOutputStream fos = null;
ObjectOutputStream oos = null;
try {
fos = new FileOutputStream(file.getAbsolutePath());
oos = new ObjectOutputStream(new BufferedOutputStream(fos));
} catch (IOException e) {
- log.error(sm.getString("standardManager.unloading.ioe", e), e);
+ CatalinaLogger.SESSION_LOGGER.managerUnloadFailed(e);
if (oos != null) {
try {
oos.close();
@@ -512,8 +488,6 @@
// Write the number of active sessions, followed by the details
ArrayList list = new ArrayList();
synchronized (sessions) {
- if (log.isDebugEnabled())
- log.debug("Unloading " + sessions.size() + "
sessions");
try {
oos.writeObject(new Integer(sessions.size()));
Iterator elements = sessions.values().iterator();
@@ -525,7 +499,7 @@
session.writeObjectData(oos);
}
} catch (IOException e) {
- log.error(sm.getString("standardManager.unloading.ioe", e),
e);
+ CatalinaLogger.SESSION_LOGGER.managerUnloadFailed(e);
if (oos != null) {
try {
oos.close();
@@ -556,8 +530,6 @@
}
// Expire all the sessions we just wrote
- if (log.isDebugEnabled())
- log.debug("Expiring " + list.size() + " persisted
sessions");
Iterator expires = list.iterator();
while (expires.hasNext()) {
StandardSession session = (StandardSession) expires.next();
@@ -569,10 +541,6 @@
session.recycle();
}
}
-
- if (log.isDebugEnabled())
- log.debug("Unloading complete");
-
}
@@ -637,7 +605,7 @@
try {
load();
} catch (Throwable t) {
- log.error(sm.getString("standardManager.managerLoad"), t);
+ CatalinaLogger.SESSION_LOGGER.managerLoadFailed(t);
}
}
@@ -664,7 +632,7 @@
try {
unload();
} catch (Throwable t) {
- log.error(sm.getString("standardManager.managerUnload"), t);
+ CatalinaLogger.SESSION_LOGGER.managerUnloadFailed(t);
}
// Expire all active sessions
@@ -711,8 +679,7 @@
setMaxInactiveInterval
( ((Integer) event.getNewValue()).intValue()*60 );
} catch (NumberFormatException e) {
- log.error(sm.getString("standardManager.sessionTimeout",
- event.getNewValue().toString()));
+
CatalinaLogger.SESSION_LOGGER.managerInvalidSessionTimeout(event.getNewValue().toString());
}
}
Modified: trunk/src/main/java/org/apache/catalina/session/StandardSession.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/StandardSession.java 2012-09-05
08:00:43 UTC (rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/StandardSession.java 2012-09-06
14:06:07 UTC (rev 2079)
@@ -19,6 +19,8 @@
package org.apache.catalina.session;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.IOException;
import java.io.NotSerializableException;
import java.io.ObjectInputStream;
@@ -54,7 +56,6 @@
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.Enumerator;
-import org.apache.catalina.util.StringManager;
/**
* Standard implementation of the <b>Session</b> interface. This object is
@@ -238,13 +239,6 @@
/**
- * The string manager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
- /**
* The HTTP session context associated with this session.
*/
protected static HttpSessionContext sessionContext = null;
@@ -379,8 +373,7 @@
} catch (Exception e) {
;
}
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.sessionEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionEventListenerException(), t);
}
}
}
@@ -410,8 +403,7 @@
public long getThisAccessedTime() {
if (!isValidInternal()) {
- throw new IllegalStateException
- (sm.getString("standardSession.getThisAccessedTime.ise"));
+ throw MESSAGES.invalidSession();
}
return (this.thisAccessedTime);
@@ -434,8 +426,7 @@
public long getLastAccessedTime() {
if (!isValidInternal()) {
- throw new IllegalStateException
- (sm.getString("standardSession.getLastAccessedTime.ise"));
+ throw MESSAGES.invalidSession();
}
return (lastAccessedTime + creationTime);
@@ -695,8 +686,7 @@
} catch (Exception e) {
;
}
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.sessionEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionEventListenerException(), t);
}
}
}
@@ -737,9 +727,7 @@
try {
gp.logout();
} catch (Exception e) {
- manager.getContainer().getLogger().error(
- sm.getString("standardSession.logoutfail"),
- e);
+
manager.getContainer().getLogger().error(MESSAGES.sessionLogoutException(), e);
}
}
@@ -777,8 +765,7 @@
((HttpSessionActivationListener)attribute)
.sessionWillPassivate(event);
} catch (Throwable t) {
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.attributeEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(),
t);
}
}
}
@@ -812,8 +799,7 @@
((HttpSessionActivationListener)attribute)
.sessionDidActivate(event);
} catch (Throwable t) {
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.attributeEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(),
t);
}
}
}
@@ -970,8 +956,7 @@
public long getCreationTime() {
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.getCreationTime.ise"));
+ throw MESSAGES.invalidSession();
return (this.creationTime);
@@ -1025,8 +1010,7 @@
public Object getAttribute(String name) {
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.getAttribute.ise"));
+ throw MESSAGES.invalidSession();
if (name == null) {
return null;
@@ -1047,8 +1031,7 @@
public Enumeration getAttributeNames() {
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.getAttributeNames.ise"));
+ throw MESSAGES.invalidSession();
return (new Enumerator(attributes.keySet(), true));
@@ -1087,8 +1070,7 @@
public String[] getValueNames() {
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.getValueNames.ise"));
+ throw MESSAGES.invalidSession();
return (keys());
@@ -1104,8 +1086,7 @@
public void invalidate() {
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.invalidate.ise"));
+ throw MESSAGES.invalidSession();
// Cause this session to expire
expire();
@@ -1126,8 +1107,7 @@
public boolean isNew() {
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.isNew.ise"));
+ throw MESSAGES.invalidSession();
return (this.isNew);
@@ -1201,8 +1181,7 @@
// Validate our current state
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.removeAttribute.ise"));
+ throw MESSAGES.invalidSession();
removeAttributeInternal(name, notify);
@@ -1275,8 +1254,7 @@
// Name cannot be null
if (name == null)
- throw new IllegalArgumentException
- (sm.getString("standardSession.setAttribute.namenull"));
+ throw MESSAGES.sessionAttributeNameIsNull();
// Null value is the same as removeAttribute()
if (value == null) {
@@ -1286,12 +1264,10 @@
// Validate our current state
if (!isValidInternal())
- throw new IllegalStateException
- (sm.getString("standardSession.setAttribute.ise"));
+ throw MESSAGES.invalidSession();
if ((manager != null) && manager.getDistributable() &&
!(value instanceof Serializable))
- throw new IllegalArgumentException
- (sm.getString("standardSession.setAttribute.iae", name));
+ throw MESSAGES.sessionAttributeIsNotSerializable(name);
// Construct an event with the new value
HttpSessionBindingEvent event = null;
@@ -1305,8 +1281,7 @@
try {
((HttpSessionBindingListener) value).valueBound(event);
} catch (Throwable t){
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.bindingEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionBindingEventListenerException(),
t);
}
}
}
@@ -1321,8 +1296,7 @@
((HttpSessionBindingListener) unbound).valueUnbound
(new HttpSessionBindingEvent(getSession(), name));
} catch (Throwable t) {
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.bindingEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionBindingEventListenerException(),
t);
}
}
@@ -1372,8 +1346,7 @@
} catch (Exception e) {
;
}
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.attributeEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(),
t);
}
}
@@ -1506,8 +1479,7 @@
stream.writeObject(saveValues.get(i));
} catch (NotSerializableException e) {
manager.getContainer().getLogger().warn
- (sm.getString("standardSession.notSerializable",
- saveNames.get(i), id), e);
+ (MESSAGES.sessionAttributeSerializationException(saveNames.get(i),
id), e);
stream.writeObject(NOT_SERIALIZED);
if (manager.getContainer().getLogger().isDebugEnabled())
manager.getContainer().getLogger().debug
@@ -1633,8 +1605,7 @@
} catch (Exception e) {
;
}
- manager.getContainer().getLogger().error
- (sm.getString("standardSession.attributeEvent"), t);
+
manager.getContainer().getLogger().error(MESSAGES.sessionAttributeEventListenerException(),
t);
}
}
Modified: trunk/src/main/java/org/apache/catalina/session/StoreBase.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/session/StoreBase.java 2012-09-05 08:00:43 UTC
(rev 2078)
+++ trunk/src/main/java/org/apache/catalina/session/StoreBase.java 2012-09-06 14:06:07 UTC
(rev 2079)
@@ -17,6 +17,8 @@
package org.apache.catalina.session;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
@@ -27,7 +29,6 @@
import org.apache.catalina.Manager;
import org.apache.catalina.Store;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
/**
* Abstract implementation of the Store interface to
@@ -68,11 +69,6 @@
protected PropertyChangeSupport support = new PropertyChangeSupport(this);
/**
- * The string manager for this package.
- */
- protected StringManager sm = StringManager.getManager(Constants.Package);
-
- /**
* The Manager with which this JDBCStore is associated.
*/
protected Manager manager;
@@ -238,8 +234,7 @@
public void start() throws LifecycleException {
// Validate and update our current component state
if (started)
- throw new LifecycleException
- (sm.getString(getStoreName()+".alreadyStarted"));
+ throw new LifecycleException(MESSAGES.storeAlreadyStarted());
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
@@ -257,8 +252,7 @@
public void stop() throws LifecycleException {
// Validate and update our current component state
if (!started)
- throw new LifecycleException
- (sm.getString(getStoreName()+".notStarted"));
+ throw new LifecycleException(MESSAGES.storeNotStarted());
lifecycle.fireLifecycleEvent(STOP_EVENT, null);
started = false;
Modified: trunk/src/main/java/org/jboss/web/CatalinaLogger.java
===================================================================
--- trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-05 08:00:43 UTC (rev
2078)
+++ trunk/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-06 14:06:07 UTC (rev
2079)
@@ -78,6 +78,11 @@
*/
CatalinaLogger STARTUP_LOGGER = Logger.getMessageLogger(CatalinaLogger.class,
"org.apache.catalina.startup");
+ /**
+ * A logger with the category of the package name.
+ */
+ CatalinaLogger SESSION_LOGGER = Logger.getMessageLogger(CatalinaLogger.class,
"org.apache.catalina.session");
+
@LogMessage(level = WARN)
@Message(id = 1000, value = "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.")
void digestCacheRemove();
@@ -246,4 +251,80 @@
@Message(id = 1040, value = "Security role name %s used in a <run-as>
without being defined in a <security-role>")
void roleValidationLink(String roleName);
+ @LogMessage(level = ERROR)
+ @Message(id = 1041, value = "Failed session manager [%s] JMX
registration.")
+ void failedSessionManagerJmxRegistration(Object objectName, @Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1042, value = "Exception loading persisted sessions.")
+ void managerLoadFailed(@Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1043, value = "Exception unloading persisted sessions.")
+ void managerUnloadFailed(@Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1044, value = "Invalid session timeout setting %s")
+ void managerInvalidSessionTimeout(String timeoutValue);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1045, value = "Exception checking load state for session
%s")
+ void persistentManagerIsLoadedException(String sessionId, @Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1046, value = "Exception clearing session store")
+ void persistentManagerStoreClearException(@Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1047, value = "Error loading persisted sessions")
+ void persistentManagerLoadFailed(@Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1048, value = "Error removing session %s")
+ void persistentManagerSessionRemoveFailed(String sessionId, @Cause Throwable t);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 1049, value = "Unloading %s sessions")
+ void persistentManagerSessionUnloadCount(int count);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1050, value = "Error swapping in session %s")
+ void persistentManagerSwapInFailed(String sessionId, @Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1051, value = "Error swapping out session %s")
+ void persistentManagerSwapOutFailed(String sessionId, @Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1052, value = "Swapped in invalid session %s")
+ void persistentManagerSwapInInvalid(String sessionId);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 1053, value = "Swapped in session %s")
+ void sessionSwapIn(String sessionId);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1054, value = "Error saving session %s to store")
+ void persistentManagerStoreSaveError(String sessionId, @Cause Throwable t);
+
+ @LogMessage(level = ERROR)
+ @Message(id = 1055, value = "No store is configured, persistence
disabled")
+ void noStoreConfigured();
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 1056, value = "Swapping session %s to Store, idle for %s
seconds")
+ void sessionSwapOut(String sessionId, int idle);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 1057, value = "Too many active sessions [%s] looking for idle
sessions to swap out")
+ void persistentManagerCheckIdle(int activeCount);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 1058, value = "Swapping out session %s, idle for %s seconds too
many sessions active")
+ void persistentManagerSwapIdleSession(String sessionId, int idle);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 1059, value = "Backing up session %s to Store, idle for %s
seconds")
+ void persistentManagerBackupSession(String sessionId, int idle);
+
}
Modified: trunk/src/main/java/org/jboss/web/CatalinaMessages.java
===================================================================
--- trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-05 08:00:43 UTC (rev
2078)
+++ trunk/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-06 14:06:07 UTC (rev
2079)
@@ -502,4 +502,79 @@
@Message(id = 155, value = "The client needs to authenticate to gain network
access.")
String http511();
+ @Message(id = 200, value = "Store has already been started")
+ String storeAlreadyStarted();
+
+ @Message(id = 201, value = "Store has not yet been started")
+ String storeNotStarted();
+
+ @Message(id = 202, value = "Loading Session %s from file %s")
+ String fileStoreSessionLoad(String sessionId, String file);
+
+ @Message(id = 203, value = "Saving Session %s to file %s")
+ String fileStoreSessionSave(String sessionId, String file);
+
+ @Message(id = 204, value = "Removing Session %s at file %s")
+ String fileStoreSessionRemove(String sessionId, String file);
+
+ @Message(id = 205, value = "No persisted data file found")
+ String fileStoreFileNotFound();
+
+ @Message(id = 206, value = "Parent Container is not a Context")
+ IllegalArgumentException parentNotContext();
+
+ @Message(id = 207, value = "JDBC Store SQL exception")
+ String jdbcStoreDatabaseError();
+
+ @Message(id = 202, value = "Loading Session %s from file %s")
+ String jdbcStoreSessionLoad(String sessionId, String table);
+
+ @Message(id = 203, value = "Saving Session %s to file %s")
+ String jdbcStoreSessionSave(String sessionId, String table);
+
+ @Message(id = 204, value = "Removing Session %s at file %s")
+ String jdbcStoreSessionRemove(String sessionId, String table);
+
+ @Message(id = 205, value = "No persisted data object found")
+ String jdbcStoreIdNotFound();
+
+ @Message(id = 206, value = "The database connection is null or was found to be
closed. Trying to re-open it.")
+ String jdbcStoreConnectionWasClosed();
+
+ @Message(id = 207, value = "The re-open on the database failed. The database
could be down.")
+ String jdbcStoreConnectionReopenFailed();
+
+ @Message(id = 208, value = "JDBC driver class not found %s")
+ String jdbcStoreDriverFailure(String className);
+
+ @Message(id = 209, value = "Session creation failed due to too many active
sessions")
+ IllegalStateException managerMaxActiveSessions();
+
+ @Message(id = 210, value = "Error deserializing Session %s")
+ IllegalStateException persistentManagerDeserializeError(String sessionId, @Cause
Throwable t);
+
+ @Message(id = 211, value = "Session event listener threw exception")
+ String sessionEventListenerException();
+
+ @Message(id = 212, value = "Session already invalidated")
+ IllegalStateException invalidSession();
+
+ @Message(id = 213, value = "Exception logging out user when expiring
session")
+ String sessionLogoutException();
+
+ @Message(id = 214, value = "Session attribute event listener threw
exception")
+ String sessionAttributeEventListenerException();
+
+ @Message(id = 215, value = "Session attribute name cannot be null")
+ IllegalArgumentException sessionAttributeNameIsNull();
+
+ @Message(id = 216, value = "Non-serializable attribute %s")
+ IllegalArgumentException sessionAttributeIsNotSerializable(String name);
+
+ @Message(id = 214, value = "Session binding event listener threw
exception")
+ String sessionBindingEventListenerException();
+
+ @Message(id = 214, value = "Cannot serialize session attribute %s for session
%s")
+ String sessionAttributeSerializationException(Object attribute, String sessionId);
+
}