svn commit: r793833 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-search/pom.xml components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java pom.xml

Author: woonsan
Date: Tue Jul 14 09:59:18 2009
New Revision: 793833

URL: http://svn.apache.org/viewvc?rev=793833&view=rev
Log:
JS2-1043: Upgrading lucene core to 2.3.2.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml
    
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml?rev=793833&r1=793832&r2=793833&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml 
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/pom.xml Tue Jul 
14 09:59:18 2009
@@ -59,7 +59,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
         <dependency>
-            <groupId>lucene</groupId>
+            <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-core</artifactId>
         </dependency>
         <dependency>

Modified: 
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java?rev=793833&r1=793832&r2=793833&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
 (original)
+++ 
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
 Tue Jul 14 09:59:18 2009
@@ -27,10 +27,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.MultiHashMap;
 import org.apache.commons.collections.MultiMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.collections.map.MultiValueMap;
 import org.apache.jetspeed.search.BaseParsedObject;
 import org.apache.jetspeed.search.HandlerFactory;
 import org.apache.jetspeed.search.ObjectHandler;
@@ -50,10 +48,12 @@
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Searcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto: jford@xxxxxxxxxx">Jeremy Ford</a>
- *
+ * @version $Id$
  */
 public class SearchEngineImpl implements SearchEngine
 {
@@ -85,7 +85,8 @@
         {
             if (rootIndexDir.exists())
             {
-                log.error("Failed to open Portal Registry indexes in " + 
rootIndexDir.getPath(), e);
+                log.warn("Failed to open Portal Registry indexes in {}. {}", 
+                          rootIndexDir.getPath(), e);
             }
             try
             {
@@ -604,8 +605,8 @@
     {
         try
         {
-            MultiMap multiKeywords = new MultiHashMap();
-            MultiMap multiFields = new MultiHashMap();
+            MultiMap multiKeywords = new MultiValueMap();
+            MultiMap multiFields = new MultiValueMap();
             HashMap fieldMap = new HashMap();
             
             Field classNameField = 
doc.getField(ParsedObject.FIELDNAME_CLASSNAME);

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=793833&r1=793832&r2=793833&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Tue Jul 14 09:59:18 2009
@@ -281,7 +281,7 @@
     <jaxb-impl.version>2.1.9</jaxb-impl.version>
     <jdom.version>1.0</jdom.version>
     <log4j.version>1.2.14</log4j.version>
-    <lucene.version>2.0.0</lucene.version>
+    <lucene.version>2.3.2</lucene.version>
     <myfaces.version>1.1.5</myfaces.version>
     <ojb.version>1.0.3</ojb.version>
     <org.apache.derby.version>10.3.2.1</org.apache.derby.version>
@@ -774,7 +774,7 @@
       </dependency>
 
       <dependency>
-        <groupId>lucene</groupId>
+        <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-core</artifactId>
         <version>${lucene.version}</version>
       </dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@xxxxxxxxxxxxxxxxxx
For additional commands, e-mail: jetspeed-dev-help@xxxxxxxxxxxxxxxxxx