[jboss-cvs] JBossAS SVN: r67085 - 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-14 13:18:01 -0500 (Wed, 14 Nov 2007)
New Revision: 67085

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
[JBAS-4960] Use the normal JBossWebMetaData properties

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-14 17:54:58 UTC (rev 67084)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.java	2007-11-14 18:18:01 UTC (rev 67085)
@@ -224,12 +224,12 @@
          metaData.setPassivationConfig(passCfg);
       }
       
-      if (passCfg.getUseSessionPassivationBoolean() == null)
+      if (passCfg.getUseSessionPassivation() == null)
          passCfg.setUseSessionPassivation(this.useSessionPassivation);
-      if (passCfg.getPassivationMinIdleTimeInteger() == null)
-         passCfg.setPassivationMinIdleTimeInteger(this.passivationMinIdleTime);
-      if (passCfg.getPassivationMinIdleTimeInteger() == null)
-         passCfg.setPassivationMaxIdleTimeInteger(this.passivationMaxIdleTime);
+      if (passCfg.getPassivationMinIdleTime() == null)
+         passCfg.setPassivationMinIdleTime(this.passivationMinIdleTime);
+      if (passCfg.getPassivationMinIdleTime() == null)
+         passCfg.setPassivationMaxIdleTime(this.passivationMaxIdleTime);
    }
 
    /**
@@ -247,12 +247,12 @@
       }
       if (repCfg.getCacheName() == null)
          repCfg.setCacheName(this.cacheName);
-      if (repCfg.getUseJKBoolean() == null && useJK != null)
-         repCfg.setUseJKBoolean(this.useJK);
-      if (repCfg.getSnapshotModeEnum() == null)
-         repCfg.setSnapshotModeEnum(this.snapshotMode);
-      if (repCfg.getSnapshotIntervalInteger() == null)
-         repCfg.setSnapshotIntervalInteger(this.snapshotInterval);
+      if (repCfg.getUseJK() == null && useJK != null)
+         repCfg.setUseJK(this.useJK);
+      if (repCfg.getSnapshotMode() == null)
+         repCfg.setSnapshotMode(this.snapshotMode);
+      if (repCfg.getSnapshotInterval() == null)
+         repCfg.setSnapshotInterval(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/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2007-11-14 17:54:58 UTC (rev 67084)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2007-11-14 18:18:01 UTC (rev 67085)
@@ -169,7 +169,7 @@
       // Only configure JK usage if it was explicitly set; otherwise
       // wait until we're starting when we can check for a jvmRoute
       // in our containing Engine
-      Boolean jk = repCfg.getUseJKBoolean();
+      Boolean jk = repCfg.getUseJK();
       if (jk != null)
       {
          this.useJK_ = jk;
@@ -177,8 +177,8 @@
       
       Boolean batch = repCfg.getReplicationFieldBatchMode();
       this.replicationFieldBatchMode_ = (batch == null ? Boolean.TRUE : batch);
-      setSnapshotMode(repCfg.getSnapshotModeEnum());
-      setSnapshotInterval(repCfg.getSnapshotIntervalInteger()); 
+      setSnapshotMode(repCfg.getSnapshotMode());
+      setSnapshotInterval(repCfg.getSnapshotInterval()); 
       
       log_.debug("init(): replicationGranularity_ is " + replicationGranularity_ +
          " and replicationFieldBatchMode is " + replicationFieldBatchMode_ +

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-14 17:54:58 UTC (rev 67084)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossManager.java	2007-11-14 18:18:01 UTC (rev 67085)
@@ -204,11 +204,11 @@
       PassivationConfig pConfig = webMetaData.getPassivationConfig();
       if (pConfig != null)
       {
-         passivationMode_ = pConfig.getUseSessionPassivationBoolean().booleanValue();
+         passivationMode_ = pConfig.getUseSessionPassivation().booleanValue();
          if (passivationMode_)
          {
-            passivationMinIdleTime_ = pConfig.getPassivationMinIdleTimeInteger().intValue();
-            passivationMaxIdleTime_ = pConfig.getPassivationMaxIdleTimeInteger().intValue();
+            passivationMinIdleTime_ = pConfig.getPassivationMinIdleTime().intValue();
+            passivationMaxIdleTime_ = pConfig.getPassivationMaxIdleTime().intValue();
          }
       }