Author: markt
Date: Thu Jul 29 12:10:51 2010
New Revision: 980418
URL: http://svn.apache.org/viewvc?rev=980418&view=rev
Log:
Refactoring
Move propertyChange() implementation to ManagerBase to reduce code duplication
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Thu Jul 29 12:10:51 2010
@@ -18,7 +18,6 @@
package org.apache.catalina.ha.session;
import org.apache.catalina.ha.ClusterManager;
-import java.beans.PropertyChangeListener;
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.Loader;
import java.io.ByteArrayInputStream;
@@ -32,8 +31,8 @@ import org.apache.catalina.Container;
* @version $Id$
*/
-public abstract class ClusterManagerBase extends ManagerBase implements
PropertyChangeListener, ClusterManager{
-
+public abstract class ClusterManagerBase extends ManagerBase
+ implements ClusterManager{
public static ClassLoader[] getClassLoaders(Container container) {
Loader loader = null;
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Jul
29 12:10:51 2010
@@ -17,7 +17,6 @@
package org.apache.catalina.ha.session;
-import java.beans.PropertyChangeEvent;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -1006,30 +1005,6 @@ public class DeltaManager extends Cluste
replicationValve = null;
}
- // ----------------------------------------- PropertyChangeListener Methods
-
- /**
- * Process property change events from our associated Context.
- *
- * @param event
- * The property change event that has occurred
- */
- public void propertyChange(PropertyChangeEvent event) {
-
- // Validate the source of this event
- if (!(event.getSource() instanceof Context))
- return;
- // Process a relevant property change
- if (event.getPropertyName().equals("sessionTimeout")) {
- try {
- setMaxInactiveInterval(((Integer)
event.getNewValue()).intValue() * 60);
- } catch (NumberFormatException e) {
- log.error(sm.getString("deltaManager.sessionTimeout",
event.getNewValue()));
- }
- }
-
- }
-
// -------------------------------------------------------- Replication
// Methods
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Thu Jul 29 12:10:51 2010
@@ -49,7 +49,6 @@ deltaManager.receiveMessage.allSessionDa
deltaManager.receiveMessage.fromWrongDomain=Manager [{0}]: Received wrong
SessionMessage of type=({1}) from [{2}] with domain [{3}] (localdomain [{4}]
deltaManager.registerCluster=Register manager {0} to cluster element {1} with
name {2}
deltaManager.sessionReceived=Manager [{0}]; session state send at {1} received
in {2} ms.
-deltaManager.sessionTimeout=Invalid session timeout setting {0}
deltaManager.startClustering=Starting clustering manager at {0}
deltaManager.stopped=Manager [{0}] is stopping
deltaManager.unloading.ioe=IOException while saving persisted sessions: {0}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
Thu Jul 29 12:10:51 2010
@@ -49,7 +49,6 @@ deltaManager.receiveMessage.allSessionDa
deltaManager.receiveMessage.fromWrongDomain = Gestor [{0}]\: Recibido
SessionMessage equivocado de tipo\=({1}) desde [{2}] con dominio [{3}] (dominio
local [{4}]
deltaManager.registerCluster = Registrar gestor {0} a elemento de cl\u00FAster
{1} con nombre {2}
deltaManager.sessionReceived = Gestor [{0}]; estado de sesi\u00F3n enviado a
las {1} recibido en {2} ms.
-deltaManager.sessionTimeout = Valor de agotamiento de sesi\u00F3n
inv\u00E1lido {0}
deltaManager.startClustering = Iniciando gestor de cl\u00FAster a las {0}
deltaManager.stopped = El gestor [{0}] se est\u00E1 parando
deltaManager.unloading.ioe = IOException al grabar sesiones persistentes\: {0}
Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Thu
Jul 29 12:10:51 2010
@@ -33,12 +33,12 @@ managerBase.getting=Getting message dige
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}
+managerBase.sessionTimeout=Invalid session timeout setting {0}
serverSession.value.iae=null value
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.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
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
Thu Jul 29 12:10:51 2010
@@ -32,12 +32,12 @@ managerBase.getting = Obteniendo mensaje
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}
+managerBase.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de
sesi\u00F3n {0}
serverSession.value.iae = valor nulo
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.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
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
Thu Jul 29 12:10:51 2010
@@ -32,12 +32,12 @@ managerBase.getting=Prise du composant d
managerBase.gotten=Prise du composant d''algorithme empreinte de message
(message digest) termin\u00e9e
managerBase.random=Exception durant l''initialisation de la classe du
g\u00e9n\u00e9rateur de nombre al\u00e9atoire {0}
managerBase.seeding=Alimentation de la classe du g\u00e9n\u00e9rateur de
nombre al\u00e9atoire {0}
+managerBase.sessionTimeout=R\u00e9glage du d\u00e9lai d''inactivit\u00e9
(timeout) de session invalide {0}
serverSession.value.iae=valeur nulle
standardManager.expireException="processsExpire": Exception lors de
l''expiration de la session
standardManager.loading=Chargement des sessions qui ont persist\u00e9 depuis
{0}
standardManager.loading.cnfe="ClassNotFoundException" lors du chargement de
sessions persistantes: {0}
standardManager.loading.ioe="IOException" lors du chargement de sessions
persistantes: {0}
-standardManager.sessionTimeout=R\u00e9glage du d\u00e9lai d''inactivit\u00e9
(timeout) de session invalide {0}
standardManager.unloading=Sauvegarde des sessions ayant persist\u00e9 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)
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
Thu Jul 29 12:10:51 2010
@@ -33,12 +33,12 @@ managerBase.getting=\u30a2\u30eb\u30b4\u
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
+managerBase.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059
{0}
serverSession.value.iae=null\u5024\u3067\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.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
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu Jul 29
12:10:51 2010
@@ -19,6 +19,7 @@
package org.apache.catalina.session;
+import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.DataInputStream;
@@ -64,7 +65,7 @@ import org.apache.juli.logging.LogFactor
*/
public abstract class ManagerBase extends LifecycleMBeanBase
- implements Manager {
+ implements Manager, PropertyChangeListener {
private final Log log = LogFactory.getLog(ManagerBase.class); // must not
be static
@@ -1335,4 +1336,29 @@ public abstract class ManagerBase extend
return MBeanUtils.getDomain(container);
}
+ // ----------------------------------------- PropertyChangeListener Methods
+
+ /**
+ * Process property change events from our associated Context.
+ *
+ * @param event
+ * The property change event that has occurred
+ */
+ public void propertyChange(PropertyChangeEvent event) {
+
+ // Validate the source of this event
+ if (!(event.getSource() instanceof Context))
+ return;
+
+ // Process a relevant property change
+ if (event.getPropertyName().equals("sessionTimeout")) {
+ try {
+ setMaxInactiveInterval(
+ ((Integer) event.getNewValue()).intValue() * 60);
+ } catch (NumberFormatException e) {
+ log.error(sm.getString("managerBase.sessionTimeout",
+ event.getNewValue()));
+ }
+ }
+ }
}
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Thu Jul 29 12:10:51 2010
@@ -18,8 +18,6 @@
package org.apache.catalina.session;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
@@ -53,8 +51,7 @@ import org.apache.juli.logging.LogFactor
* @version $Id$
*/
-public abstract class PersistentManagerBase extends ManagerBase
- implements PropertyChangeListener {
+public abstract class PersistentManagerBase extends ManagerBase {
private static final Log log =
LogFactory.getLog(PersistentManagerBase.class);
@@ -907,34 +904,6 @@ public abstract class PersistentManagerB
}
- // ----------------------------------------- PropertyChangeListener Methods
-
-
- /**
- * Process property change events from our associated Context.
- *
- * @param event The property change event that has occurred
- */
- public void propertyChange(PropertyChangeEvent event) {
-
- // Validate the source of this event
- if (!(event.getSource() instanceof Context))
- return;
-
- // Process a relevant property change
- if (event.getPropertyName().equals("sessionTimeout")) {
- try {
- setMaxInactiveInterval
- ( ((Integer) event.getNewValue()).intValue()*60 );
- } catch (NumberFormatException e) {
- log.error(sm.getString("standardManager.sessionTimeout",
- event.getNewValue().toString()));
- }
- }
-
- }
-
-
// ------------------------------------------------------ Protected Methods
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=980418&r1=980417&r2=980418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Thu Jul
29 12:10:51 2010
@@ -19,7 +19,6 @@
package org.apache.catalina.session;
import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -63,8 +62,7 @@ import org.apache.tomcat.util.ExceptionU
* @version $Id$
*/
-public class StandardManager extends ManagerBase
- implements PropertyChangeListener {
+public class StandardManager extends ManagerBase {
private final Log log = LogFactory.getLog(StandardManager.class); // must
not be static
@@ -547,34 +545,6 @@ public class StandardManager extends Man
}
- // ----------------------------------------- PropertyChangeListener Methods
-
-
- /**
- * Process property change events from our associated Context.
- *
- * @param event The property change event that has occurred
- */
- public void propertyChange(PropertyChangeEvent event) {
-
- // Validate the source of this event
- if (!(event.getSource() instanceof Context))
- return;
-
- // Process a relevant property change
- if (event.getPropertyName().equals("sessionTimeout")) {
- try {
- setMaxInactiveInterval
- ( ((Integer) event.getNewValue()).intValue()*60 );
- } catch (NumberFormatException e) {
- log.error(sm.getString("standardManager.sessionTimeout",
- event.getNewValue().toString()));
- }
- }
-
- }
-
-
// ------------------------------------------------------ Protected Methods
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
