[jboss-cvs] JBossAS SVN: r60610 - in trunk/ejb3/src/main/org/jboss: ejb3 and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2007-02-18 22:39:01 -0500 (Sun, 18 Feb 2007)
New Revision: 60610

Modified:
   trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfig.java
   trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java
   trunk/ejb3/src/main/org/jboss/ejb3/AbstractPool.java
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java
Log:
[EJBTHREE-716] Add a flag to disable replication event notification

Modified: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfig.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfig.java	2007-02-19 03:27:19 UTC (rev 60609)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfig.java	2007-02-19 03:39:01 UTC (rev 60610)
@@ -41,4 +41,6 @@
    int maxSize() default 10000;
 
    long idleTimeoutSeconds() default 300;
+   
+   boolean replicationIsPassivation() default true;
 }

Modified: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java	2007-02-19 03:27:19 UTC (rev 60609)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/CacheConfigImpl.java	2007-02-19 03:39:01 UTC (rev 60610)
@@ -32,7 +32,8 @@
    private String name = "jboss.cache:service=EJB3SFSBClusteredCache";
    private int maxSize = 100000;
    private long idleTimeoutSeconds = 300;
-
+   private boolean replicationIsPassivation = true;
+   
    public CacheConfigImpl()
    {
    }
@@ -67,6 +68,16 @@
       this.idleTimeoutSeconds = idleTimeoutSeconds;
    }
 
+   public boolean replicationIsPassivation()
+   {
+      return replicationIsPassivation;
+   }
+
+   public void setReplicationIsPassivation(boolean replicationIsPassivation)
+   {
+      this.replicationIsPassivation = replicationIsPassivation;
+   }
+
    public Class<? extends Annotation> annotationType()
    {
       return CacheConfig.class;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/AbstractPool.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/AbstractPool.java	2007-02-19 03:27:19 UTC (rev 60609)
+++ trunk/ejb3/src/main/org/jboss/ejb3/AbstractPool.java	2007-02-19 03:39:01 UTC (rev 60610)
@@ -22,6 +22,8 @@
 package org.jboss.ejb3;
 
 import org.jboss.injection.Injector;
+import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.aop.Advisor;
 import org.jboss.ejb3.stateful.StatefulBeanContext;
 import org.jboss.logging.Logger;
 import org.jboss.util.id.GUID;
@@ -78,9 +80,16 @@
       }
       if (ctx instanceof StatefulBeanContext)
       {
-         // this is for propagated extended PC's
          StatefulBeanContext sfctx = (StatefulBeanContext) ctx;
          sfctx.setId(new GUID());
+         // Tell context how to handle replication
+         Advisor advisor = (Advisor) container;
+         CacheConfig config = (CacheConfig) advisor.resolveAnnotation(CacheConfig.class);
+         if (config != null)
+         {
+            sfctx.setReplicationIsPassivation(config.replicationIsPassivation());
+         }
+         // this is for propagated extended PC's
          ctx = sfctx = sfctx.pushContainedIn();
       }
       try
@@ -133,10 +142,17 @@
          throw new RuntimeException(e);  //To change body of catch statement use Options | File Templates.
       }
       if (ctx instanceof StatefulBeanContext)
-      {
-         // this is for propagated extended PC's
+      {         
          StatefulBeanContext sfctx = (StatefulBeanContext) ctx;
          sfctx.setId(new GUID());
+         // Tell context how to handle replication
+         Advisor advisor = (Advisor) container;
+         CacheConfig config = (CacheConfig) advisor.resolveAnnotation(CacheConfig.class);
+         if (config != null)
+         {
+            sfctx.setReplicationIsPassivation(config.replicationIsPassivation());
+         }
+         // this is for propagated extended PC's
          ctx = sfctx = sfctx.pushContainedIn();
       }
       try

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-02-19 03:27:19 UTC (rev 60609)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-02-19 03:39:01 UTC (rev 60610)
@@ -1201,6 +1201,9 @@
             if (config.getIdleTimeoutSeconds() != null)
                configAnnotation.setIdleTimeoutSeconds(Long.parseLong(config.getIdleTimeoutSeconds()));
 
+            if (config.getReplicationIsPassivation() != null)
+               configAnnotation.setReplicationIsPassivation(Boolean.parseBoolean(config.getReplicationIsPassivation()));
+
             addClassAnnotation(container, org.jboss.annotation.ejb.cache.tree.CacheConfig.class, configAnnotation);
          }
          else

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java	2007-02-19 03:27:19 UTC (rev 60609)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/CacheConfig.java	2007-02-19 03:39:01 UTC (rev 60610)
@@ -35,6 +35,7 @@
    private String idleTimeoutSeconds = null;
    private String name = null;
    private String persistenceManager = null;
+   private String replicationIsPassivation = null;
 
    public String getPersistenceManager()
    {
@@ -84,8 +85,18 @@
    public void setName(String name)
    {
       this.name = name;
+   }   
+
+   public String getReplicationIsPassivation()
+   {
+      return replicationIsPassivation;
    }
 
+   public void setReplicationIsPassivation(String replicationIsPassivation)
+   {
+      this.replicationIsPassivation = replicationIsPassivation;
+   }
+
    public String toString()
    {
       StringBuffer sb = new StringBuffer(100);
@@ -94,6 +105,7 @@
       sb.append(", maxSize=").append(maxSize);
       sb.append(", idleTimeoutSeconds=").append(idleTimeoutSeconds);
       sb.append(", name=").append(name);
+      sb.append(", replicationIsPassivation=").append(replicationIsPassivation);
       sb.append("]");
       return sb.toString();
    }