[jboss-cvs] JBossAS SVN: r108603 - in projects/metadata/ejb/branches/infinispan-int/src/main: java/org/jboss/metadata/ejb/jboss and 1 other directories.

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

Author: smarlow at redhat.com
Date: 2010-10-15 11:54:23 -0400 (Fri, 15 Oct 2010)
New Revision: 108603

Modified:
   projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/ejb3/metamodel/CacheConfig.java
   projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.java
   projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_5_1.xsd
Log:
apply patch from JBMETA-303

Modified: projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/ejb3/metamodel/CacheConfig.java
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/ejb3/metamodel/CacheConfig.java	2010-10-15 15:47:03 UTC (rev 108602)
+++ projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/ejb3/metamodel/CacheConfig.java	2010-10-15 15:54:23 UTC (rev 108603)
@@ -37,6 +37,8 @@
    private String name = null;
    private String persistenceManager = null;
    private String replicationIsPassivation = null;
+   private String cacheMode = null;
+   private String backups = null;
 
    public String getPersistenceManager()
    {
@@ -108,6 +110,26 @@
       this.replicationIsPassivation = replicationIsPassivation;
    }
 
+   public String getCacheMode()
+   {
+      return cacheMode;
+   }
+
+   public void setCacheMode(String cacheMode)
+   {
+      this.cacheMode = cacheMode;
+   }
+
+   public String getBackups()
+   {
+      return backups;
+   }
+
+   public void setBackups(String backups)
+   {
+      this.backups = backups;
+   }
+
    public String toString()
    {
       StringBuffer sb = new StringBuffer(100);
@@ -117,6 +139,8 @@
       sb.append(", idleTimeoutSeconds=").append(idleTimeoutSeconds);
       sb.append(", name=").append(name);
       sb.append(", replicationIsPassivation=").append(replicationIsPassivation);
+      sb.append(", cacheMode=").append(cacheMode);
+      sb.append(", backups=").append(backups);
       sb.append("]");
       return sb.toString();
    }

Modified: projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.java
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.java	2010-10-15 15:47:03 UTC (rev 108602)
+++ projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.java	2010-10-15 15:54:23 UTC (rev 108603)
@@ -32,7 +32,7 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @version <tt>$Revision: 80355 $</tt>
  */
- at XmlType(name="cache-configType", propOrder={"value", "maxSize", "idleTimeoutSeconds", "removeTimeoutSeconds", "name", "persistenceManager", "replicationIsPassivation"})
+ at XmlType(name="cache-configType", propOrder={"value", "maxSize", "idleTimeoutSeconds", "removeTimeoutSeconds", "name", "persistenceManager", "replicationIsPassivation", "cacheMode", "backups"})
 public class CacheConfigMetaData
 {
    private String value = null;
@@ -42,7 +42,9 @@
    private String name = null;
    private String persistenceManager = null;
    private String replicationIsPassivation = null;
-
+   private Integer  cacheMode = null;
+   private String backups = null;
+   
    public String getPersistenceManager()
    {
       return persistenceManager;
@@ -106,6 +108,24 @@
       this.name = name;
    }   
 
+   public Integer getCacheMode() {
+      return cacheMode;
+   }
+
+   @XmlElement(name="cache-mode")
+   public void setCacheMode(Integer cacheMode) {
+      this.cacheMode = cacheMode;
+   }
+
+   public String getBackups() {
+      return backups;
+   }
+
+   @XmlElement(name="backups")
+   public void setBackups(String backups) {
+      this.backups = backups;
+   }
+
    public String getReplicationIsPassivation()
    {
       return replicationIsPassivation;
@@ -125,6 +145,8 @@
       sb.append(", idleTimeoutSeconds=").append(idleTimeoutSeconds);
       sb.append(", name=").append(name);
       sb.append(", replicationIsPassivation=").append(replicationIsPassivation);
+      sb.append(", cacheMode=").append(cacheMode);
+      sb.append(", backups=").append(backups);
       sb.append("]");
       return sb.toString();
    }

Modified: projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_5_1.xsd
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_5_1.xsd	2010-10-15 15:47:03 UTC (rev 108602)
+++ projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_5_1.xsd	2010-10-15 15:54:23 UTC (rev 108603)
@@ -1030,6 +1030,8 @@
          <xsd:element name="cache-name" type="jboss:cache-nameType" minOccurs="0"/>
          <xsd:element name="persistence-manager" type="jboss:persistence-managerType" minOccurs="0"/>
          <xsd:element name="replication-is-passivation" type="jboss:replication-is-passivationType" minOccurs="0"/>
+         <xsd:element name="cache-mode" type="jboss:cache-modeType" minOccurs="0"/>
+         <xsd:element name="backups" type="jboss:backupsType" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
 
@@ -1066,6 +1068,28 @@
       </xsd:simpleContent>
    </xsd:complexType>
 
+    <!-- **************************************************** -->
+
+    <xsd:complexType name="cache-modeType">
+       <xsd:annotation>
+          <xsd:documentation>either SYNCHRONOUS or ASYNCHRONOUS</xsd:documentation>
+       </xsd:annotation>
+       <xsd:simpleContent>
+          <xsd:restriction base="javaee:string"/>
+       </xsd:simpleContent>
+    </xsd:complexType>
+
+    <!-- **************************************************** -->
+
+    <xsd:complexType name="backupsType">
+       <xsd:annotation>
+          <xsd:documentation>negative means total replication, 0 means local-only mode, positive means distribution mode, using the specified number of backups.</xsd:documentation>
+       </xsd:annotation>
+       <xsd:simpleContent>
+          <xsd:restriction base="javaee:xsdIntegerType"/>
+       </xsd:simpleContent>
+    </xsd:complexType>
+
    <!-- **************************************************** -->
 
    <xsd:complexType name="cache-max-sizeType">