[jboss-cvs] JBossAS SVN: r58584 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-11-18 06:41:28 -0500 (Sat, 18 Nov 2006)
New Revision: 58584

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossManager.java
Log:
Use the new metamodel

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossManager.java	2006-11-18 11:41:00 UTC (rev 58583)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossManager.java	2006-11-18 11:41:28 UTC (rev 58584)
@@ -47,6 +47,7 @@
 import org.apache.catalina.util.LifecycleSupport;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.web.ReplicationConfig;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.web.tomcat.statistics.ReplicationStatistics;
 
@@ -63,8 +64,7 @@
 public abstract class JBossManager
    implements AbstractJBossManager, Lifecycle,
       JBossManagerMBean, PropertyChangeListener
-{
-
+{  
    // -- Constants ----------------------------------------
    /**
     * Informational name for this Catalina component
@@ -77,11 +77,11 @@
    /**
     * Policy to determine if a session is dirty
     */
-   protected int invalidateSessionPolicy_ = WebMetaData.SESSION_INVALIDATE_SET_AND_NON_PRIMITIVE_GET;
+   protected InvalidateSessionPolicy invalidateSessionPolicy_ = InvalidateSessionPolicy.SET_AND_NON_PRIMITIVE_GET;
    /**
     * Replication granulairty.
     */
-   protected int replicationGranularity_ = WebMetaData.REPLICATION_GRANULARITY_SESSION;
+   protected ReplicationGranularity replicationGranularity_ = ReplicationGranularity.SESSION;
    
    /**
     * Session passivation flag set in jboss-web.xml by the user.
@@ -194,8 +194,12 @@
    public void init(String name, WebMetaData webMetaData, boolean useJK, boolean useLocalCache)
            throws ClusteringNotSupportedException
    {
-      replicationGranularity_ = webMetaData.getReplicationGranularity();
-      invalidateSessionPolicy_ = webMetaData.getInvalidateSessionPolicy();
+      ReplicationConfig rpc = webMetaData.getReplicationConfig();
+      if (rpc != null)
+      {
+         replicationGranularity_ = ReplicationGranularity.fromString(rpc.getGranularity());
+         invalidateSessionPolicy_ = InvalidateSessionPolicy.fromString(rpc.getTrigger());
+      }
       maxActive_ = webMetaData.getMaxActiveSessionsAllowed();
       passivationMode_ = webMetaData.getSessionPassivationMode();
       if (passivationMode_)
@@ -221,7 +225,7 @@
       }
    }
 
-   public int getInvalidateSessionPolicy()
+   public InvalidateSessionPolicy getInvalidateSessionPolicy()
    {
       return this.invalidateSessionPolicy_;
    }