[jboss-cvs] JBossAS SVN: r80005 - 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: 2008-10-23 15:40:00 -0400 (Thu, 23 Oct 2008)
New Revision: 80005

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
[JBAS-5778] Get policy class from metadata

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java	2008-10-23 19:10:15 UTC (rev 80004)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java	2008-10-23 19:40:00 UTC (rev 80005)
@@ -135,8 +135,7 @@
       }
       managers.clear();
       
-      attribute.invocations.clear();
-      newAttribute.invocations.clear();
+      SessionSpecListenerAttribute.invocations.clear();
    }
    
    protected ReplicationGranularity getReplicationGranularity()
@@ -655,16 +654,14 @@
    {
       JBossCacheManager jbcm0 = SessionTestUtil.createManager(warname, maxInactive, pojoCaches[0], null);
       JBossWebMetaData metadata = SessionTestUtil.createWebMetaData(getReplicationGranularity(), getReplicationTrigger(), -1, maxIdle > 0, maxIdle, -1 ,false, 0);
-      // FIXME replacing setting system property w/ this:
-//      metadata.setSessionNotificationPolicy(MockClusteredSessionNotificationPolicy.class.getName());
+      metadata.getReplicationConfig().setSessionNotificationPolicy(MockClusteredSessionNotificationPolicy.class.getName());
       jbcm0.init(warname, metadata);
       this.managers.add(jbcm0);
       jbcm0.start();
       
       JBossCacheManager jbcm1 = SessionTestUtil.createManager(warname, maxInactive, pojoCaches[1], null);
       metadata = SessionTestUtil.createWebMetaData(getReplicationGranularity(), getReplicationTrigger(), -1, true, maxIdle, -1 ,false, 0);
-      // FIXME replacing setting system property w/ this:
-//    metadata.setSessionNotificationPolicy(MockClusteredSessionNotificationPolicy.class.getName());
+      metadata.getReplicationConfig().setSessionNotificationPolicy(MockClusteredSessionNotificationPolicy.class.getName());
       jbcm1.init(warname, metadata);
       this.managers.add(jbcm1);
       jbcm1.start();

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	2008-10-23 19:10:15 UTC (rev 80004)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2008-10-23 19:40:00 UTC (rev 80005)
@@ -205,8 +205,7 @@
       
       this.cacheConfigName_ = repCfg.getCacheName();
       
-      // FIXME -- JBAS-5778
-      //this.notificationPolicyClass_ = webMetaData.getSessionNotificationPolicy();
+      this.notificationPolicyClass_ = repCfg.getSessionNotificationPolicy();
       
       // Initing the proxy would be better in start, but we do it here so we
       // can detect ClusteringNotSupportedException at this deploy stage