[jbosscache-commits] JBoss Cache SVN: r5669 - in core/trunk/src: test/java/org/jboss/cache/buddyreplication and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-04-24 11:22:21 -0400 (Thu, 24 Apr 2008)
New Revision: 5669

Modified:
   core/trunk/src/main/java/org/jboss/cache/NodeFactory.java
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java
Log:
resolved TODOs

Modified: core/trunk/src/main/java/org/jboss/cache/NodeFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/NodeFactory.java	2008-04-24 15:19:08 UTC (rev 5668)
+++ core/trunk/src/main/java/org/jboss/cache/NodeFactory.java	2008-04-24 15:22:21 UTC (rev 5669)
@@ -23,7 +23,6 @@
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  */
-// TODO: Rethink how nodes are created.  Perhaps use the component factory to create instance nodes as well, not just singletons?
 public class NodeFactory<K, V> extends ComponentFactory
 {
    private ComponentRegistry componentRegistry;

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-04-24 15:19:08 UTC (rev 5668)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-04-24 15:22:21 UTC (rev 5669)
@@ -277,8 +277,6 @@
                if (gtx != null)
                {
                   CreateNodeCommand createNodeCommand = commandsFactory.buildCreateNodeCommand(child_fqn);
-                  //todo - [mmarkus] there are commands added to the modification list just for being able to rollback.
-                  //todo make sure the commands are being compacted before replication takes place
                   transactionTable.addModification(gtx, createNodeCommand);
                }
             }

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java	2008-04-24 15:19:08 UTC (rev 5668)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java	2008-04-24 15:22:21 UTC (rev 5669)
@@ -15,18 +15,13 @@
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.util.CachePrinter;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,7 +31,7 @@
  *
  * @author Brian Stansberry
  */
- at Test
+ at Test(groups = "functional")
 public class BuddyBackupActivationInactivationTest extends BuddyReplicationTestsBase
 {
    public static final Fqn<String> A = Fqn.fromString("/a");
@@ -204,20 +199,9 @@
 
    private BuddyReplicationConfig getBuddyConfig() throws Exception
    {
-      // TODO just build the object; skip the legacy XML business
-
-      DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-      DocumentBuilder db = dbf.newDocumentBuilder();
-      Document doc = db.newDocument();
-      Element config = doc.createElement("config");
-      doc.appendChild(config);
-      Element replEnabled = doc.createElement("buddyReplicationEnabled");
-      replEnabled.appendChild(doc.createTextNode("true"));
-      config.appendChild(replEnabled);
-      Element gravDisabled = doc.createElement("autoDataGravitation");
-      gravDisabled.appendChild(doc.createTextNode("false"));
-      config.appendChild(gravDisabled);
-
-      return XmlConfigurationParser.parseBuddyReplicationConfig(config);
+      BuddyReplicationConfig brc = new BuddyReplicationConfig();
+      brc.setEnabled(true);
+      brc.setAutoDataGravitation(false);
+      return brc;
    }
 }