port to 4.10.1. Fixes for #5 and #6. Tested with solr 4.10.1 based in…

…dices.
DmitryKey · Oct 7, 2014 · ee1cab5 · ee1cab5
1 parent 3e30beb
commit ee1cab5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lucene.version>4.10.0</lucene.version>
+        <lucene.version>4.10.1</lucene.version>
         <ehcache.version>2.6.2</ehcache.version>
         <hadoop.version>0.20.2</hadoop.version>
         <log4j.version>1.2.17</log4j.version>

diff --git a/src/main/java/org/getopt/luke/BrowserLauncher.java b/src/main/java/org/getopt/luke/BrowserLauncher.java
@@ -1,7 +1,6 @@
 package org.getopt.luke;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -201,8 +200,14 @@ public class BrowserLauncher {
 		loadedWithoutErrors = true;
 		String osName = System.getProperty("os.name");
 		if (osName.startsWith("Mac OS")) {
+
 			String mrjVersion = System.getProperty("mrj.version");
-			String majorMRJVersion = mrjVersion.substring(0, 3);
+            String majorMRJVersion;
+            if (mrjVersion != null) {
+			    majorMRJVersion = mrjVersion.substring(0, 3);
+            } else {
+                majorMRJVersion = System.getProperty("os.version").substring(0, 3);
+            }
 			try {
 				double version = Double.valueOf(majorMRJVersion).doubleValue();
 				if (version == 2) {

diff --git a/src/main/java/org/getopt/luke/plugins/AnalyzerToolPlugin.java b/src/main/java/org/getopt/luke/plugins/AnalyzerToolPlugin.java
@@ -68,6 +68,22 @@ public boolean init() throws Exception {
     Version[] values = {
             Version.LUCENE_3_0_0,
             Version.LUCENE_3_1_0,
+            Version.LUCENE_3_2_0,
+            Version.LUCENE_3_3_0,
+            Version.LUCENE_3_4_0,
+            Version.LUCENE_3_5_0,
+            Version.LUCENE_3_6_0,
+            Version.LUCENE_4_0_0,
+            Version.LUCENE_4_1_0,
+            Version.LUCENE_4_2_0,
+            Version.LUCENE_4_3_0,
+            Version.LUCENE_4_4_0,
+            Version.LUCENE_4_5_0,
+            Version.LUCENE_4_6_0,
+            Version.LUCENE_4_7_0,
+            Version.LUCENE_4_8_0,
+            Version.LUCENE_4_9_0,
+            Version.LUCENE_4_10_0,
             Version.LATEST
     };
     for (int i = 0; i < values.length; i++) {

diff --git a/src/main/resources/xml/about.xml b/src/main/resources/xml/about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dialog modal="true" name="about" columns="1" gap="8" icon="/img/luke.gif" text=" About" left="4" right="4" bottom="4" top="4" close="remove(about)">
-	<label halign="center" valign="center" text="v 4.9.0 (2014-06-30)" font="10" icon="/img/luke-big.gif"/>
+	<label halign="center" valign="center" text="v 4.10.1 (2014-10-07)" font="10" icon="/img/luke-big.gif"/>
 	<button type="link" tooltip="Go to Luke home page" action="goUrl(this)" halign="center" property="url=https://github.com/DmitryKey/luke" foreground="#5aaa88" text="Lucene Index Toolbox" font="18 bold"/>
 	<label halign="center" font="13" text="Created by Andrzej Bialecki &lt;ab@getopt.org&gt;"/>
     <label halign="center" font="13" text="Maintained and further developed by Dmitry Kan &lt;dmitry.lucene@gmail.com&gt;"/>