[jboss-cvs] JBossAS SVN: r58848 - in trunk: server/src/main/org/jboss/metadata tomcat/src/main/org/jboss/web/tomcat/tc6/session

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

Author: hmesha
Date: 2006-12-05 14:42:00 -0500 (Tue, 05 Dec 2006)
New Revision: 58848

Modified:
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossManager.java
Log:
JBAS-3872

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2006-12-05 18:20:39 UTC (rev 58847)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2006-12-05 19:42:00 UTC (rev 58848)
@@ -194,26 +194,6 @@
    private boolean replicationFieldBatchMode = true;
    
    /**
-    * If true then the session passivation is enabled for this web app.
-    * If false then the session passivation is disabled for this web app. 
-    */
-   private boolean sessionPassivationMode = false;
-   
-   /**
-    * Min time (seconds) the session must be idle since lastAccesstime before it's eligable for passivation
-    * This overrides maxActive_, to prevent thrashing if the there are lots of active sessions.
-    * Setting to -1 means it's ignored
-    */
-   private int sessionPassivationMinIdleTime = -1;
-   
-   /**
-    * Max time (seconds) the session must be idle since lastAccesstime before it's eligable for passivation
-    * This overrides maxActive_, to prevent thrashing if the there are lots of active sessions.
-    * Setting to -1 means session should not be forced out.
-    */
-   private int sessionPassivationMaxIdleTime = -1;
-   
-   /**
     * The maximum number of active sessions allowed, or -1 for no limit
     */
    private int maxActiveSessions = -1;
@@ -1085,36 +1065,6 @@
       return replicationFieldBatchMode;
    }
    
-   public boolean getSessionPassivationMode()
-   {
-      return sessionPassivationMode;
-   }
-   
-   public void setSessionPassivationMode(boolean mode)
-   {
-      this.sessionPassivationMode = mode;
-   }
-   
-   public int getSessionPassivationMinIdleTime()
-   {
-      return sessionPassivationMinIdleTime;
-   }
-   
-   public void setSessionPassivationMinIdleTime(int time)
-   {
-      this.sessionPassivationMinIdleTime = time;
-   }
-   
-   public int getSessionPassivationMaxIdleTime()
-   {
-      return sessionPassivationMaxIdleTime;
-   }
-   
-   public void setSessionPassivationMaxIdleTime(int time)
-   {
-      this.sessionPassivationMaxIdleTime = time;
-   }
-   
    public int getMaxActiveSessionsAllowed()
    {
       return maxActiveSessions;
@@ -1343,34 +1293,45 @@
       {
          // manage "use-session-passivation" first ...
          Element usePassivationElement = MetaData.getOptionalChild(sessionPassivationRootElement, "use-session-passivation");
-         if (usePassivationElement != null && Boolean.valueOf(getElementContent(usePassivationElement)).booleanValue())
+         if (usePassivationElement != null)
          {
-            sessionPassivationMode = true;
+            passivationConfig.setUseSessionPassivation(getElementContent(usePassivationElement));
          }
          else
          {
-            sessionPassivationMode = false;
+            passivationConfig.setUseSessionPassivation(String.valueOf(false));
          }
-         log.info("WebMetaData:importJBossWebXml: sessionPassivationMode = " + sessionPassivationMode);
+         log.info("WebMetaData:importJBossWebXml: PassivationConfig.UseSessionPassivation = " + passivationConfig.getUseSessionPassivation());
          // then manage passivation-min-idle-time and -passivation-max-idle-time
-         if (getSessionPassivationMode())
+         if (Boolean.valueOf(passivationConfig.getUseSessionPassivation()).booleanValue())
          {
             Element minIdleTimeElement = MetaData.getOptionalChild(sessionPassivationRootElement, "passivation-min-idle-time");
             if (minIdleTimeElement != null)
             {
-               Long minIdleTimeValue = Long.valueOf(getElementContent(minIdleTimeElement));
-               sessionPassivationMinIdleTime = minIdleTimeValue.intValue();
-               log.info("WebMetaData:importJBossWebXml: sessionPassivationMinIdleTime = " + sessionPassivationMinIdleTime);
+               passivationConfig.setPassivationMinIdleTime(getElementContent(minIdleTimeElement));
+               log.info("WebMetaData:importJBossWebXml: passivationConfig.passivationMinIdleTime = " + passivationConfig.getPassivationMinIdleTime());
             }
+            else
+            {
+               passivationConfig.setPassivationMinIdleTime(String.valueOf(0));
+            }
             
             Element maxIdleTimeElement = MetaData.getOptionalChild(sessionPassivationRootElement, "passivation-max-idle-time");
             if (maxIdleTimeElement != null)
             {
-               Long maxIdleTimeValue = Long.valueOf(getElementContent(maxIdleTimeElement));
-               sessionPassivationMaxIdleTime = maxIdleTimeValue.intValue();
-               log.info("WebMetaData:importJBossWebXml: sessionPassivationMaxIdleTime = " + sessionPassivationMaxIdleTime);
+               passivationConfig.setPassivationMaxIdleTime(getElementContent(maxIdleTimeElement));
+               log.info("WebMetaData:importJBossWebXml: passivationConfig.passivationMaxIdleTime = " + passivationConfig.getPassivationMaxIdleTime());
             }
+            else
+            {
+               passivationConfig.setPassivationMaxIdleTime(String.valueOf(0));
+            }
          }
+         else
+         {
+            passivationConfig.setPassivationMinIdleTime(String.valueOf(0));
+            passivationConfig.setPassivationMaxIdleTime(String.valueOf(0));
+         }
       }
       // Parse the jboss-web/session-replication element
 

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-12-05 18:20:39 UTC (rev 58847)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossManager.java	2006-12-05 19:42:00 UTC (rev 58848)
@@ -48,6 +48,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.WebMetaData;
 import org.jboss.metadata.web.ReplicationConfig;
+import org.jboss.metadata.web.PassivationConfig;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.web.tomcat.statistics.ReplicationStatistics;
 
@@ -201,12 +202,17 @@
          invalidateSessionPolicy_ = InvalidateSessionPolicy.fromString(rpc.getTrigger());
       }
       maxActive_ = webMetaData.getMaxActiveSessionsAllowed();
-      passivationMode_ = webMetaData.getSessionPassivationMode();
-      if (passivationMode_)
+      PassivationConfig pConfig = webMetaData.getPassivationConfig();
+      if (pConfig != null)
       {
-         passivationMinIdleTime_ = webMetaData.getSessionPassivationMinIdleTime();
-         passivationMaxIdleTime_ = webMetaData.getSessionPassivationMaxIdleTime();
+         passivationMode_ = Boolean.valueOf(pConfig.getUseSessionPassivation()).booleanValue();
+         if (passivationMode_)
+         {
+            passivationMinIdleTime_ = Integer.valueOf(pConfig.getPassivationMinIdleTime()).intValue();
+            passivationMaxIdleTime_ = Integer.valueOf(pConfig.getPassivationMaxIdleTime()).intValue();
+         }
       }
+      
       useLocalCache_ = useLocalCache;
       log_.info("init(): replicationGranularity_ is " + replicationGranularity_ +
          " and invaldateSessionPolicy is " + invalidateSessionPolicy_ +