[jspwiki] 04/04: Build with the liblucene2-java package

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jspwiki.

commit a03aeef7bb8c6316d828fd22fef38cce1eb43640
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 27 12:39:11 2015 +0100

    Build with the liblucene2-java package
---
 debian/changelog                             |  4 ++--
 debian/patches/05_lucene_compatibility.patch | 18 ++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef436f0..f5b2a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,8 @@ jspwiki (2.8.0-6) UNRELEASED; urgency=medium
   * Build with the default JDK instead of GCJ and removed the dependency
     on libgnujaf-java
   * Fixed the broken links to jstl.jar and standard.jar
-  * Use the Debian packages providing ecs, commons-logging, jabsorb and nekohtml
-    instead of the prebuilt jars in the source package
+  * Use the Debian packages providing ecs, commons-logging, jabsorb, lucene2
+    and nekohtml instead of the prebuilt jars in the source package
   * Don't mark the symlink /etc/tomcat8/policy.d/05jspwiki.policy as a conffile
   * Compress the JavaScript files with the YUI compressor packaged in Debian
   * Switch to the source format 3.0 (quilt)
diff --git a/debian/patches/05_lucene_compatibility.patch b/debian/patches/05_lucene_compatibility.patch
new file mode 100644
index 0000000..4042837
--- /dev/null
+++ b/debian/patches/05_lucene_compatibility.patch
@@ -0,0 +1,18 @@
+Description: Fixes a compatibility issue with the version of Lucene 2 in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
++++ b/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
+@@ -650,6 +650,12 @@
+ 
+             throw new ProviderException("You have entered a query Lucene cannot process: "+e.getMessage());
+         }
++        catch( org.apache.lucene.search.highlight.InvalidTokenOffsetsException e )
++        {
++            log.info("Broken query; cannot parse",e);
++
++            throw new ProviderException("You have entered a query Lucene cannot process: "+e.getMessage());
++        }
+         finally
+         {
+             if( searcher != null )
diff --git a/debian/patches/series b/debian/patches/series
index 64b43bd..d7cb5b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_ignore_binary_jars.dpatch
 03_weblog-plugin_tweaks.patch
 04_use_debian_yuicompressor.patch
+05_lucene_compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jspwiki.git