pero 2005/08/17 03:41:50
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaRequest.java LocalStrings.properties
Log:
Only support GenericPrincipals for backup nodes
Revision Changes Path
1.15 +18 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
Index: DeltaRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DeltaRequest.java 17 Aug 2005 08:13:12 -0000 1.14
+++ DeltaRequest.java 17 Aug 2005 10:41:50 -0000 1.15
@@ -30,8 +30,8 @@
import java.security.Principal;
import java.util.LinkedList;
-import org.apache.catalina.Realm;
import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.catalina.util.StringManager;
public class DeltaRequest implements Externalizable {
@@ -39,6 +39,12 @@
public static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog( DeltaRequest.class );
+ /**
+ * The string manager for this package.
+ */
+ protected static StringManager sm = StringManager
+ .getManager(Constants.Package);
+
public static final int TYPE_ATTRIBUTE = 0;
public static final int TYPE_PRINCIPAL = 1;
public static final int TYPE_ISNEW = 2;
@@ -83,14 +89,22 @@
addAction(TYPE_MAXINTERVAL,action,NAME_MAXINTERVAL,new
Integer(interval));
}
+ /**
+ * convert principal at SerializablePrincipal for backup nodes.
+ * Only support principals from type [EMAIL PROTECTED] GenericPrincipal
GenericPrincipal}
+ * @param p Session principal
+ * @see GenericPrincipal
+ */
public void setPrincipal(Principal p) {
int action = (p==null)?ACTION_REMOVE:ACTION_SET;
SerializablePrincipal sp = null;
if ( p != null ) {
- if(p instanceof GenericPrincipal)
+ if(p instanceof GenericPrincipal) {
sp =
SerializablePrincipal.createPrincipal((GenericPrincipal)p);
- else
- log.error("Only principal class GenericPrincipal currently
supported use MemoryRealm" );
+ if(log.isDebugEnabled())
+ log.debug(sm.getString("deltaRequest.showPrincipal",
p.getName() , getSessionId()));
+ } else
+
log.error(sm.getString("deltaRequest.wrongPrincipalClass",p.getClass().getName()));
}
addAction(TYPE_PRINCIPAL,action,NAME_PRINCIPAL,sp);
}
1.11 +2 -0
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LocalStrings.properties 1 Jul 2005 16:47:10 -0000 1.10
+++ LocalStrings.properties 17 Aug 2005 10:41:50 -0000 1.11
@@ -41,6 +41,8 @@
deltaManager.stopped=Manager [{0}] is stopping
deltaManager.unloading.ioe=IOException while saving persisted sessions: {0}
deltaManager.waitForSessionState=Manager [{0}], requesting session state
from {1}. This operation will timeout if no session state has been received
within 60 seconds.
+deltaRequest.showPrincipal=Principal [{0}] is set to session {1}
+deltaRequest.wrongPrincipalClass=DeltaManager only support GenericPrincipal.
Your realm used principal class {0}.
deltaSession.notifying=Notifying cluster of expiration primary={0} sessionId
[{1}]
deltaSession.valueBound.ex=Session bound listener throw an exception
deltaSession.valueBinding.ex=Session binding listener throw an exception
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
