[jboss-cvs] JBossAS SVN: r65348 - in trunk/server/src/main/org/jboss/metadata: web and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-09-12 23:17:37 -0400 (Wed, 12 Sep 2007)
New Revision: 65348

Modified:
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/web/ReplicationConfig.java
Log:
[JBAS-4708] Move default clustering config info out of DeployerConfig to WebMetaData

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-09-13 02:02:33 UTC (rev 65347)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-09-13 03:17:37 UTC (rev 65348)
@@ -642,8 +642,17 @@
       return dependencies;
    }
 
+   /**
+    * Gets the session replication configuration.
+    * 
+    * @return the configuration. Will not return <code>null</code>.
+    */
    public ReplicationConfig getReplicationConfig()
    {
+      if (replicationConfig == null)
+      {
+         replicationConfig = new ReplicationConfig();
+      }
       return replicationConfig;
    }
 

Modified: trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2007-09-13 02:02:33 UTC (rev 65347)
+++ trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2007-09-13 03:17:37 UTC (rev 65348)
@@ -263,6 +263,22 @@
       {
          config.setFieldBatchMode(value);
       }
+      else if (localName.equals("cache-name"))
+      {
+         config.setCacheName(value);
+      }
+      else if (localName.equals("snapshot-mode"))
+      {
+         config.setSnapshotMode(value);         
+      }
+      else if (localName.equals("snapshot-interval"))
+      {
+         config.setSnapshotInterval(value);
+      }
+      else if (localName.equals("use-jk"))
+      {
+         config.setUseJK(value);
+      }
    }
 
    public void setValue(PassivationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)

Modified: trunk/server/src/main/org/jboss/metadata/web/ReplicationConfig.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/ReplicationConfig.java	2007-09-13 02:02:33 UTC (rev 65347)
+++ trunk/server/src/main/org/jboss/metadata/web/ReplicationConfig.java	2007-09-13 03:17:37 UTC (rev 65348)
@@ -37,6 +37,12 @@
    protected String trigger;
    protected String granularity;
    protected String fieldBatchMode;
+   protected String defaultCacheName;
+   protected String cacheName;
+   protected String useJK;
+   protected String snapshotMode;
+   protected String snapshotInterval;
+   protected String useLocalCache;
    
    public String getTrigger()
    {
@@ -68,9 +74,115 @@
       this.fieldBatchMode = fieldBatchMode;
    }
 
+   public String getCacheName()
+   {
+      return cacheName;
+   }
+
+   public void setCacheName(String cacheName)
+   {
+      this.cacheName = cacheName;
+   }
+
+   public String getDefaultCacheName()
+   {
+      return defaultCacheName;
+   }
+
+   public void setDefaultCacheName(String defaultCacheName)
+   {
+      this.defaultCacheName = defaultCacheName;
+   }
+
+   public String getSnapshotInterval()
+   {
+      return snapshotInterval;
+   }
+
+   public void setSnapshotInterval(String snapshotInterval)
+   {
+      this.snapshotInterval = snapshotInterval;
+   }
+
+   public String getSnapshotMode()
+   {
+      return snapshotMode;
+   }
+
+   public void setSnapshotMode(String snapshotMode)
+   {
+      this.snapshotMode = snapshotMode;
+   }
+
+   public String getUseJK()
+   {
+      return useJK;
+   }
+
+   public void setUseJK(String useJK)
+   {
+      this.useJK = useJK;
+   }
+
+   public String getUseLocalCache()
+   {
+      return useLocalCache;
+   }
+
+   public void setUseLocalCache(String useLocalCache)
+   {
+      this.useLocalCache = useLocalCache;
+   }
+   
+   public void setDefaultSnapshotMode(String mode)
+   {
+      if (isEmpty(snapshotMode))
+      {
+         snapshotMode = mode;
+      }
+   }
+   
+   public void setDefaultSnapshotInterval(int interval)
+   {
+      if (isEmpty(snapshotInterval))
+      {
+         snapshotInterval = String.valueOf(interval);
+      }
+   }
+   
+   public void setDefaultUseJK(boolean useJK)
+   {
+      if (isEmpty(this.useJK))
+      {
+         this.useJK = String.valueOf(useJK);
+      }
+   }
+   
+   public void setDefaultUseLocalCache(boolean useLocal)
+   {
+      if (isEmpty(this.useLocalCache))
+      {
+         this.useLocalCache = String.valueOf(useLocal);
+      }
+   }
+
    public String toString()
    {
       StringBuffer sb = new StringBuffer(100);
+      sb.append("cacheName=").append(cacheName)
+        .append(";defaultCacheName=").append(defaultCacheName)
+        .append(";granularity=").append(granularity)
+        .append(";trigger=").append(trigger)
+        .append(";fieldBatchMode=").append(fieldBatchMode)
+        .append(";useJK=").append(useJK)
+        .append(";snapshotMode=").append(snapshotMode)
+        .append(";snapshotInterval=").append(snapshotInterval)
+        .append(";useLocalCache=").append(useLocalCache);
       return sb.toString();
    }
+   
+   private static boolean isEmpty(String str)
+   {
+      return str == null || str.trim().length() == 0;
+   }
 }