JBoss Cache SVN: r6584 - core/trunk/src/main/java/org/jboss/cache/jmx.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-08-20 08:06:04 -0400 (Wed, 20 Aug 2008)
New Revision: 6584
Modified:
core/trunk/src/main/java/org/jboss/cache/jmx/JmxRegistrationManager.java
core/trunk/src/main/java/org/jboss/cache/jmx/ResourceDMBean.java
Log:
jmx update - name can now be associated to a MBean
Modified: core/trunk/src/main/java/org/jboss/cache/jmx/JmxRegistrationManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/jmx/JmxRegistrationManager.java 2008-08-20 12:04:27 UTC (rev 6583)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/JmxRegistrationManager.java 2008-08-20 12:06:04 UTC (rev 6584)
@@ -130,7 +130,7 @@
List<ResourceDMBean> resourceDMBeans = getResourceDMBeans();
for (ResourceDMBean resource : resourceDMBeans)
{
- String resourceName = resource.getObject().getClass().getSimpleName();
+ String resourceName = resource.getObjectName();
ObjectName objectName = new ObjectName(getObjectName(resourceName));
if (!mBeanServer.isRegistered(objectName))
{
Modified: core/trunk/src/main/java/org/jboss/cache/jmx/ResourceDMBean.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/jmx/ResourceDMBean.java 2008-08-20 12:04:27 UTC (rev 6583)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/ResourceDMBean.java 2008-08-20 12:06:04 UTC (rev 6584)
@@ -46,7 +46,7 @@
import java.util.regex.Pattern;
/**
- * This class was entirely copied from jgroups (same name there).
+ * This class was entirely copied from jgroups 2.7 (same name there).
* Couldn't simply reuse it because jgroups does not ship with MBean, ManagedAttribute and ManagedOperation.
* Once jgroups will ship these classes, the code can be dinalmically reused from there.
*
@@ -735,6 +735,16 @@
return !atts.isEmpty() || !ops.isEmpty();
}
+ public String getObjectName()
+ {
+ MBean mBean = obj.getClass().getAnnotation(MBean.class);
+ if (mBean != null && mBean.objectName() != null && mBean.objectName().trim().length() > 0)
+ {
+ return mBean.objectName();
+ }
+ return obj.getClass().getSimpleName();
+ }
+
public boolean isOperationRegistred(String operationName)
{
for (MBeanOperationInfo opInfo : this.ops)
15 years, 8 months
JBoss Cache SVN: r6583 - in core/trunk/src: main/java/org/jboss/cache/config and 7 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-08-20 08:04:27 -0400 (Wed, 20 Aug 2008)
New Revision: 6583
Added:
core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java
Modified:
core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
core/trunk/src/main/resources/config2to3.xslt
core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java
core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml
Log:
updated 2.x eviction parsing and .xslt to accomodate recent API changes
Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -34,6 +34,7 @@
import org.jboss.cache.util.reflect.ReflectionUtil;
import org.jboss.cache.jmx.annotations.ManagedOperation;
import org.jboss.cache.jmx.annotations.ManagedAttribute;
+import org.jboss.cache.jmx.annotations.MBean;
import org.jgroups.Address;
import org.jgroups.Channel;
import org.jgroups.ChannelException;
@@ -64,6 +65,7 @@
*
* @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a>
*/
+@MBean (objectName = "RPCManager")
public class RPCManagerImpl implements RPCManager
{
private Channel channel;
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -714,16 +714,6 @@
if (evictionConfig.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig() != null &&
!ercs.contains(evictionConfig.getDefaultEvictionRegionConfig())) // then the default is a real region too; not just a template for others
ercs.add(0, evictionConfig.getDefaultEvictionRegionConfig());
-// if (needDefault)
-// {
-// // This may throw ConfigurationException if there is no default
-// // eviction policy class
-// EvictionRegionConfig dflt = evictionConfig.createDefaultEvictionRegionConfig();
-// ercs.add(0, dflt); // put it first
-// // Need to pass this back into the evictionConfig so it knows
-// // about the new region
-// evictionConfig.setEvictionRegionConfigs(ercs);
-// }
// create regions for the regions defined in the evictionConfig.
// scan to be sure the _default_ region isn't added twice
Modified: core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -239,6 +239,7 @@
if (defaultEventQueueSize != that.defaultEventQueueSize) return false;
if (wakeupInterval != that.wakeupInterval) return false;
+ if (defaultEvictionRegionConfig != null ? !defaultEvictionRegionConfig.equals(that.defaultEvictionRegionConfig) : that.defaultEvictionRegionConfig != null) return false;
if (evictionRegionConfigs != null ? !evictionRegionConfigs.equals(that.evictionRegionConfigs) : that.evictionRegionConfigs != null)
return false;
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -9,19 +9,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.buddyreplication.NextMemberBuddyLocator;
-import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
-import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.ConfigurationException;
-import org.jboss.cache.config.EvictionConfig;
-import org.jboss.cache.config.EvictionPolicyConfig;
-import org.jboss.cache.config.EvictionRegionConfig;
-import org.jboss.cache.config.MissingPolicyException;
-import org.jboss.cache.eviction.EvictionPolicy;
+import org.jboss.cache.config.*;
+import org.jboss.cache.config.parsing.element.EvictionElementParser;
+import org.jboss.cache.eviction.EvictionAlgorithm;
import org.jboss.cache.util.FileLookup;
import org.jboss.cache.util.Util;
+import org.jboss.cache.RegionManagerImpl;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -29,11 +24,8 @@
import org.w3c.dom.NodeList;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
-import java.util.Properties;
+import java.util.*;
/**
* Reads in XMLconfiguration files and spits out a {@link org.jboss.cache.config.Configuration} object. When deployed as a
@@ -246,6 +238,7 @@
}
catch (Exception e)
{
+ if (log.isTraceEnabled()) log.trace(e.getMessage());
}
finally
{
@@ -337,20 +330,22 @@
return null;
}
-
- private static EvictionConfig parseEvictionConfig(Element element)
+ @SuppressWarnings("unchecked")
+ static EvictionConfig parseEvictionConfig(Element element)
{
- EvictionConfig ec = new EvictionConfig();
+ EvictionConfig evictionConfig = new EvictionConfig();
if (element != null)
{
// If they set the default eviction policy in the element, use that
// in preference to the external attribute
- String temp = XmlConfigHelper.getTagContents(element,
- "policyClass", ATTR, NAME);
+ String temp = XmlConfigHelper.getTagContents(element, "policyClass", ATTR, NAME);
+ String defaultEvPolicyClassName = null;
if (temp != null && temp.length() > 0)
{
- ec.setDefaultEvictionPolicyClass(temp);
+ defaultEvPolicyClassName = temp;
+ EvictionAlgorithmConfig eac = getEvictionAlgorithmConfig(temp);
+ evictionConfig.getDefaultEvictionRegionConfig().setEvictionAlgorithmConfig(eac);
}
temp = XmlConfigHelper.getTagContents(element, "wakeUpIntervalSeconds", ATTR, NAME);
@@ -366,11 +361,10 @@
wakeupIntervalSeconds = EvictionConfig.WAKEUP_DEFAULT;
}
- ec.setWakeupInterval(wakeupIntervalSeconds * 1000);
+ evictionConfig.setWakeupInterval(wakeupIntervalSeconds * 1000);
int eventQueueSize = 0;
- temp = XmlConfigHelper.getTagContents(element,
- "eventQueueSize", ATTR, NAME);
+ temp = XmlConfigHelper.getTagContents(element, "eventQueueSize", ATTR, NAME);
if (temp != null)
{
@@ -382,7 +376,7 @@
eventQueueSize = EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT;
}
- ec.getDefaultEvictionRegionConfig().setEventQueueSize(eventQueueSize);
+ evictionConfig.getDefaultEvictionRegionConfig().setEventQueueSize(eventQueueSize);
NodeList list = element.getElementsByTagName(EvictionRegionConfig.REGION);
if (list != null && list.getLength() > 0)
@@ -397,7 +391,16 @@
}
try
{
- regionConfigs.add(parseEvictionRegionConfig((Element) node, ec.getDefaultEvictionPolicyClass(), eventQueueSize));
+ EvictionRegionConfig evictionRegionConfig = parseEvictionRegionConfig((Element) node, defaultEvPolicyClassName, eventQueueSize);
+ if (!evictionRegionConfig.getRegionFqn().equals(RegionManagerImpl.DEFAULT_REGION))
+ {
+ regionConfigs.add(evictionRegionConfig);
+ }
+ else
+ {
+ evictionConfig.getDefaultEvictionRegionConfig().setEventQueueSize(evictionRegionConfig.getEventQueueSize());
+ evictionConfig.getDefaultEvictionRegionConfig().setEvictionAlgorithmConfig(evictionRegionConfig.getEvictionAlgorithmConfig());
+ }
}
catch (MissingPolicyException missingPolicy)
{
@@ -406,17 +409,15 @@
}
}
- ec.setEvictionRegionConfigs(regionConfigs);
+ evictionConfig.setEvictionRegionConfigs(regionConfigs);
}
}
- return ec;
+ return evictionConfig;
}
- private static EvictionRegionConfig parseEvictionRegionConfig(Element element,
- String defaultEvictionClass,
- int defaultQueueCapacity)
+ private static EvictionRegionConfig parseEvictionRegionConfig(Element element, String defaultEvPolicyClassName, int defaultQueueCapacity)
{
EvictionRegionConfig erc = new EvictionRegionConfig();
@@ -435,7 +436,7 @@
if (evictionClass == null || evictionClass.length() == 0)
{
- evictionClass = defaultEvictionClass;
+ evictionClass = defaultEvPolicyClassName;
// if it's still null... what do we setCache?
if (evictionClass == null || evictionClass.length() == 0)
{
@@ -444,10 +445,27 @@
}
}
- EvictionPolicy policy;
+ EvictionAlgorithmConfig algorithmConfig = getEvictionAlgorithmConfig(evictionClass);
+
+ parseEvictionPolicyConfig(element, algorithmConfig);
+
+ erc.setEvictionAlgorithmConfig(algorithmConfig);
+ return erc;
+ }
+
+ private static EvictionAlgorithmConfig getEvictionAlgorithmConfig(String evictionClass)
+ {
+ if (evictionClass.indexOf("org.jboss.cache.eviction") < 0)
+ {
+ throw new ConfigurationException("Unsupported custom eviction policy: " + evictionClass +
+ ". Starting with 3.x the eviction API has changed, the code needs to be manually migrated.");
+ }
+ String evictionAlgorithmClass = evictionClass.substring(0,evictionClass.length() - "Policy".length()) + "Algorithm";
+
+ EvictionAlgorithm algorithm;
try
{
- policy = (EvictionPolicy) Util.loadClass(evictionClass).newInstance();
+ algorithm = (EvictionAlgorithm) Util.loadClass(evictionAlgorithmClass).newInstance();
}
catch (RuntimeException e)
{
@@ -458,10 +476,10 @@
throw new RuntimeException("Eviction class is not properly loaded in classloader", e);
}
- EvictionPolicyConfig epc;
+ EvictionAlgorithmConfig algorithmConfig;
try
{
- epc = policy.getEvictionConfigurationClass().newInstance();
+ algorithmConfig = algorithm.getConfigurationClass().newInstance();
}
catch (RuntimeException e)
{
@@ -470,16 +488,35 @@
catch (Exception e)
{
throw new RuntimeException("Failed to instantiate eviction configuration of class " +
- policy.getEvictionConfigurationClass(), e);
+ algorithm.getConfigurationClass(), e);
}
+ return algorithmConfig;
+ }
- // TODO FIX this!!!
-// EvictionElementParser.parseEvictionPolicyConfig(element, epc);
-
- erc.setEvictionPolicyConfig(epc);
- return erc;
+ @SuppressWarnings("unchecked")
+ private static void parseEvictionPolicyConfig(Element element, EvictionAlgorithmConfig target)
+ {
+ target.reset();
+ ParsedAttributes attributes = XmlConfigHelper.extractAttributes(element);
+ Map updatedElements = new HashMap();
+ for (Map.Entry entry : attributes.stringAttribs.entrySet())
+ {
+ String key = (String) entry.getKey();
+ String value = (String) entry.getValue();
+ if (key.indexOf("Seconds") > 0)
+ {
+ key = key.substring(0, key.length() - "Seconds".length());
+ value = value.trim() + "000";
+ }
+ updatedElements.put(key, value);
+ }
+ attributes.stringAttribs.clear();
+ attributes.stringAttribs.putAll(updatedElements);
+ XmlConfigHelper.setValues(target, attributes.stringAttribs, false, true);
+ XmlConfigHelper.setValues(target, attributes.xmlAttribs, true, true);
}
+
/**
* Parses the cluster config which is used to start a JGroups channel
*
@@ -531,5 +568,4 @@
buffer.setLength(buffer.length() - 1);
return buffer.toString();
}
-
}
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -80,7 +80,7 @@
}
String algorithmClassName = getAttributeValue(element, "algorithmClass");
- EvictionAlgorithmConfig eac = null; // every eviction region config needs an algorithm config.
+ EvictionAlgorithmConfig algorithmConfig = null; // every eviction region config needs an algorithm config.
if (existsAttribute(algorithmClassName))
{
@@ -109,7 +109,7 @@
try
{
- eac = Util.getInstance(algorithm.getConfigurationClass());
+ algorithmConfig = Util.getInstance(algorithm.getConfigurationClass());
}
catch (Exception e)
{
@@ -129,7 +129,7 @@
{
try
{
- eac = defaultRegion.getEvictionAlgorithmConfig().clone();
+ algorithmConfig = defaultRegion.getEvictionAlgorithmConfig().clone();
}
catch (CloneNotSupportedException e)
{
@@ -139,11 +139,11 @@
}
}
- if (eac != null)
+ if (algorithmConfig != null)
{
- parseEvictionPolicyConfig(element, eac);
+ parseEvictionPolicyConfig(element, algorithmConfig);
- erc.setEvictionAlgorithmConfig(eac);
+ erc.setEvictionAlgorithmConfig(algorithmConfig);
}
String actionPolicyClass = getAttributeValue(element, "actionPolicyClass");
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -7,7 +7,6 @@
import org.jboss.cache.NodeSPI;
import org.jboss.cache.jmx.annotations.ManagedAttribute;
import org.jboss.cache.jmx.annotations.ManagedOperation;
-import org.jboss.cache.jmx.annotations.MBean;
import org.jboss.cache.commands.read.GetChildrenNamesCommand;
import org.jboss.cache.commands.read.GetDataMapCommand;
import org.jboss.cache.commands.read.GetKeyValueCommand;
@@ -26,7 +25,6 @@
import org.jboss.cache.config.Configuration.NodeLockingScheme;
import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.factories.annotations.Start;
-import org.jboss.cache.interceptors.base.CommandInterceptor;
import org.jboss.cache.interceptors.base.JmxStatsCommandInterceptor;
import org.jboss.cache.invocation.InvocationContext;
import org.jboss.cache.loader.CacheLoader;
Modified: core/trunk/src/main/resources/config2to3.xslt
===================================================================
--- core/trunk/src/main/resources/config2to3.xslt 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/main/resources/config2to3.xslt 2008-08-20 12:04:27 UTC (rev 6583)
@@ -275,14 +275,27 @@
</xsl:if>
<xsl:if test="./config/region[@name='/_default_']">
<default>
+ <xsl:choose>
+ <xsl:when test="./config/region[@name='/_default_' and @policyClass]">
+ <xsl:if test="./config/region[@name='/_default_' and not(starts-with(@policyClass,'org.jboss.cache.eviction'))]">
+ <xsl:message terminate="yes">A custom eviction policy is used for '/_default_' region. Starting with JBossCache 3.x the eviction API changed, so this config file will require manual transformation.</xsl:message>
+ </xsl:if>
+ <xsl:attribute name="algorithmClass">
+ <xsl:value-of
+ select="concat(substring-before(./config/region[@name='/_default_']/@policyClass,'Policy'), 'Algorithm')"/>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if
+ test="./config/attribute[@name='policyClass' and starts-with(string(.), 'org.jboss.cache.eviction')]">
+ <xsl:attribute name="algorithmClass">
+ <xsl:value-of
+ select="concat(substring-before(./config/attribute[@name='policyClass'],'Policy'), 'Algorithm')"/>
+ </xsl:attribute>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:if
- test="./config/attribute[@name='policyClass' and starts-with(string(.), 'org.jboss.cache.eviction')]">
- <xsl:attribute name="algorithmClass">
- <xsl:value-of
- select="concat(substring-before(./config/attribute[@name='policyClass'],'Policy'), 'Algorithm')"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if
test="./config/attribute[@name='policyClass' and not(starts-with(string(.), 'org.jboss.cache.eviction'))]">
<xsl:message terminate="yes">Custom eviction policies require manual transformation.</xsl:message>
</xsl:if>
@@ -344,14 +357,16 @@
<attribute>
<xsl:choose>
<xsl:when test="contains($attr/@name,'Seconds')">
- <xsl:attribute name="{substring-before($attr/@name,'Seconds')}">
- <xsl:value-of select="concat($attr,'000')"/>
+ <xsl:attribute name="name">
+ <xsl:value-of select="substring-before($attr/@name,'Seconds')"/>
</xsl:attribute>
+ <xsl:value-of select="concat($attr,'000')"/>
</xsl:when>
<xsl:otherwise>
- <xsl:attribute name="{string($attr/@name)}">
- <xsl:value-of select="$attr"/>
+ <xsl:attribute name="name">
+ <xsl:value-of select="string($attr/@name)"/>
</xsl:attribute>
+ <xsl:value-of select="$attr"/>
</xsl:otherwise>
</xsl:choose>
</attribute>
Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -34,7 +34,7 @@
*/
public void testSingleFile() throws Exception
{
- String fileName = getFileName("/default-test-config2x.xml");
+ String fileName = getFileName("/policyPerRegion-eviction.xml");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
convertor.parse(fileName, baos, XSLT_FILE);
System.out.println("result = \n" + baos);
@@ -51,12 +51,42 @@
public void testEqualityOnTransformedFiles() throws Exception
{
String[] fileNames = {
-// "buddy-replication-cache.xml",
-// "cacheloader-enabled-cache.xml",
+ "buddy-replication-cache.xml",
+ "local-cache.xml",
+ "multiplexer-enabled-cache.xml",
+ "total-replication-cache.xml",
+ };
+ for (String file : fileNames)
+ {
+ System.out.println("Processing file = " + file);
+ String fileName = getFileName(file);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ convertor.parse(fileName, baos, XSLT_FILE);
+// System.out.println("result = \n" + baos);
+
+ XmlConfigurationParser newParser = new XmlConfigurationParser();
+ XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
+
+ Configuration newConfig = newParser.parseStream(new ByteArrayInputStream(baos.toByteArray()));
+ Configuration oldConfig = oldParser.parseFile(fileName);
+
+ assert newConfig.equals(oldConfig);
+ }
+ }
+
+ /**
+ * Not like the rest of elements, eviction was also changed in 3.x.
+ * As the parser produces different results, we semantically check here that eviction is transformed corectly.
+ */
+ public void testEqualityOnEvictionTransformedFiles() throws Exception
+ {
+ String[] fileNames = {
+ "cacheloader-enabled-cache.xml",
+ "clonable-config.xml",
+ "default-test-config2x.xml",
"eviction-enabled-cache.xml",
-// "local-cache.xml", "multiplexer-enabled-cache.xml",
-// "optimistically-locked-cache.xml", "total-replication-cache.xml", "clonable-config.xml",
-// "policyPerRegion-eviction.xml" , "default-test-config2x.xml"
+ "optimistically-locked-cache.xml",
+ "policyPerRegion-eviction.xml" ,
};
for (String file : fileNames)
{
@@ -64,7 +94,7 @@
String fileName = getFileName(file);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
convertor.parse(fileName, baos, XSLT_FILE);
- System.out.println("result = \n" + baos);
+// System.out.println("result = \n" + baos);
XmlConfigurationParser newParser = new XmlConfigurationParser();
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
Added: core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java 2008-08-20 12:04:27 UTC (rev 6583)
@@ -0,0 +1,189 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.cache.config.parsing;
+
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.reporters.XMLUtils;
+import org.w3c.dom.Element;
+import org.jboss.cache.config.parsing.element.EvictionElementParser;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
+import org.jboss.cache.config.EvictionAlgorithmConfig;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.eviction.MRUAlgorithmConfig;
+
+/**
+ * Eviction was internally changed from version 2.x to version 3.x.
+ * This is a tests to check eviction compatibility between these two versions.
+ *
+ * @author Mircea.Markus(a)jboss.com
+ * @since 3.0
+ */
+@Test(groups = "unit")
+public class Eviction2xto3xCompatibilityTest
+{
+ private EvictionElementParser evictionElementParser;
+
+ @BeforeMethod
+ public void setUp()
+ {
+ evictionElementParser = new EvictionElementParser();
+ }
+
+ public void testDefaultValues1() throws Exception
+ {
+ String oldFormat =
+ " <attribute name=\"EvictionPolicyConfig\">\n" +
+ " <config>\n" +
+ " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" +
+ " <attribute name=\"eventQueueSize\">200000</attribute>\n" +
+ " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" +
+ " <region name=\"/_default_\" eventQueueSize=\"1234\" policyClass=\"org.jboss.cache.eviction.MRUPolicy\">\n" +
+ " <attribute name=\"maxNodes\">5001</attribute>\n" +
+ " <attribute name=\"minTimeToLiveSeconds\">1001</attribute>\n" +
+ " </region>\n" +
+ " <region name=\"/org/jboss/data\">\n" +
+ " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " </region>\n" +
+ " </config>\n" +
+ " </attribute>";
+ Element oldEl = XmlConfigHelper.stringToElementInCoreNS(oldFormat);
+ EvictionConfig oldEvConfig = XmlConfigurationParser2x.parseEvictionConfig(oldEl);
+ //this will be transformed in root region, so make sure that the root region will be corectly set up
+ MRUAlgorithmConfig defaultAlgorithmConfig = (MRUAlgorithmConfig) oldEvConfig.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig();
+ assert oldEvConfig.getDefaultEvictionRegionConfig().getEventQueueSize() == 1234;
+ assert defaultAlgorithmConfig.getEvictionAlgorithmClassName().equals("org.jboss.cache.eviction.MRUAlgorithm");
+ assert defaultAlgorithmConfig.getMaxNodes() == 5001;
+ assert defaultAlgorithmConfig.getMinTimeToLive() == 1001000;
+
+
+ assert oldEvConfig.getEvictionRegionConfigs().size() == 1;
+ EvictionRegionConfig orgJbossData = oldEvConfig.getEvictionRegionConfigs().get(0);
+ assert orgJbossData.getRegionFqn().equals(Fqn.fromString("org/jboss/data"));
+ assert orgJbossData.getEvictionAlgorithmConfig().getEvictionAlgorithmClassName().equals("org.jboss.cache.eviction.LRUAlgorithm");
+ assert orgJbossData.getEventQueueSize() == 200000;
+ }
+
+ public void simpleTest() throws Exception
+ {
+ String oldFormat =
+ " <attribute name=\"EvictionPolicyConfig\">\n" +
+ " <config>\n" +
+ " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" +
+ " <attribute name=\"eventQueueSize\">200000</attribute>\n" +
+ " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" +
+ " <region name=\"/_default_\">\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" +
+ " </region>\n" +
+ " <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LFUPolicy\">\n" +
+ " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " </region>\n" +
+ " </config>\n" +
+ " </attribute>";
+ String newFormat =
+ "<eviction wakeUpInterval=\"5000\">\n" +
+ " <default algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"200000\">\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " <attribute name=\"timeToLive\">1000000</attribute>\n" +
+ " </default>\n" +
+ " <region name=\"/org/jboss/data\" algorithmClass=\"org.jboss.cache.eviction.LFUAlgorithm\" eventQueueSize=\"200000\">\n" +
+ " <attribute name=\"minTimeToLive\">1000000</attribute>\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " </region>\n" +
+ "</eviction>";
+ Element oldEl = XmlConfigHelper.stringToElementInCoreNS(oldFormat);
+ Element newEl = XmlConfigHelper.stringToElementInCoreNS(newFormat);
+ EvictionConfig oldEvConfig = XmlConfigurationParser2x.parseEvictionConfig(oldEl);
+ EvictionConfig newEvConfig = evictionElementParser.parseEvictionElement(newEl);
+ assert oldEvConfig.getDefaultEvictionRegionConfig().equals(newEvConfig.getDefaultEvictionRegionConfig());
+
+ EvictionRegionConfig oldRegionConfig = oldEvConfig.getEvictionRegionConfigs().get(0);
+ EvictionRegionConfig newRegionConfig = newEvConfig.getEvictionRegionConfigs().get(0);
+ EvictionAlgorithmConfig oldEvictionAlgorithmConfig = oldRegionConfig.getEvictionAlgorithmConfig();
+ EvictionAlgorithmConfig newEvictionAlgorithmConfig = newRegionConfig.getEvictionAlgorithmConfig();
+ assert oldEvictionAlgorithmConfig.equals(newEvictionAlgorithmConfig);
+
+ assert oldEvConfig.equals(newEvConfig);
+ }
+
+ public void testFailureOnCustomEvictionPolicy() throws Exception
+ {
+ String oldFormat =
+ " <attribute name=\"EvictionPolicyConfig\">\n" +
+ " <config>\n" +
+ " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" +
+ " <attribute name=\"eventQueueSize\">200000</attribute>\n" +
+ " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" +
+ " <region name=\"/_default_\">\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" +
+ " </region>\n" +
+ " <region name=\"/org/jboss/data\" policyClass=\"org.custom.eviction.policy.LFUPolicy\">\n" +
+ " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " </region>\n" +
+ " </config>\n" +
+ " </attribute>";
+ Element element = XmlConfigHelper.stringToElementInCoreNS(oldFormat);
+ try
+ {
+ XmlConfigurationParser2x.parseEvictionConfig(element);
+ assert false : "custom eviction config not supported for the old parser";
+ } catch (Exception e)
+ {
+ System.out.println(e.getMessage());
+ }
+ }
+
+ public void testFailureOnCustomDefaultEvictionPolicy() throws Exception
+ {
+ String oldFormat =
+ " <attribute name=\"EvictionPolicyConfig\">\n" +
+ " <config>\n" +
+ " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" +
+ " <attribute name=\"eventQueueSize\">200000</attribute>\n" +
+ " <attribute name=\"policyClass\">org.custom.eviction.policy.LFUPolicy</attribute>\n" +
+ " <region name=\"/_default_\">\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" +
+ " </region>\n" +
+ " <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LRUPolicy\">\n" +
+ " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" +
+ " <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " </region>\n" +
+ " </config>\n" +
+ " </attribute>";
+ Element element = XmlConfigHelper.stringToElementInCoreNS(oldFormat);
+ try
+ {
+ XmlConfigurationParser2x.parseEvictionConfig(element);
+ assert false : "default custom eviction config not supported for the old parser";
+ } catch (Exception e)
+ {
+ System.out.println(e.getMessage());
+ }
+ }
+}
Modified: core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml 2008-08-19 11:26:03 UTC (rev 6582)
+++ core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml 2008-08-20 12:04:27 UTC (rev 6583)
@@ -62,25 +62,12 @@
<!-- Cache wide default -->
<region name="/_default_">
<attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="minTimeToLiveSeconds">1000</attribute>
</region>
<region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.LFUPolicy">
- <attribute name="timeToLiveSeconds">1000</attribute>
+ <attribute name="minTimeToLiveSeconds">1000</attribute>
<attribute name="maxNodes">5000</attribute>
</region>
- <!--<region name="/org/jboss/test/data">-->
- <!--<attribute name="maxNodes">5</attribute>-->
- <!--<attribute name="timeToLiveSeconds">4</attribute>-->
- <!--</region>-->
- <!--<region name="/test">-->
- <!--<attribute name="maxNodes">10000</attribute>-->
- <!--<attribute name="timeToLiveSeconds">4</attribute>-->
- <!--</region>-->
- <!--<region name="/maxAgeTest">-->
- <!--<attribute name="maxNodes">10000</attribute>-->
- <!--<attribute name="timeToLiveSeconds">8</attribute>-->
- <!--<attribute name="maxAgeSeconds">10</attribute>-->
- <!--</region>-->
</config>
</attribute>
15 years, 8 months
JBoss Cache SVN: r6582 - core/trunk/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-19 07:26:03 -0400 (Tue, 19 Aug 2008)
New Revision: 6582
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java
Log:
Null chk
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2008-08-19 11:25:48 UTC (rev 6581)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2008-08-19 11:26:03 UTC (rev 6582)
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.NotSerializableException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -165,6 +166,11 @@
@SuppressWarnings("unchecked")
protected Map wrapMap(Map<Object, Object> m, Set<MarshalledValue> marshalledValues, InvocationContext ctx) throws NotSerializableException
{
+ if (m == null)
+ {
+ if (trace) log.trace("Map is nul; returning an empty map.");
+ return Collections.emptyMap();
+ }
if (trace) log.trace("Wrapping map contents of argument " + m);
Map copy = new HashMap();
for (Map.Entry me : m.entrySet())
15 years, 8 months
JBoss Cache SVN: r6581 - core/trunk/src/main/java/org/jboss/cache/buddyreplication.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-19 07:25:48 -0400 (Tue, 19 Aug 2008)
New Revision: 6581
Modified:
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
Log:
Adding defunct root should be local only
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-08-19 10:14:35 UTC (rev 6580)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-08-19 11:25:48 UTC (rev 6581)
@@ -1074,7 +1074,11 @@
// where N is a number.
Fqn defunctRoot = buddyFqnTransformer.getDeadBackupRoot(dataOwner);
cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
- Node<?, ?> defunctRootNode = cache.getRoot().addChild(defunctRoot);
+ cache.getInvocationContext().getOptionOverrides().setSkipCacheStatusCheck(true);
+ Node<?, ?> root = cache.getRoot();
+ cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
+ cache.getInvocationContext().getOptionOverrides().setSkipCacheStatusCheck(true);
+ Node<?, ?> defunctRootNode = root.addChild(defunctRoot);
SortedSet<Object> childrenNames = new TreeSet<Object>(defunctRootNode.getChildrenNames()); // will be naturally sorted.
Integer childName = 1;
15 years, 8 months
JBoss Cache SVN: r6580 - core/trunk/src/test/java/org/jboss/cache/eviction.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-19 06:14:35 -0400 (Tue, 19 Aug 2008)
New Revision: 6580
Modified:
core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
Log:
Fixed broken/brittle tests
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-08-19 09:37:15 UTC (rev 6579)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-08-19 10:14:35 UTC (rev 6580)
@@ -74,6 +74,9 @@
cache.stop();
}
+ /* THIS TEST NEEDS REWRITING
+
+
public void testEviction() throws Exception
{
int numNodes = (int) ((maxNodesR1 * 2.6) - 1);
@@ -122,7 +125,7 @@
private void revisit(List<Fqn> fqns)
{
for (Fqn fqn : fqns) cache.getNode(fqn);
- }
+ }*/
public void testNodeVisited() throws InterruptedException
{
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-08-19 09:37:15 UTC (rev 6579)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-08-19 10:14:35 UTC (rev 6580)
@@ -60,6 +60,7 @@
{
cache.put("/timeBased/test", "key", "value");
assertTrue(cache.exists("/timeBased/test"));
+ TestingUtil.sleepThread(1);
new EvictionController(cache).startEviction();
// assert waitForEviction(cache, 30, TimeUnit.SECONDS, Fqn.fromString("/timeBased/test"));
assertTrue(!cache.exists("/timeBased/test"));
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-08-19 09:37:15 UTC (rev 6579)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-08-19 10:14:35 UTC (rev 6580)
@@ -26,7 +26,7 @@
public class ReplicatedLRUPolicyTest extends EvictionTestsBase
{
CacheSPI<Object, Object> cache1, cache2, cache3;
- long wakeupIntervalMillis = 200;
+ long wakeupIntervalMillis = 500;
EvictionListener listener = new EvictionListener();
@BeforeMethod(alwaysRun = true)
@@ -82,6 +82,7 @@
LRUAlgorithmConfig cfg = (LRUAlgorithmConfig) cache3.getConfiguration().getEvictionConfig().getEvictionRegionConfig(rootStr).getEvictionAlgorithmConfig();
cfg.setMaxAge(60, TimeUnit.SECONDS);
cfg.setTimeToLive(360, TimeUnit.SECONDS);
+ cfg.setMaxNodes(200);
EvictionWatcher ew = new EvictionWatcher(cache1, Fqn.fromString(rootStr + 3));
for (int i = 0; i < 10; i++)
{
15 years, 8 months
JBoss Cache SVN: r6579 - core/trunk/src/main/java/org/jboss/cache/invocation.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-19 05:37:15 -0400 (Tue, 19 Aug 2008)
New Revision: 6579
Modified:
core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java
Log:
Copy and reset to consider lazily initialized node map
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java 2008-08-19 09:36:47 UTC (rev 6578)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/MVCCInvocationContext.java 2008-08-19 09:37:15 UTC (rev 6579)
@@ -17,7 +17,7 @@
*/
public class MVCCInvocationContext extends AbstractInvocationContext
{
- private Map<Fqn, NodeSPI> lookedUpNodes = null;
+ private HashMap<Fqn, NodeSPI> lookedUpNodes = null;
private MVCCTransactionContext mvccTCtx;
@Override
@@ -96,14 +96,19 @@
public void reset()
{
super.reset();
- lookedUpNodes.clear();
+ if (lookedUpNodes != null)
+ {
+ lookedUpNodes.clear();
+ lookedUpNodes = null;
+ }
}
+ @SuppressWarnings("unchecked")
public InvocationContext copy()
{
MVCCInvocationContext copy = new MVCCInvocationContext();
doCopy(copy);
- copy.lookedUpNodes.putAll(lookedUpNodes);
+ if (lookedUpNodes != null) copy.lookedUpNodes = (HashMap<Fqn, NodeSPI>) lookedUpNodes.clone();
return copy;
}
}
15 years, 8 months
JBoss Cache SVN: r6578 - core/trunk/src/test/java/org/jboss/cache/api.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-19 05:36:47 -0400 (Tue, 19 Aug 2008)
New Revision: 6578
Modified:
core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java
Log:
Better teardown
Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2008-08-19 09:36:28 UTC (rev 6577)
+++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2008-08-19 09:36:47 UTC (rev 6578)
@@ -58,8 +58,7 @@
@AfterMethod(alwaysRun = true)
public void tearDown()
{
- if (cache1 != null) cache1.stop();
- if (cache2 != null) cache2.stop();
+ TestingUtil.killCaches(cache1, cache2);
}
protected void configure(Configuration c)
15 years, 8 months
JBoss Cache SVN: r6577 - core/trunk/src/main/java/org/jboss/cache/config/parsing/element.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-19 05:36:28 -0400 (Tue, 19 Aug 2008)
New Revision: 6577
Modified:
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
Log:
Removed unnecessarily verbose logging
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-18 20:05:38 UTC (rev 6576)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-19 09:36:28 UTC (rev 6577)
@@ -1,7 +1,5 @@
package org.jboss.cache.config.parsing.element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.ConfigurationException;
import org.jboss.cache.config.EvictionAlgorithmConfig;
import org.jboss.cache.config.EvictionConfig;
@@ -30,11 +28,8 @@
*/
public class EvictionElementParser extends XmlParserBase
{
- private static final Log log = LogFactory.getLog(EvictionElementParser.class);
-
public EvictionConfig parseEvictionElement(Element evictionElement)
{
- if (log.isTraceEnabled()) log.trace("Parsing eviction element " + XmlConfigHelper.toString(evictionElement));
EvictionConfig evictionConfig = new EvictionConfig();
String wakeUpInterval = getAttributeValue(evictionElement, "wakeUpInterval");
if (existsAttribute(wakeUpInterval))
15 years, 8 months
JBoss Cache SVN: r6576 - in core/trunk/src: test/java/org/jboss/cache/config and 2 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-18 16:05:38 -0400 (Mon, 18 Aug 2008)
New Revision: 6576
Modified:
core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java
core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java
core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
core/trunk/src/test/resources/configs/string-property-replaced.xml
Log:
Fixed more broken tests
Modified: core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java 2008-08-18 19:46:56 UTC (rev 6575)
+++ core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java 2008-08-18 20:05:38 UTC (rev 6576)
@@ -23,6 +23,9 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.eviction.DefaultEvictionActionPolicy;
+import org.jboss.cache.eviction.EvictionAlgorithm;
+import org.jboss.cache.eviction.EvictionPolicy;
+import org.jboss.cache.util.Util;
import java.util.LinkedList;
import java.util.List;
@@ -51,6 +54,8 @@
@Dynamic
private List<EvictionRegionConfig> evictionRegionConfigs;
private EvictionRegionConfig defaultEvictionRegionConfig;
+ @Deprecated
+ private String defaultEvictionPolicyClass;
public EvictionConfig()
{
@@ -115,7 +120,7 @@
@Deprecated
public String getDefaultEvictionPolicyClass()
{
- throw new ConfigurationException("Please use getDefaultEvictionRegionConfig() instead.");
+ return defaultEvictionPolicyClass;
}
/**
@@ -124,7 +129,17 @@
@Deprecated
public void setDefaultEvictionPolicyClass(String defaultEvictionPolicyClass)
{
- throw new ConfigurationException("Please use setDefaultEvictionRegionConfig() instead.");
+ try
+ {
+ EvictionPolicy policy = (EvictionPolicy) Util.getInstance(defaultEvictionPolicyClass);
+ EvictionAlgorithm ea = policy.getEvictionAlgorithm();
+ defaultEvictionRegionConfig.setEvictionAlgorithmConfig(Util.getInstance(ea.getConfigurationClass()));
+ this.defaultEvictionPolicyClass = defaultEvictionPolicyClass;
+ }
+ catch (Exception e)
+ {
+ throw new ConfigurationException(e);
+ }
}
/**
Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-08-18 19:46:56 UTC (rev 6575)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-08-18 20:05:38 UTC (rev 6576)
@@ -14,7 +14,7 @@
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
import org.jboss.cache.config.parsing.XmlConfigurationParser;
-import org.jboss.cache.eviction.LRUPolicy;
+import org.jboss.cache.eviction.LRUAlgorithmConfig;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
@@ -61,7 +61,7 @@
assertEquals(4, ec2.getDefaultEvictionRegionConfig().getEventQueueSize());
assertEquals(45000, ec2.getWakeupInterval());
- assertEquals(LRUPolicy.class.getName(), ec2.getDefaultEvictionPolicyClass());
+ assert ec2.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig() instanceof LRUAlgorithmConfig;
List<EvictionRegionConfig> ercs1 = ec1.getEvictionRegionConfigs();
List<EvictionRegionConfig> ercs2 = ec2.getEvictionRegionConfigs();
@@ -108,8 +108,8 @@
assertEquals(erc1.getRegionFqn(), erc2.getRegionFqn());
assertEquals(erc1.getEventQueueSize(), erc2.getEventQueueSize());
- EvictionPolicyConfig epc1 = erc1.getEvictionPolicyConfig();
- EvictionPolicyConfig epc2 = erc2.getEvictionPolicyConfig();
+ EvictionAlgorithmConfig epc1 = erc1.getEvictionAlgorithmConfig();
+ EvictionAlgorithmConfig epc2 = erc2.getEvictionAlgorithmConfig();
assertFalse(epc1 == epc2);
assertEquals(epc1, epc2);
Modified: core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java 2008-08-18 19:46:56 UTC (rev 6575)
+++ core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java 2008-08-18 20:05:38 UTC (rev 6576)
@@ -7,16 +7,12 @@
package org.jboss.cache.config;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertTrue;
-
import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
import org.jboss.cache.config.Configuration.NodeLockingScheme;
-import org.jboss.cache.eviction.LRUConfiguration;
-import org.jboss.cache.eviction.LRUPolicy;
import org.jboss.cache.config.parsing.XmlConfigurationParser;
+import org.jboss.cache.eviction.LRUAlgorithmConfig;
+import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -24,25 +20,25 @@
/**
* Tests that string property replacement works properly when parsing
* a config file. JBCACHE-1218
- *
+ *
* @author Brian Stansberry
*/
@Test(groups = {"functional"})
public class StringPropertyReplacementTest
{
public static final String STRING_REPLACED_FILE = "configs/string-property-replaced.xml";
-
+
private static final String PROP_BASE = "test.property.";
private static final String SYNC_COMMIT_PROP = PROP_BASE + "SyncCommitPhase";
private static final String NUM_BUDDIES_PROP = PROP_BASE + "BuddyReplicationConfig.numBuddies";
private static final String MAX_NODES_PROP = PROP_BASE + "EvictionPolicyConfig.maxNodes";
private static final String BUDDY_POOL_PROP = PROP_BASE + "BuddyReplicationConfig.buddyPoolName";
-
+
private String numBuddies;
private String syncCommitPhase;
private String maxNodes;
private String buddyPoolName;
-
+
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
@@ -51,7 +47,7 @@
maxNodes = System.getProperty(MAX_NODES_PROP);
buddyPoolName = System.getProperty(BUDDY_POOL_PROP);
}
-
+
@AfterMethod(alwaysRun = true)
public void tearDown() throws Exception
{
@@ -73,35 +69,35 @@
if (buddyPoolName == null)
System.clearProperty(BUDDY_POOL_PROP);
else
- System.setProperty(BUDDY_POOL_PROP, buddyPoolName);
+ System.setProperty(BUDDY_POOL_PROP, buddyPoolName);
}
-
+
public void testStringPropertyReplacement() throws Exception
{
System.setProperty(NUM_BUDDIES_PROP, "3");
System.setProperty(SYNC_COMMIT_PROP, "false");
System.setProperty(MAX_NODES_PROP, "1000");
System.setProperty(BUDDY_POOL_PROP, "replaced");
-
+
Configuration cfg = new XmlConfigurationParser().parseFile(STRING_REPLACED_FILE);
-
+
assertEquals(NodeLockingScheme.OPTIMISTIC, cfg.getNodeLockingScheme());
assertFalse(cfg.isSyncCommitPhase());
assertTrue(cfg.isSyncRollbackPhase());
assertEquals(15000, cfg.getLockAcquisitionTimeout());
String clusterCfg = cfg.getClusterConfig();
assertTrue(clusterCfg == null || clusterCfg.length() == 0);
-
+
EvictionConfig ec = cfg.getEvictionConfig();
- assertEquals(LRUPolicy.class.getName(), ec.getDefaultEvictionPolicyClass());
- EvictionRegionConfig erc = ec.getEvictionRegionConfigs().get(0);
- LRUConfiguration epc = (LRUConfiguration) erc.getEvictionPolicyConfig();
+ assert ec.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig() instanceof LRUAlgorithmConfig;
+ EvictionRegionConfig erc = ec.getDefaultEvictionRegionConfig();
+ LRUAlgorithmConfig epc = (LRUAlgorithmConfig) erc.getEvictionAlgorithmConfig();
assertEquals(1000, epc.getMaxNodes());
-
+
CacheLoaderConfig clc = cfg.getCacheLoaderConfig();
IndividualCacheLoaderConfig iclc = clc.getFirstCacheLoaderConfig();
assertEquals(System.getProperty("java.io.tmpdir"), iclc.getProperties().get("location"));
-
+
BuddyReplicationConfig brc = cfg.getBuddyReplicationConfig();
assertTrue(brc.isEnabled());
assertEquals("replaced", brc.getBuddyPoolName());
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java 2008-08-18 19:46:56 UTC (rev 6575)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java 2008-08-18 20:05:38 UTC (rev 6576)
@@ -21,17 +21,15 @@
*/
package org.jboss.cache.config.parsing;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.AfterTest;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
-import org.jboss.cache.config.parsing.XmlConfigurationSchemaTest;
-import org.jboss.cache.config.parsing.XmlConfigurationParser;
-import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FilenameFilter;
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-08-18 19:46:56 UTC (rev 6575)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-08-18 20:05:38 UTC (rev 6576)
@@ -218,7 +218,7 @@
EvictionRegionConfig second = regionConfigs.get(0);
LRUAlgorithmConfig secondConfiguration = (LRUAlgorithmConfig) second.getEvictionAlgorithmConfig();
- assert secondConfiguration.getMaxAge() == 0;
+ assert secondConfiguration.getMaxAge() == -1;
assert secondConfiguration.getTimeToLive() == 1002;
assert secondConfiguration.getMaxNodes() == 0;
Modified: core/trunk/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-08-18 19:46:56 UTC (rev 6575)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-08-18 20:05:38 UTC (rev 6576)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"
nodeLockingScheme="${test.property.NodeLockingScheme:OPTIMISTIC}"/>
<transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>
15 years, 8 months
JBoss Cache SVN: r6575 - core/trunk/src/main/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-08-18 15:46:56 -0400 (Mon, 18 Aug 2008)
New Revision: 6575
Modified:
core/trunk/src/main/java/org/jboss/cache/RegionImpl.java
Log:
Dont throw an exception
Modified: core/trunk/src/main/java/org/jboss/cache/RegionImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-08-18 13:34:16 UTC (rev 6574)
+++ core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-08-18 19:46:56 UTC (rev 6575)
@@ -244,7 +244,7 @@
capacityWarnThreshold = (98 * size) / 100 - 100;
if (capacityWarnThreshold <= 0)
{
- throw new RuntimeException("Capacity warn threshold used in eviction is smaller than 1.");
+ if (log.isWarnEnabled()) log.warn("Capacity warn threshold used in eviction is smaller than 1.");
}
evictionEventQueue = new LinkedBlockingQueue<EvictionEvent>(size);
}
15 years, 8 months