[jboss-cvs] JBossCache/src/org/jboss/cache/eviction ...
Manik Surtani
msurtani at jboss.com
Tue Jul 18 13:50:56 EDT 2006
User: msurtani
Date: 06/07/18 13:50:56
Modified: src/org/jboss/cache/eviction
ElementSizeConfiguration.java
FIFOConfiguration.java LFUConfiguration.java
LRUConfiguration.java MRUConfiguration.java
RegionManager.java
Log:
Make sure configuration impl reads in configs properly
Revision Changes Path
1.3 +3 -3 JBossCache/src/org/jboss/cache/eviction/ElementSizeConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/ElementSizeConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ElementSizeConfiguration.java 18 Jul 2006 10:50:45 -0000 1.2
+++ ElementSizeConfiguration.java 18 Jul 2006 17:50:56 -0000 1.3
@@ -14,7 +14,7 @@
/**
* @author Daniel Huang
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ElementSizeConfiguration implements EvictionConfiguration
{
@@ -63,7 +63,7 @@
throw new ConfigurationException("Name is required for the eviction region");
}
- String maxNodes = XmlHelper.getAttr(element, EvictionConfiguration.MAX_NODES,
+ String maxNodes = XmlHelper.getTagContents(element, EvictionConfiguration.MAX_NODES,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (maxNodes != null && !maxNodes.equals(""))
{
@@ -74,7 +74,7 @@
setMaxNodes(0);
}
- String maxElementsPerNode = XmlHelper.getAttr(element, EvictionConfiguration.MAX_ELEMENTS_PER_NODE,
+ String maxElementsPerNode = XmlHelper.getTagContents(element, EvictionConfiguration.MAX_ELEMENTS_PER_NODE,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (maxElementsPerNode == null)
{
1.5 +2 -2 JBossCache/src/org/jboss/cache/eviction/FIFOConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/FIFOConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- FIFOConfiguration.java 18 Jul 2006 10:50:45 -0000 1.4
+++ FIFOConfiguration.java 18 Jul 2006 17:50:56 -0000 1.5
@@ -16,7 +16,7 @@
* FIFO Configuration for FIFO Eviction Policy.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class FIFOConfiguration implements EvictionConfiguration
{
@@ -61,7 +61,7 @@
throw new ConfigurationException("Name is required for the eviction region");
}
- String maxNodes = XmlHelper.getAttr(element,
+ String maxNodes = XmlHelper.getTagContents(element,
MAX_NODES, EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (maxNodes != null && !maxNodes.equals(""))
{
1.5 +3 -3 JBossCache/src/org/jboss/cache/eviction/LFUConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LFUConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LFUConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LFUConfiguration.java 18 Jul 2006 10:50:45 -0000 1.4
+++ LFUConfiguration.java 18 Jul 2006 17:50:56 -0000 1.5
@@ -16,7 +16,7 @@
* LFU Configuration implementation for LFU Policy.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class LFUConfiguration implements EvictionConfiguration
{
@@ -66,7 +66,7 @@
throw new ConfigurationException("Name is required for the eviction region");
}
- String maxNodes = XmlHelper.getAttr(element,
+ String maxNodes = XmlHelper.getTagContents(element,
EvictionConfiguration.MAX_NODES, EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (maxNodes != null)
{
@@ -77,7 +77,7 @@
setMaxNodes(0);
}
- String minNodes = XmlHelper.getAttr(element, EvictionConfiguration.MIN_NODES,
+ String minNodes = XmlHelper.getTagContents(element, EvictionConfiguration.MIN_NODES,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (minNodes != null)
{
1.3 +5 -5 JBossCache/src/org/jboss/cache/eviction/LRUConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LRUConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- LRUConfiguration.java 18 Jul 2006 10:50:45 -0000 1.2
+++ LRUConfiguration.java 18 Jul 2006 17:50:56 -0000 1.3
@@ -16,7 +16,7 @@
* LRU Configuration implementation.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class LRUConfiguration implements EvictionConfiguration
{
@@ -78,7 +78,7 @@
throw new ConfigurationException("Name is required for the eviction region");
}
- String maxNodes = XmlHelper.getAttr(element, EvictionConfiguration.MAX_NODES,
+ String maxNodes = XmlHelper.getTagContents(element, EvictionConfiguration.MAX_NODES,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (maxNodes != null && !maxNodes.equals(""))
{
@@ -88,18 +88,18 @@
{
setMaxNodes(0);
}
- String timeToLive = XmlHelper.getAttr(element, EvictionConfiguration.TIME_TO_IDLE_SECONDS,
+ String timeToLive = XmlHelper.getTagContents(element, EvictionConfiguration.TIME_TO_IDLE_SECONDS,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (timeToLive == null)
{
- timeToLive = XmlHelper.getAttr(element, EvictionConfiguration.TIME_TO_LIVE_SECONDS,
+ timeToLive = XmlHelper.getTagContents(element, EvictionConfiguration.TIME_TO_LIVE_SECONDS,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (timeToLive == null)
throw new ConfigurationException("LRUConfiguration.parseXMLConfig(): Null timeToLiveSeconds element");
}
setTimeToLiveSeconds(Integer.parseInt(timeToLive));
- String maxAge = XmlHelper.getAttr(element, EvictionConfiguration.MAX_AGE_SECONDS,
+ String maxAge = XmlHelper.getTagContents(element, EvictionConfiguration.MAX_AGE_SECONDS,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (maxAge != null && !maxAge.equals(""))
{
1.4 +2 -2 JBossCache/src/org/jboss/cache/eviction/MRUConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/MRUConfiguration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MRUConfiguration.java 18 Jul 2006 10:50:45 -0000 1.3
+++ MRUConfiguration.java 18 Jul 2006 17:50:56 -0000 1.4
@@ -16,7 +16,7 @@
* MRUConfiguration EvictionConfiguration implementation for MRUPolicy.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class MRUConfiguration implements EvictionConfiguration
{
@@ -57,7 +57,7 @@
throw new ConfigurationException("Name is required for the eviction region");
}
- String maxNodes = XmlHelper.getAttr(element, EvictionConfiguration.MAX_NODES,
+ String maxNodes = XmlHelper.getTagContents(element, EvictionConfiguration.MAX_NODES,
EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (maxNodes != null && !maxNodes.equals(""))
{
1.18 +2 -2 JBossCache/src/org/jboss/cache/eviction/RegionManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/RegionManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- RegionManager.java 18 Jul 2006 10:50:45 -0000 1.17
+++ RegionManager.java 18 Jul 2006 17:50:56 -0000 1.18
@@ -34,7 +34,7 @@
*
* @author Ben Wang 02-2004
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Id: RegionManager.java,v 1.17 2006/07/18 10:50:45 msurtani Exp $
+ * @version $Id: RegionManager.java,v 1.18 2006/07/18 17:50:56 msurtani Exp $
*/
public class RegionManager
{
@@ -183,7 +183,7 @@
cache_.setEvictionListener(listener);
Element elem = cache_.getEvictionPolicyConfig();
- String temp = XmlHelper.getAttr(elem,
+ String temp = XmlHelper.getTagContents(elem,
EvictionConfiguration.WAKEUP_INTERVAL_SECONDS, EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
if (temp == null)
More information about the jboss-cvs-commits
mailing list