[jboss-cvs] JBossAS SVN: r66996 - in trunk/tomcat/src/main/org/jboss/web/tomcat/service: session and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-11-12 18:58:51 -0500 (Mon, 12 Nov 2007)
New Revision: 66996

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
[JBAS-4967] Extract setting of default clustering JBossWebMetaData from TomcatDeployer
[JBAS-4960] Fix clustering related elements of JBossWebMetaData

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java	2007-11-12 23:38:53 UTC (rev 66995)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java	2007-11-12 23:58:51 UTC (rev 66996)
@@ -224,12 +224,12 @@
          metaData.setPassivationConfig(passCfg);
       }
       
-      if (passCfg.getUseSessionPassivation() == null)
-         passCfg.setUseSessionPassivation(String.valueOf(this.useSessionPassivation));
-      if (passCfg.getPassivationMinIdleTime() == null)
-         passCfg.setPassivationMinIdleTime(String.valueOf(this.passivationMinIdleTime));
-      if (passCfg.getPassivationMinIdleTime() == null)
-         passCfg.setPassivationMaxIdleTime(String.valueOf(this.passivationMaxIdleTime));
+      if (passCfg.getUseSessionPassivationBoolean() == null)
+         passCfg.setUseSessionPassivation(this.useSessionPassivation);
+      if (passCfg.getPassivationMinIdleTimeInteger() == null)
+         passCfg.setPassivationMinIdleTimeInteger(this.passivationMinIdleTime);
+      if (passCfg.getPassivationMinIdleTimeInteger() == null)
+         passCfg.setPassivationMaxIdleTimeInteger(this.passivationMaxIdleTime);
    }
 
    /**
@@ -247,14 +247,12 @@
       }
       if (repCfg.getCacheName() == null)
          repCfg.setCacheName(this.cacheName);
-      if (repCfg.getUseJK() == null && useJK != null)
-         repCfg.setUseJK(this.useJK.toString());
-      if (repCfg.getSnapshotMode() == null)
+      if (repCfg.getUseJKBoolean() == null && useJK != null)
+         repCfg.setUseJKBoolean(this.useJK);
+      if (repCfg.getSnapshotModeEnum() == null)
          repCfg.setSnapshotModeEnum(this.snapshotMode);
-      if (repCfg.getSnapshotInterval() == null)
-         repCfg.setSnapshotInterval(String.valueOf(this.snapshotInterval));
-      if (repCfg.getUseLocalCache() == null)
-         repCfg.setUseLocalCache(String.valueOf(this.useLocalCache));
+      if (repCfg.getSnapshotIntervalInteger() == null)
+         repCfg.setSnapshotIntervalInteger(this.snapshotInterval);
       if (repCfg.getReplicationGranularity() == null)
          repCfg.setReplicationGranularity(this.replicationGranularity);
       if (repCfg.getReplicationTrigger() == null)

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java	2007-11-12 23:38:53 UTC (rev 66995)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java	2007-11-12 23:58:51 UTC (rev 66996)
@@ -200,15 +200,15 @@
       {         
          replicationTrigger_ = rpc.getReplicationTrigger();
       }
-      maxActive_ = webMetaData.getMaxActiveSession();
+      maxActive_ = webMetaData.getMaxActiveSessions();
       PassivationConfig pConfig = webMetaData.getPassivationConfig();
       if (pConfig != null)
       {
-         passivationMode_ = Boolean.valueOf(pConfig.getUseSessionPassivation()).booleanValue();
+         passivationMode_ = pConfig.getUseSessionPassivationBoolean().booleanValue();
          if (passivationMode_)
          {
-            passivationMinIdleTime_ = Integer.valueOf(pConfig.getPassivationMinIdleTime()).intValue();
-            passivationMaxIdleTime_ = Integer.valueOf(pConfig.getPassivationMaxIdleTime()).intValue();
+            passivationMinIdleTime_ = pConfig.getPassivationMinIdleTimeInteger().intValue();
+            passivationMaxIdleTime_ = pConfig.getPassivationMaxIdleTimeInteger().intValue();
          }
       }