[jboss-cvs] JBossAS SVN: r107715 - in branches/infinispan-int/testsuite/src/main/org/jboss/test: cluster/clusteredentity/classloader and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 20 10:51:02 EDT 2010


Author: smarlow at redhat.com
Date: 2010-08-20 10:51:02 -0400 (Fri, 20 Aug 2010)
New Revision: 107715

Modified:
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/EntityTestBean.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/classloader/EntityQueryTestBean.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/MultipleWarSingleRedeployTestCase.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockDistributedCacheManager.java
   branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
Log:
help get the testsuite compiling

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/EntityTestBean.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/EntityTestBean.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/EntityTestBean.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -32,14 +32,14 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.jboss.cache.Cache;
-import org.jboss.cache.CacheManager;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.notifications.annotation.CacheListener;
-import org.jboss.cache.notifications.annotation.NodeVisited;
-import org.jboss.cache.notifications.event.NodeVisitedEvent;
+import org.infinispan.Cache;
+import org.infinispan.manager.CacheContainer;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
+import org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent;
+import org.infinispan.tree.Fqn;
 import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ha.framework.server.CacheManagerLocator;
+import org.jboss.ha.ispn.CacheContainerRegistry;
+import org.jboss.ha.ispn.DefaultCacheContainerRegistry;
 import org.jboss.logging.Logger;
 
 /**
@@ -76,15 +76,16 @@
       {
          if (cache == null && cacheConfigName != null)
          {
-            CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
-            cache = cm.getCache(cacheConfigName, true);
+            CacheContainerRegistry cr = DefaultCacheContainerRegistry.getInstance();
+            CacheContainer cc = cr.getCacheContainer("entity");
+            cache = cc.getCache(cacheConfigName);
             cache.start();
          }
          
          if (listener == null)
          {
             listener = new MyListener();
-            cache.addCacheListener(listener);
+            cache.addListener(listener);
          }
       }
       catch (Exception e)
@@ -193,7 +194,7 @@
       {         
          if (cache != null && listener != null)
          {
-            cache.removeCacheListener(listener);
+            cache.removeListener(listener);
          }
       }
       catch (Exception e)
@@ -224,15 +225,14 @@
       try
       {
          if (cache != null)
-            CacheManagerLocator.getCacheManagerLocator().getCacheManager(null).releaseCache(cacheConfigName);
+            cache.stop();
       }
       catch (Exception e)
       {
          log.error("Caught exception releasing cache", e);
       }
    }
-
-   @CacheListener
+// TODO:  change the below listening code into something that works for Infinispan
    public class MyListener
    {
       HashSet<String> visited = new HashSet<String>(); 
@@ -242,23 +242,23 @@
          visited.clear();
       }
       
-      @NodeVisited
-      public void nodeVisited(NodeVisitedEvent event)
+      @CacheEntryVisited
+      public void nodeVisited(CacheEntryVisitedEvent event)
       {
          if (!event.isPre())
          {
-            Fqn fqn = event.getFqn();
-            System.out.println("MyListener - Visiting node " + fqn.toString());
-            String name = fqn.toString();
-            String token = ".clusteredentity.";
-            int index = name.indexOf(token);
-            if (index > -1)
-            {
-               index += token.length();
-               name = name.substring(index);
-               System.out.println("MyListener - recording visit to " + name);
-               visited.add(name);
-            }
+//            Fqn fqn = event.getFqn();
+//            System.out.println("MyListener - Visiting node " + fqn.toString());
+//            String name = fqn.toString();
+//            String token = ".clusteredentity.";
+//            int index = name.indexOf(token);
+//            if (index > -1)
+//            {
+//               index += token.length();
+//               name = name.substring(index);
+//               System.out.println("MyListener - recording visit to " + name);
+//               visited.add(name);
+//            }
          }
       }
    }

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/classloader/EntityQueryTestBean.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/classloader/EntityQueryTestBean.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/clusteredentity/classloader/EntityQueryTestBean.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -34,18 +34,17 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import org.jboss.cache.Cache;
-import org.jboss.cache.CacheManager;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.notifications.annotation.CacheListener;
-import org.jboss.cache.notifications.annotation.NodeCreated;
-import org.jboss.cache.notifications.annotation.NodeModified;
-import org.jboss.cache.notifications.annotation.NodeVisited;
-import org.jboss.cache.notifications.event.NodeCreatedEvent;
-import org.jboss.cache.notifications.event.NodeModifiedEvent;
-import org.jboss.cache.notifications.event.NodeVisitedEvent;
+import org.infinispan.Cache;
+import org.infinispan.manager.CacheContainer;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
+import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent;
+import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent;
+import org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent;
 import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ha.framework.server.CacheManagerLocator;
+import org.jboss.ha.ispn.CacheContainerRegistry;
+import org.jboss.ha.ispn.DefaultCacheContainerRegistry;
 import org.jboss.logging.Logger;
 
 /**
@@ -86,7 +85,7 @@
          //Just to initialise the cache with a listener
          Cache<Object, Object> cache = getCache();
          listener = new MyListener();
-         cache.addCacheListener(listener);         
+         cache.addListener(listener);
       }
       catch (Exception e)
       {
@@ -222,29 +221,31 @@
    
    public boolean getSawRegionModification(String regionName)
    {
-      return getSawRegion(regionName, listener.modified);
+//      return getSawRegion(regionName, listener.modified);
+      return false;
    }
    
    public boolean getSawRegionAccess(String regionName)
    {
-      return getSawRegion(regionName, listener.accessed);
+//      return getSawRegion(regionName, listener.accessed);
+      return false;
    }
    
-   private boolean getSawRegion(String regionName, Set<Fqn<String>> sawEvent)
-   {
-      boolean saw = false;      
-      for (Iterator<Fqn<String>> it = sawEvent.iterator(); it.hasNext();)
-      {
-         Fqn<String> modified = (Fqn<String>) it.next();
-         if (modified.toString().indexOf(regionName) > -1)
-         {
-            it.remove();
-            saw = true;
-         }
-      }
-      return saw;
-      
-   }
+//   private boolean getSawRegion(String regionName, Set<Fqn<String>> sawEvent)
+//   {
+//      boolean saw = false;
+//      for (Iterator<Fqn<String>> it = sawEvent.iterator(); it.hasNext();)
+//      {
+//         Fqn<String> modified = (Fqn<String>) it.next();
+//         if (modified.toString().indexOf(regionName) > -1)
+//         {
+//            it.remove();
+//            saw = true;
+//         }
+//      }
+//      return saw;
+//
+//   }
    
    public void cleanup()
    {
@@ -292,7 +293,7 @@
       try
       {
          listener.clear();
-         getCache().removeCacheListener(listener);         
+         getCache().removeListener(listener);
       }
       catch (Exception e)
       {
@@ -302,7 +303,7 @@
       try
       {
          if (cache != null)
-            CacheManagerLocator.getCacheManagerLocator().getCacheManager(null).releaseCache(cacheConfigName);
+            cache.stop();
       }
       catch (Exception e)
       {
@@ -314,55 +315,56 @@
    {
       if (cache == null && cacheConfigName != null)
       {
-         CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
-         cache = cm.getCache(cacheConfigName, true);
+         CacheContainerRegistry cr = DefaultCacheContainerRegistry.getInstance();
+         CacheContainer cc = cr.getCacheContainer("entity");
+         cache = cc.getCache(cacheConfigName);
          cache.start();
+
       }
       return cache;
    }
-
-   @CacheListener
+// TODO:  the below listener code is commented out, replace it with something that works with our use of Infinispan
    public class MyListener
    {
-      HashSet<Fqn<String>> modified = new HashSet<Fqn<String>>(); 
-      HashSet<Fqn<String>> accessed = new HashSet<Fqn<String>>();
+//      HashSet<Fqn<String>> modified = new HashSet<Fqn<String>>();
+//      HashSet<Fqn<String>> accessed = new HashSet<Fqn<String>>();
       
       public void clear()
       {
-         modified.clear();
-         accessed.clear();
+//         modified.clear();
+//         accessed.clear();
       }
       
-      @NodeModified
-      public void nodeModified(NodeModifiedEvent event)
+      @CacheEntryModified
+      public void nodeModified(CacheEntryModifiedEvent event)
       {
          if (!event.isPre())
          {
-            Fqn<String> fqn = event.getFqn();
-            System.out.println("MyListener - Modified node " + fqn.toString());
-            modified.add(fqn);
+//            Fqn<String> fqn = event.getFqn();
+//            System.out.println("MyListener - Modified node " + fqn.toString());
+//            modified.add(fqn);
          }
       }
 
-      @NodeCreated
-      public void nodeCreated(NodeCreatedEvent event)
+      @CacheEntryCreated
+      public void nodeCreated(CacheEntryCreatedEvent event)
       {   
          if (!event.isPre())
          {
-            Fqn<String> fqn = event.getFqn();
-            System.out.println("MyListener - Created node " + fqn.toString());
-            modified.add(fqn);
+//            Fqn<String> fqn = event.getFqn();
+//            System.out.println("MyListener - Created node " + fqn.toString());
+//            modified.add(fqn);
          }
       }   
 
-      @NodeVisited
-      public void nodeVisited(NodeVisitedEvent event)
+      @CacheEntryVisited
+      public void nodeVisited(CacheEntryVisitedEvent event)
       {   
          if (!event.isPre())
          {
-            Fqn<String> fqn = event.getFqn();
-            System.out.println("MyListener - Visited node " + fqn.toString());
-            accessed.add(fqn); 
+//            Fqn<String> fqn = event.getFqn();
+//            System.out.println("MyListener - Visited node " + fqn.toString());
+//            accessed.add(fqn);
          }
       }    
       

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ClusteredSessionNotificationPolicyTestCase.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -33,7 +33,6 @@
 import junit.framework.Test;
 
 import org.apache.catalina.Context;
-import org.jboss.cache.pojo.PojoCache;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.jboss.ReplicationGranularity;

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/MultipleWarSingleRedeployTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/MultipleWarSingleRedeployTestCase.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/MultipleWarSingleRedeployTestCase.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -30,7 +30,6 @@
 
 import junit.framework.Test;
 
-import org.jboss.cache.pojo.PojoCache;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.jboss.ReplicationGranularity;

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreMemoryLeakTestCase.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -34,7 +34,6 @@
 import junit.framework.Test;
 
 import org.apache.catalina.Session;
-import org.jboss.cache.pojo.PojoCache;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.ReplicationGranularity;
 import org.jboss.metadata.web.jboss.ReplicationTrigger;
@@ -57,7 +56,8 @@
  */
 public class PersistentStoreMemoryLeakTestCase extends JBossTestCase
 {
-   protected static PojoCache[] pojoCaches = new PojoCache[2];
+// TODO:  remove the following after eliminating the need for it.
+//   protected static PojoCache[] pojoCaches = new PojoCache[2];
 
    protected static long testId = System.currentTimeMillis();
    

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -28,8 +28,6 @@
 import junit.framework.TestCase;
 
 import org.apache.catalina.Session;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.pojo.PojoCache;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.test.cluster.testutil.JGroupsSystemPropertySupport;

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -29,8 +29,6 @@
 
 import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.pojo.PojoCache;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.test.cluster.testutil.SessionTestUtil;

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -28,13 +28,10 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.cache.Cache;
-import org.jboss.cache.CacheManager;
-import org.jboss.cache.CacheStatus;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.Node;
-import org.jboss.cache.buddyreplication.BuddyManager;
-import org.jboss.ha.framework.server.CacheManagerLocator;
+import org.infinispan.Cache;
+import org.infinispan.manager.CacheContainer;
+import org.jboss.ha.ispn.CacheContainerRegistry;
+import org.jboss.ha.ispn.DefaultCacheContainerRegistry;
 import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.system.ServiceMBeanSupport;
 
@@ -73,8 +70,14 @@
    {
       try
       {
-         CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
-         return cm.getCache(cacheConfig, true);
+//         CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
+//         return cm.getCache(cacheConfig, true);
+         CacheContainerRegistry cr = DefaultCacheContainerRegistry.getInstance();
+         CacheContainer cc = cr.getCacheContainer("entity");
+         Cache cache = cc.getCache(cacheConfigName);
+         cache.start();
+         return cache;
+
       }
       catch (RuntimeException re)
       {

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockDistributedCacheManager.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockDistributedCacheManager.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockDistributedCacheManager.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -30,6 +30,7 @@
 import org.jboss.web.tomcat.service.session.distributedcache.spi.DistributedCacheManager;
 import org.jboss.web.tomcat.service.session.distributedcache.spi.IncomingDistributableSessionData;
 import org.jboss.web.tomcat.service.session.distributedcache.spi.OutgoingDistributableSessionData;
+import org.jboss.web.tomcat.service.session.distributedcache.spi.SessionOwnershipSupport;
 
 /**
  * @author Brian Stansberry
@@ -167,6 +168,14 @@
       // no-op
    }
 
+   public SessionOwnershipSupport getSessionOwnershipSupport() {
+      return null;
+   }
+
+   public boolean isLocal(String realId) {
+      return false;  
+   }
+
    private static class MockBatchingManager implements BatchingManager
    {
       private static final MockBatchingManager INSTANCE = new MockBatchingManager();

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java	2010-08-20 14:15:19 UTC (rev 107714)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java	2010-08-20 14:51:02 UTC (rev 107715)
@@ -150,7 +150,8 @@
       Set<BaseNamedElement> config = new HashSet<BaseNamedElement>();
       config.add(createBaseNamedElement(Environment.TRANSACTION_MANAGER_STRATEGY, TransactionManagerLookupImpl.class.getName()));
       config.add(createBaseNamedElement(Environment.USER_TRANSACTION, JTATransactionFactory.DEFAULT_USER_TRANSACTION_NAME));
-      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
+// TODO:  probably need to do more than just comment out the following line
+//      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
       testee.setConfigurationElements(config);
       
       testee.start();
@@ -197,9 +198,10 @@
       config.add(createBaseNamedElement(Environment.PASS, "Brian"));
       config.add(createBaseNamedElement(Environment.USE_STREAMS_FOR_BINARY, Boolean.TRUE));
       config.add(createBaseNamedElement(Environment.USE_REFLECTION_OPTIMIZER, Boolean.TRUE));
-      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, "java:/test/Cache"));
-      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, "java:/test/CacheManager"));
-      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
+// TODO:  probably need to do more than just comment out the following
+//      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, "java:/test/Cache"));
+//      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, "java:/test/CacheManager"));
+//      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
       
       testee.setConfigurationElements(config);
       testee.start();
@@ -249,7 +251,8 @@
       config.add(createBaseNamedElement("reflectionOptimizationEnabled", Boolean.TRUE));
       config.add(createBaseNamedElement("deployedCacheJndiName", "java:/test/Cache"));
       config.add(createBaseNamedElement("deployedCacheManagerJndiName", "java:/test/CacheManager"));
-      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
+// TODO:  probably need to do more than just comment out the following
+//      config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
       
       testee.setConfigurationElements(config);
       testee.start();
@@ -308,9 +311,10 @@
       assertEquals("Brian", props.getProperty(Environment.PASS));
       assertEquals("true", props.getProperty(Environment.USE_STREAMS_FOR_BINARY));
       assertEquals("true", props.getProperty(Environment.USE_REFLECTION_OPTIMIZER));
-      assertEquals("java:/test/Cache", props.getProperty(org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP));
-      assertEquals("java:/test/CacheManager", props.getProperty(org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP));
-      assertEquals("entities-test", props.getProperty(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP));
+// TODO:  probably need to do more than just comment out the following
+//      assertEquals("java:/test/Cache", props.getProperty(org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP));
+//      assertEquals("java:/test/CacheManager", props.getProperty(org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP));
+//      assertEquals("entities-test", props.getProperty(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP));
    }
    
    private static BaseNamedElement createBaseNamedElement(String name, Object value)



More information about the jboss-cvs-commits mailing list