[infinispan-commits] Infinispan SVN: r2486 - in branches/4.2.x/demos/lucene-directory-demo/src: test/java/org/infinispan/lucenedemo and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-10-04 13:13:35 -0400 (Mon, 04 Oct 2010)
New Revision: 2486

Modified:
   branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java
   branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java
   branches/4.2.x/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java
Log:
[ISPN-616] (Have the Lucene directory use specialized caches for different purposes) - fix Lucene demo

Modified: branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java
===================================================================
--- branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java	2010-10-04 17:05:17 UTC (rev 2485)
+++ branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoActions.java	2010-10-04 17:13:35 UTC (rev 2486)
@@ -42,6 +42,7 @@
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.util.Version;
+import org.infinispan.Cache;
 import org.infinispan.lucene.InfinispanDirectory;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.remoting.transport.Address;
@@ -62,9 +63,12 @@
    private static final Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_29);
 
    private InfinispanDirectory index;
+
+   private final Cache cache;
    
-   public DemoActions(InfinispanDirectory index) {
+   public DemoActions(InfinispanDirectory index, Cache cache) {
       this.index = index;
+      this.cache = cache;
    }
 
    /**
@@ -131,7 +135,7 @@
     * Returns a list of Addresses of all members in the cluster 
     */
    public List<Address> listAllMembers() {
-      EmbeddedCacheManager cacheManager = (EmbeddedCacheManager) index.getCache().getCacheManager();
+      EmbeddedCacheManager cacheManager = (EmbeddedCacheManager) cache.getCacheManager();
       return cacheManager.getMembers();
    }
 

Modified: branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java
===================================================================
--- branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java	2010-10-04 17:05:17 UTC (rev 2485)
+++ branches/4.2.x/demos/lucene-directory-demo/src/main/java/org/infinispan/lucenedemo/DemoDriver.java	2010-10-04 17:13:35 UTC (rev 2486)
@@ -44,8 +44,8 @@
    
    private final DemoActions actions;
 
-   public DemoDriver(InfinispanDirectory infinispanDirectory) {
-      actions = new DemoActions(infinispanDirectory);
+   public DemoDriver(InfinispanDirectory infinispanDirectory, Cache cache) {
+      actions = new DemoActions(infinispanDirectory, cache);
    }
 
    public static void main(String[] args) throws IOException {
@@ -54,7 +54,7 @@
       try {
          Cache cache = cacheManager.getCache();
          InfinispanDirectory directory = new InfinispanDirectory(cache);
-         DemoDriver driver = new DemoDriver(directory);
+         DemoDriver driver = new DemoDriver(directory, cache);
          driver.run();
       }
       finally {

Modified: branches/4.2.x/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java
===================================================================
--- branches/4.2.x/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java	2010-10-04 17:05:17 UTC (rev 2485)
+++ branches/4.2.x/demos/lucene-directory-demo/src/test/java/org/infinispan/lucenedemo/CacheConfigurationTest.java	2010-10-04 17:13:35 UTC (rev 2486)
@@ -46,17 +46,19 @@
    private DefaultCacheManager cacheManager2;
    private InfinispanDirectory directoryNodeOne;
    private InfinispanDirectory directoryNodeTwo;
+   private Cache cache1;
+   private Cache cache2;
 
    @BeforeClass
    public void init() throws IOException {
       cacheManager1 = new DefaultCacheManager("config-samples/lucene-demo-cache-config.xml");
       cacheManager1.start();
-      Cache cache1 = cacheManager1.getCache();
+      cache1 = cacheManager1.getCache();
       cache1.clear();
       directoryNodeOne = new InfinispanDirectory(cache1);
       cacheManager2 = new DefaultCacheManager("config-samples/lucene-demo-cache-config.xml");
       cacheManager2.start();
-      Cache cache2 = cacheManager2.getCache();
+      cache2 = cacheManager2.getCache();
       cache2.clear();
       directoryNodeTwo = new InfinispanDirectory(cache2);
    }
@@ -71,8 +73,8 @@
 
    @Test
    public void inserting() throws IOException, ParseException {
-      DemoActions node1 = new DemoActions(directoryNodeOne);
-      DemoActions node2 = new DemoActions(directoryNodeTwo);
+      DemoActions node1 = new DemoActions(directoryNodeOne, cache1);
+      DemoActions node2 = new DemoActions(directoryNodeTwo, cache2);
       node1.addNewDocument("hello?");
       assert node1.listAllDocuments().size() == 1;
       node1.addNewDocument("anybody there?");