[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.