openutils-svn

[Openutils-svn] SF.net SVN: openutils:[4116] magnoliamodules/branches/magnolia44/ openutils-mgnltagcloud

[<fg...@us...>]

Revision: 4116
          http://openutils.svn.sourceforge.net/openutils/?rev=4116&view=rev
Author:   fgiust
Date:     2012-10-05 15:37:55 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
upgrade to lucene 3

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2012-10-05 15:37:55 UTC (rev 4116)
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>com.browseengine.bobo</groupId>
       <artifactId>bobo-browse</artifactId>
-      <version>2.0.7</version>
+      <version>2.5.1</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -172,6 +172,6 @@
   </dependencies>
   <properties>
     <magnolia.version>4.4.2</magnolia.version>
-    <jackrabbit.version>2.2.5</jackrabbit.version>
+    <jackrabbit.version>2.4.0</jackrabbit.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2012-10-05 15:37:55 UTC (rev 4116)
@@ -48,10 +48,11 @@
      */
     protected HierarchyBoboIndexReader(
         IndexReader indexReader,
-        Collection<FacetHandler> facetHandlers,
+        Collection<FacetHandler< ? >> facetHandlers,
         WorkArea workArea) throws IOException
     {
-        super(indexReader, facetHandlers, workArea);
+        super(indexReader, facetHandlers, null, workArea);
+
         resolver = (HierarchyResolver) indexReader;
     }
 
@@ -62,7 +63,7 @@
      * @return wrapped Bobo index reader instance
      * @throws IOException i/o exception reading indexes
      */
-    public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers)
+    public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
         throws IOException
     {
 

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2012-10-05 15:37:55 UTC (rev 4116)
@@ -186,7 +186,7 @@
 
             // configure bobo for faceted search
             MultiValueFacetHandler tagsHandler = new MultiValueFacetHandler(propertyName);
-            List<FacetHandler> handlerList = Arrays.asList(new FacetHandler[]{tagsHandler });
+            List<FacetHandler<?>> handlerList = Arrays.asList(new FacetHandler<?>[]{tagsHandler });
             BoboIndexReader boboReader = HierarchyBoboIndexReader.getInstance(ir, handlerList);
 
             // get query

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml	2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml	2012-10-05 15:37:55 UTC (rev 4116)
@@ -31,7 +31,6 @@
       <param name="cacheSize" value="1000" />
       <param name="forceConsistencyCheck" value="false" />
       <param name="autoRepair" value="true" />
-      <param name="analyzer" value="org.apache.lucene.analysis.standard.StandardAnalyzer" />
       <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
       <param name="respectDocumentOrder" value="true" />
       <param name="resultFetchSize" value="2147483647" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[4208] magnoliamodules/branches/magnolia44/ openutils-mgnltagcloud

[<fg...@us...>]

Revision: 4208
          http://openutils.svn.sourceforge.net/openutils/?rev=4208&view=rev
Author:   fgiust
Date:     2013-04-02 21:03:01 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
TAGCLOUD-18 jackrabbit 2.4 compatibility

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-04-02 21:03:01 UTC (rev 4208)
@@ -171,7 +171,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.2</magnolia.version>
-    <jackrabbit.version>2.4.0</jackrabbit.version>
+    <magnolia.version>4.4.9-jr24</magnolia.version>
+    <jackrabbit.version>2.4.1</jackrabbit.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -51,8 +51,7 @@
         Collection<FacetHandler< ? >> facetHandlers,
         WorkArea workArea) throws IOException
     {
-        super(indexReader, facetHandlers, null, workArea);
-
+        super(indexReader, facetHandlers, null, workArea, false);
         resolver = (HierarchyResolver) indexReader;
     }
 

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -49,8 +49,9 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Query;
 
-import com.browseengine.bobo.api.BoboBrowser;
 import com.browseengine.bobo.api.BoboIndexReader;
+import com.browseengine.bobo.api.BoboSubBrowser;
+import com.browseengine.bobo.api.Browsable;
 import com.browseengine.bobo.api.BrowseException;
 import com.browseengine.bobo.api.BrowseFacet;
 import com.browseengine.bobo.api.BrowseRequest;
@@ -209,23 +210,31 @@
 
             br.setFacetSpec(propertyName, tagsSpec);
 
-            BoboBrowser browser = new BoboBrowser(boboReader);
+            Browsable browser = new BoboSubBrowser(boboReader);
+            try
+            {
 
-            // perform browse
-            BrowseResult result = browser.browse(br);
+                // perform browse
+                BrowseResult result = browser.browse(br);
 
-            // get tags
-            Map<String, FacetAccessible> facetMap = result.getFacetMap();
+                // get tags
+                Map<String, FacetAccessible> facetMap = result.getFacetMap();
 
-            FacetAccessible tagsFacets = facetMap.get(propertyName);
-            List<BrowseFacet> tagsVals = tagsFacets.getFacets();
+                FacetAccessible tagsFacets = facetMap.get(propertyName);
+                List<BrowseFacet> tagsVals = tagsFacets.getFacets();
 
-            // store them in tagCloud itself
-            tagCloud.setTags(new HashMap<String, Integer>());
-            for (BrowseFacet bf : tagsVals)
+                // store them in tagCloud itself
+                tagCloud.setTags(new HashMap<String, Integer>());
+                for (BrowseFacet bf : tagsVals)
+                {
+                    tagCloud.getTags().put(bf.getValue(), bf.getHitCount());
+                }
+            }
+            finally
             {
-                tagCloud.getTags().put(bf.getValue(), bf.getHitCount());
+                browser.close();
             }
+            
 
         }
         catch (RepositoryException ex)

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -124,7 +124,7 @@
         log.debug("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag2"));
         time = System.currentTimeMillis();
-        tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 1);
+        tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 2);
         log.debug("Time: " + (System.currentTimeMillis() - time));
         log.debug("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag1 tag4"));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.