[jboss-cvs] JBossAS SVN: r107439 - in projects/ejb3/branches/infinispan-int: ext-api-impl and 1 other directories.

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

Author: pferraro
Date: 2010-08-05 12:37:50 -0400 (Thu, 05 Aug 2010)
New Revision: 107439

Modified:
   projects/ejb3/branches/infinispan-int/ext-api-impl/pom.xml
   projects/ejb3/branches/infinispan-int/ext-api-impl/src/main/java/org/jboss/ejb3/annotation/impl/CacheConfigImpl.java
   projects/ejb3/branches/infinispan-int/ext-api/src/main/java/org/jboss/ejb3/annotation/CacheConfig.java
Log:
[EJBTHREE-2053] Set replication configuration via @CacheConfig

Modified: projects/ejb3/branches/infinispan-int/ext-api/src/main/java/org/jboss/ejb3/annotation/CacheConfig.java
===================================================================
--- projects/ejb3/branches/infinispan-int/ext-api/src/main/java/org/jboss/ejb3/annotation/CacheConfig.java	2010-08-05 15:27:11 UTC (rev 107438)
+++ projects/ejb3/branches/infinispan-int/ext-api/src/main/java/org/jboss/ejb3/annotation/CacheConfig.java	2010-08-05 16:37:50 UTC (rev 107439)
@@ -51,6 +51,12 @@
 
    public static final boolean DEFAULT_REPL_IS_PASV = true;
 
+   public static final int DEFAULT_BACKUPS = Integer.MAX_VALUE;
+   public static final int TOTAL_REPLICATION = -1;
+   public static final int NO_BACKUPS = 0;
+   
+   enum Mode { DEFAULT, SYNCHRONOUS, ASYNCHRONOUS };
+
    // Instance Members
 
    String name() default "";
@@ -62,4 +68,8 @@
    boolean replicationIsPassivation() default CacheConfig.DEFAULT_REPL_IS_PASV;
 
    long removalTimeoutSeconds() default CacheConfig.DEFAULT_REMOVAL_TIMEOUT_SECONDS;
+   
+   int backups() default DEFAULT_BACKUPS;
+   
+   Mode mode() default Mode.DEFAULT;
 }

Modified: projects/ejb3/branches/infinispan-int/ext-api-impl/pom.xml
===================================================================
--- projects/ejb3/branches/infinispan-int/ext-api-impl/pom.xml	2010-08-05 15:27:11 UTC (rev 107438)
+++ projects/ejb3/branches/infinispan-int/ext-api-impl/pom.xml	2010-08-05 16:37:50 UTC (rev 107439)
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-ext-api</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>

Modified: projects/ejb3/branches/infinispan-int/ext-api-impl/src/main/java/org/jboss/ejb3/annotation/impl/CacheConfigImpl.java
===================================================================
--- projects/ejb3/branches/infinispan-int/ext-api-impl/src/main/java/org/jboss/ejb3/annotation/impl/CacheConfigImpl.java	2010-08-05 15:27:11 UTC (rev 107438)
+++ projects/ejb3/branches/infinispan-int/ext-api-impl/src/main/java/org/jboss/ejb3/annotation/impl/CacheConfigImpl.java	2010-08-05 16:37:50 UTC (rev 107439)
@@ -46,6 +46,10 @@
 
    private boolean replicationIsPassivation = CacheConfig.DEFAULT_REPL_IS_PASV;
 
+   private Mode mode = CacheConfig.Mode.DEFAULT;
+   
+   private int backups = CacheConfig.DEFAULT_BACKUPS;
+   
    // Constructor
 
    public CacheConfigImpl()
@@ -104,6 +108,26 @@
       this.replicationIsPassivation = replicationIsPassivation;
    }
 
+   public int backups()
+   {
+      return this.backups;
+   }
+
+   public void setBackups(int backups)
+   {
+      this.backups = backups;
+   }
+   
+   public Mode mode()
+   {
+      return this.mode;
+   }
+
+   public void setMode(Mode mode)
+   {
+      this.mode = mode;
+   }
+   
    public void merge(CacheConfig annotation)
    {
       if (maxSize == CacheConfig.DEFAULT_NONCLUSTERED_MAX_SIZE)
@@ -126,6 +150,15 @@
          replicationIsPassivation = annotation.replicationIsPassivation();
       }
 
+      if (mode == CacheConfig.Mode.DEFAULT)
+      {
+         mode = annotation.mode();
+      }
+      
+      if (backups == CacheConfig.DEFAULT_BACKUPS)
+      {
+         backups = annotation.backups();
+      }
    }
 
    public Class<? extends Annotation> annotationType()