From jbosscache-commits at lists.jboss.org Thu Apr 24 11:22:22 2008
Content-Type: multipart/mixed; boundary="===============4189183688415714093=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5669 - in core/trunk/src:
 test/java/org/jboss/cache/buddyreplication and 1 other directory.
Date: Thu, 24 Apr 2008 11:22:22 -0400
Message-ID: <E1Jp3HC-0004jJ-0F@committer01.frg.pub.inap.atl.jboss.com>

--===============4189183688415714093==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)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/BuddyBackupAct=
ivationInactivationTest.java
Log:
resolved TODOs

Modified: core/trunk/src/main/java/org/jboss/cache/NodeFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-04-2=
4 15:19:08 UTC (rev 5668)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-04-2=
4 15:22:21 UTC (rev 5669)
@@ -277,8 +277,6 @@
                if (gtx !=3D null)
                {
                   CreateNodeCommand createNodeCommand =3D commandsFactory.=
buildCreateNodeCommand(child_fqn);
-                  //todo - [mmarkus] there are commands added to the modif=
ication 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/BuddyBa=
ckupActivationInactivationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupAc=
tivationInactivationTest.java	2008-04-24 15:19:08 UTC (rev 5668)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupAc=
tivationInactivationTest.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
  */
-(a)Test
+(a)Test(groups =3D "functional")
 public class BuddyBackupActivationInactivationTest extends BuddyReplicatio=
nTestsBase
 {
    public static final Fqn<String> A =3D Fqn.fromString("/a");
@@ -204,20 +199,9 @@
 =

    private BuddyReplicationConfig getBuddyConfig() throws Exception
    {
-      // TODO just build the object; skip the legacy XML business
-
-      DocumentBuilderFactory dbf =3D DocumentBuilderFactory.newInstance();
-      DocumentBuilder db =3D dbf.newDocumentBuilder();
-      Document doc =3D db.newDocument();
-      Element config =3D doc.createElement("config");
-      doc.appendChild(config);
-      Element replEnabled =3D doc.createElement("buddyReplicationEnabled");
-      replEnabled.appendChild(doc.createTextNode("true"));
-      config.appendChild(replEnabled);
-      Element gravDisabled =3D doc.createElement("autoDataGravitation");
-      gravDisabled.appendChild(doc.createTextNode("false"));
-      config.appendChild(gravDisabled);
-
-      return XmlConfigurationParser.parseBuddyReplicationConfig(config);
+      BuddyReplicationConfig brc =3D new BuddyReplicationConfig();
+      brc.setEnabled(true);
+      brc.setAutoDataGravitation(false);
+      return brc;
    }
 }


--===============4189183688415714093==--