[infinispan-commits] Infinispan SVN: r181 - in trunk/core/src: main/java/org/infinispan/config/parsing and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-04-27 16:53:44 -0400 (Mon, 27 Apr 2009)
New Revision: 181

Modified:
   trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java
   trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
   trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java
Log:
Updates

Modified: trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java	2009-04-27 20:50:32 UTC (rev 180)
+++ trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java	2009-04-27 20:53:44 UTC (rev 181)
@@ -65,7 +65,7 @@
          case GetKeyValueCommand.METHOD_ID:
             command = new GetKeyValueCommand();
             break;
-         case ClearCommand.METHOD_ID:
+         case ClearCommand.COMMAND_ID:
             command = new ClearCommand();
             break;
          case PrepareCommand.COMMAND_ID:

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java	2009-04-27 20:50:32 UTC (rev 180)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java	2009-04-27 20:53:44 UTC (rev 181)
@@ -157,6 +157,7 @@
       configureInvocationBatching(getSingleElementInCoreNS("invocationBatching", e), c);
       configureClustering(getSingleElementInCoreNS("clustering", e), c);
       configureEviction(getSingleElementInCoreNS("eviction", e), c);
+      configureExpiration(getSingleElementInCoreNS("expiration", e), c);
       configureCacheLoaders(getSingleElementInCoreNS("loaders", e), c);
       configureCustomInterceptors(getSingleElementInCoreNS("customInterceptors", e), c);
       configureUnsafe(getSingleElementInCoreNS("unsafe", e), c);

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java	2009-04-27 20:50:32 UTC (rev 180)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java	2009-04-27 20:53:44 UTC (rev 181)
@@ -228,7 +228,7 @@
       assert !ssc.isSingletonStoreEnabled();
    }
 
-   public void testDefaultEviction() throws Exception {
+   public void testDefaultEvictionAndExpiration() throws Exception {
       XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
       String xml = "<eviction />";
       Element e = XmlConfigHelper.stringToElement(xml);
@@ -245,7 +245,7 @@
       assert c.getExpirationMaxIdle() == -1;
    }
 
-   public void testEviction() throws Exception {
+   public void testEvictionAndExpiration() throws Exception {
       XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
       String evictionXml = "<eviction strategy=\"LRU\" " +
             "wakeUpInterval=\"750\" maxEntries=\"7000\" />";