[jboss-cvs] JBossAS SVN: r107088 - projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: smarlow at redhat.com
Date: 2010-07-26 15:17:18 -0400 (Mon, 26 Jul 2010)
New Revision: 107088

Added:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DefaultTreeCacheFactory.java
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/TreeCacheFactory.java
Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java
Log:
changes for unit testing

Added: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DefaultTreeCacheFactory.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DefaultTreeCacheFactory.java	                        (rev 0)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DefaultTreeCacheFactory.java	2010-07-26 19:17:18 UTC (rev 107088)
@@ -0,0 +1,13 @@
+package org.jboss.ha.jndi.impl;
+
+import org.infinispan.Cache;
+import org.infinispan.tree.TreeCache;
+import org.jboss.ha.jndi.impl.TreeCacheFactory;
+
+/**
+ * Mock implementation of TreeCacheFactory for testing
+ */
+public class DefaultTreeCacheFactory extends org.infinispan.tree.TreeCacheFactory implements TreeCacheFactory
+{
+
+}


Property changes on: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DefaultTreeCacheFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java	2010-07-26 16:30:52 UTC (rev 107087)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java	2010-07-26 19:17:18 UTC (rev 107088)
@@ -44,7 +44,6 @@
 import org.infinispan.tree.Fqn;
 import org.infinispan.tree.Node;
 import org.infinispan.tree.TreeCache;
-import org.infinispan.tree.TreeCacheFactory;
 import org.jboss.ha.framework.server.InfinispanHAPartitionCacheHandler;
 import org.jboss.ha.jndi.spi.DistributedTreeManager;
 import org.jboss.logging.Logger;
@@ -69,10 +68,24 @@
    private static final String DEFAULT_ROOT = "__HA_JNDI__";
    private static final Fqn FQN_ROOT = Fqn.fromString(DEFAULT_ROOT);
 
-   private volatile TreeCache<String, Binding> m_cache;
+   protected volatile TreeCache<String, Binding> m_cache;
    private volatile InfinispanHAPartitionCacheHandler<String, Binding> cacheHandler;
    private final Naming haStub;
+   private volatile TreeCacheFactory treeCacheFactory;
 
+
+   public DistributedTreeManagerImpl(Naming haStub)
+   {
+      this.haStub = haStub;
+      treeCacheFactory = new DefaultTreeCacheFactory();
+   }
+
+   public  DistributedTreeManagerImpl(Naming haStub, TreeCacheFactory factory)
+   {
+      this.haStub = haStub;
+      this.treeCacheFactory = factory;
+   }
+
    public InfinispanHAPartitionCacheHandler<String, Binding> getCacheHandler()
    {
       return cacheHandler;
@@ -83,17 +96,9 @@
       this.cacheHandler = cacheHandler;
    }
 
-   public DistributedTreeManagerImpl(Naming haStub)
-   {
-      this.haStub = haStub;
-   }
-
-
    public void init()
    {
-      TreeCacheFactory tcf = new TreeCacheFactory();
-      m_cache = tcf.createTreeCache(cacheHandler.getCache());
-
+      m_cache = treeCacheFactory.createTreeCache(cacheHandler.getCache());
       LOG.debug("initializing HAJNDITreeCache root");
    }
 

Added: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/TreeCacheFactory.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/TreeCacheFactory.java	                        (rev 0)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/TreeCacheFactory.java	2010-07-26 19:17:18 UTC (rev 107088)
@@ -0,0 +1,9 @@
+package org.jboss.ha.jndi.impl;
+
+import org.infinispan.Cache;
+import org.infinispan.tree.TreeCache;
+
+
+public interface TreeCacheFactory {
+   <K, V> TreeCache<K, V> createTreeCache(Cache<K, V> cache);
+}


Property changes on: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/TreeCacheFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF