You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/31 03:11:35 UTC
svn commit: r1508699 - in /jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/ jspwiki-war/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/search/
Author: gmazza
Date: Wed Jul 31 01:11:35 2013
New Revision: 1508699
URL: http://svn.apache.org/r1508699
Log:
Upgrade Lucene from 3.6 to 4.4 (JSPWIKI-791)
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
jspwiki/trunk/jspwiki-war/pom.xml
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1508699&r1=1508698&r2=1508699&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Wed Jul 31 01:11:35 2013
@@ -1,3 +1,10 @@
+2013-07-28 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-24
+
+ * JSPWIKI-791: Upgrade Lucene from 3.6.0 to 4.4.0
+
+
2013-07-28 Harry Metske (metskem@apache.org)
* 2.10.0-svn-23
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1508699&r1=1508698&r2=1508699&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Wed Jul 31 01:11:35 2013
@@ -1,5 +1,23 @@
Title: Changelog
+#### 2013-07-28 Harry Metske (metskem@apache.org)
+
+* 2.10.0-svn-23
+
+* fixed [JSPWIKI 784][JIRA-784] UTF-8 chars not correctly rendered if served by JBoss
+ (JBoss now also uses response.getOutputStream)
+
+#### 2013-07-19 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-22
+
+* Updated some dependencies and plugins based on results from mvn versions:display-[plugin|dependency]-updates (see base pom.xml)
+
+* Various Sonar fixes (if cases without braces, trailing-line comments, etc.)
+
+* Moved filter file (back) from jspwiki-war/src/test/filters to src/main/filters as I
+ realized filtering is used in the webapp/WEB-INF folder in the main branch.
+
#### 2013-07-18 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-21
@@ -1010,6 +1028,7 @@ and propagated the change to all plugins
* 2.9.0-svn-1
* release bump because of package rename
+ [JIRA-784]: https://issues.apache.org/jira/browse/JSPWIKI-784
[JIRA-772]: https://issues.apache.org/jira/browse/JSPWIKI-772
[JIRA-303]: https://issues.apache.org/jira/browse/JSPWIKI-303
[JIRA-780]: https://issues.apache.org/jira/browse/JSPWIKI-780
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1508699&r1=1508698&r2=1508699&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Wed Jul 31 01:11:35 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-21
\ No newline at end of file
+JSPWiki v2.10.0-svn-23
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1508699&r1=1508698&r2=1508699&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Wed Jul 31 01:11:35 2013
@@ -37,7 +37,12 @@
<groupId>xmlrpc</groupId>
<artifactId>xmlrpc</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1508699&r1=1508698&r2=1508699&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Wed Jul 31 01:11:35 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "23";
+ public static final String BUILD = "24";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=1508699&r1=1508698&r2=1508699&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java Wed Jul 31 01:11:35 2013
@@ -30,11 +30,18 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.queryParser.MultiFieldQueryParser;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.*;
-import org.apache.lucene.search.highlight.*;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.highlight.Highlighter;
+import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
+import org.apache.lucene.search.highlight.QueryScorer;
+import org.apache.lucene.search.highlight.SimpleHTMLEncoder;
+import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.SimpleFSDirectory;
@@ -592,7 +599,7 @@ public class LuceneSearchProvider implem
try
{
String[] queryfields = { LUCENE_PAGE_CONTENTS, LUCENE_PAGE_NAME, LUCENE_AUTHOR, LUCENE_ATTACHMENTS };
- QueryParser qp = new MultiFieldQueryParser(Version.LUCENE_36, queryfields, getLuceneAnalyzer() );
+ QueryParser qp = new MultiFieldQueryParser(Version.LUCENE_44, queryfields, getLuceneAnalyzer() );
//QueryParser qp = new QueryParser( LUCENE_PAGE_CONTENTS, getLuceneAnalyzer() );
Query luceneQuery = qp.parse( query );
@@ -608,7 +615,7 @@ public class LuceneSearchProvider implem
{
File dir = new File(m_luceneDirectory);
Directory luceneDir = new SimpleFSDirectory(dir, null);
- IndexReader reader = IndexReader.open( luceneDir);
+ IndexReader reader = DirectoryReader.open(luceneDir);
searcher = new IndexSearcher(reader);
}
catch( Exception ex )
@@ -680,7 +687,7 @@ public class LuceneSearchProvider implem
{
try
{
- searcher.close();
+ searcher.getIndexReader().close();
}
catch( IOException e )
{
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1508699&r1=1508698&r2=1508699&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Wed Jul 31 01:11:35 2013
@@ -38,6 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jdk.version>1.6</jdk.version>
+ <lucene.version>4.4.0</lucene.version>
</properties>
<prerequisites>
@@ -145,8 +146,14 @@
<dependency>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
- <version>3.6.0</version>
+ <version>${lucene.version}</version>
</dependency>
<dependency>