Index: components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
===================================================================
--- components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java	(revision 471386)
+++ components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java	(working copy)
@@ -157,36 +157,36 @@
 
             // Populate document from the parsed object
             if (parsedObject.getKey() != null)
-            {
-                doc.add(Field.Keyword(ParsedObject.FIELDNAME_KEY, parsedObject.getKey()));
+            {                
+                doc.add(new Field(ParsedObject.FIELDNAME_KEY, parsedObject.getKey(), Field.Store.YES, Field.Index.UN_TOKENIZED));
             }
             if (parsedObject.getType() != null)
             {
-                doc.add(Field.Text(ParsedObject.FIELDNAME_TYPE, parsedObject.getType()));
+                doc.add(new Field(ParsedObject.FIELDNAME_TYPE, parsedObject.getType(), Field.Store.YES, Field.Index.TOKENIZED));
             }
             if (parsedObject.getTitle() != null)
             {
-                doc.add(Field.Text(ParsedObject.FIELDNAME_TITLE, parsedObject.getTitle()));
+                doc.add(new Field(ParsedObject.FIELDNAME_TITLE, parsedObject.getTitle(), Field.Store.YES, Field.Index.TOKENIZED));
             }
             if (parsedObject.getDescription() != null)
             {
-                doc.add(Field.Text(ParsedObject.FIELDNAME_DESCRIPTION, parsedObject.getDescription()));
+                doc.add(new Field(ParsedObject.FIELDNAME_DESCRIPTION, parsedObject.getDescription(), Field.Store.YES, Field.Index.TOKENIZED));
             }
             if (parsedObject.getContent() != null)
             {
-                doc.add(Field.Text(ParsedObject.FIELDNAME_CONTENT, parsedObject.getContent()));
+                doc.add(new Field(ParsedObject.FIELDNAME_CONTENT, parsedObject.getContent(), Field.Store.YES, Field.Index.TOKENIZED));
             }
             if (parsedObject.getLanguage() != null)
             {
-                doc.add(Field.Text(ParsedObject.FIELDNAME_LANGUAGE, parsedObject.getLanguage()));   
+                doc.add(new Field(ParsedObject.FIELDNAME_LANGUAGE, parsedObject.getLanguage(), Field.Store.YES, Field.Index.TOKENIZED));
             }
             if (parsedObject.getURL() != null)
             {
-                doc.add(Field.Text(ParsedObject.FIELDNAME_URL, parsedObject.getURL().toString()));
+                doc.add(new Field(ParsedObject.FIELDNAME_URL, parsedObject.getURL().toString(), Field.Store.YES, Field.Index.TOKENIZED));
             }
             if(parsedObject.getClassName() != null)
             {
-                doc.add(Field.Text(ParsedObject.FIELDNAME_CLASSNAME, parsedObject.getClassName()));
+                doc.add(new Field(ParsedObject.FIELDNAME_CLASSNAME, parsedObject.getClassName(), Field.Store.YES, Field.Index.TOKENIZED));
             }
             
             String[] keywordArray = parsedObject.getKeywords();
@@ -195,7 +195,7 @@
             	for(int i=0; i<keywordArray.length; ++i)
             	{
             		String keyword = keywordArray[i];
-            		doc.add(Field.Keyword(ParsedObject.FIELDNAME_KEYWORDS, keyword));
+            		doc.add(new Field(ParsedObject.FIELDNAME_KEYWORDS, keyword, Field.Store.YES, Field.Index.UN_TOKENIZED));
             	}
             }
 
@@ -284,7 +284,7 @@
                 {
                     term = new Term(ParsedObject.FIELDNAME_KEY, parsedObject.getKey());
                     // Remove the document from search index
-                    int rc = indexReader.delete(term);
+                    int rc = indexReader.deleteDocuments(term);
                     //logger.info("Attempted to delete '" + term.toString() + "' from index, documents deleted = " + rc);
                     //System.out.println("Attempted to delete '" + term.toString() + "' from index, documents deleted = " + rc);
                     result = rc > 0;
@@ -403,7 +403,10 @@
         Query query= null;
         try
         {
-            query = MultiFieldQueryParser.parse(queryString, searchFields, analyzer);
+        	String s[] = new String[searchFields.length];
+        	for(int i=0;i<s.length;i++)
+        		s[i] = queryString;
+            query = MultiFieldQueryParser.parse(s, searchFields, analyzer);
 //          Query query = QueryParser.parse(searchString, ParsedObject.FIELDNAME_CONTENT, analyzer);
         }
         catch (ParseException e)
@@ -567,11 +570,11 @@
                                 {
                                     if(type == TEXT)
                                     {
-                                        doc.add(Field.Text(key.toString(), value.toString()));
+                                        doc.add(new Field(key.toString(), value.toString(), Field.Store.YES, Field.Index.UN_TOKENIZED));
                                     }
                                     else
                                     {
-                                        doc.add(Field.Keyword(key.toString(), value.toString()));
+                                        doc.add(new Field(key.toString(), value.toString(), Field.Store.YES, Field.Index.UN_TOKENIZED));
                                     }
                                 }
                             }
@@ -580,11 +583,11 @@
                         {
                             if(type == TEXT)
                             {
-                                doc.add(Field.Text(key.toString(), values.toString()));
+                                doc.add(new Field(key.toString(), values.toString(), Field.Store.YES, Field.Index.UN_TOKENIZED));
                             }
                             else
                             {
-                                doc.add(Field.Keyword(key.toString(), values.toString()));
+                                doc.add(new Field(key.toString(), values.toString(), Field.Store.YES, Field.Index.UN_TOKENIZED));
                             }
                         }
                     }

Index: core-build.xml
===================================================================
--- core-build.xml	(revision 464467)
+++ core-build.xml	(working copy)
@@ -99,7 +99,7 @@
 		<!-- jakarta commons and other misc. jakarta projects -->
 		<dependency>
 			<id>lucene</id>
-			<version>1.4.1</version>
+			<version>2.0.0</version>
 			<properties>
 	          <war.bundle>true</war.bundle>
 	        </properties>
Index: pom.xml
===================================================================
--- pom.xml	(revision 464467)
+++ pom.xml	(working copy)
@@ -171,7 +171,7 @@
         <jaxen.version>1.0-FCS-full</jaxen.version>
         <jdom.version>1.0</jdom.version>
         <log4j.version>1.2.8</log4j.version>
-        <lucene.version>1.4.1</lucene.version>
+        <lucene.version>2.0.0</lucene.version>
         <myfaces.version>1.1.0</myfaces.version>
         <nekohtml.version>0.9.5</nekohtml.version>
         <ojb.version>1.0.3</ojb.version>