fix #299

.gitignore

@@ -18,3 +18,4 @@
 *.iml
 .idea
 .DS_Store
+/plugins/

pom.xml

@@ -49,6 +49,8 @@
     <tomcat.useSeparateTomcatClassLoader>true</tomcat.useSeparateTomcatClassLoader>
     <maven.tomcat.uriEncoding>UTF-8</maven.tomcat.uriEncoding>
     <maven.tomcat.tomcatUsers.file>${basedir}/src/test/resources/tomcat-users.xml</maven.tomcat.tomcatUsers.file>
+    <maven.snapshot.repo.url>https://oss.sonatype.org/content/repositories/snapshots</maven.snapshot.repo.url>
+    <maven.release.repo.url>http://central.maven.org/maven2</maven.release.repo.url>
   </properties>
   <build>
     <finalName>fess</finalName>
@@ -185,6 +187,33 @@
           <dbfluteClientDir>${basedir}/dbflute_fess</dbfluteClientDir>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.9.6</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <tasks>
+            <mkdir dir="${basedir}/target/plugins"/>
+            <get dest="${basedir}/target/plugins">
+              <url url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/1.6.0-SNAPSHOT/elasticsearch-configsync-1.6.0-20150716.075532-2.zip"/>
+              <url url="${maven.release.repo.url}/org/codelibs/elasticsearch-analysis-kuromoji-neologd/1.6.0/elasticsearch-analysis-kuromoji-neologd-1.6.0.zip"/>
+            </get>
+            <delete dir="${basedir}/plugins"/>
+            <mkdir dir="${basedir}/plugins"/>
+            <unzip dest="${basedir}/plugins/analysis-kuromoji-neologd" src="${basedir}/target/plugins/elasticsearch-analysis-kuromoji-neologd-1.6.0.zip"/>
+            <unzip dest="${basedir}/plugins/configsync" src="${basedir}/target/plugins/elasticsearch-configsync-1.6.0-20150716.075532-2.zip"/>
+          </tasks>
+        </configuration>
+        <goals>
+          <goal>run</goal>
+        </goals>
+      </plugin>
     </plugins>
   </build>
   <pluginRepositories>

src/main/java/org/codelibs/fess/client/FessEsClient.java

@@ -2,7 +2,10 @@ package org.codelibs.fess.client;
 
 import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -15,6 +18,8 @@ import org.codelibs.core.io.FileUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner;
 import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.Configs;
+import org.codelibs.elasticsearch.runner.net.Curl;
+import org.codelibs.elasticsearch.runner.net.CurlResponse;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.ResultOffsetExceededException;
 import org.codelibs.fess.entity.FacetInfo;
@@ -159,10 +164,21 @@ public class FessEsClient implements Client {
 
     protected List<String> indexConfigList = new ArrayList<>();
 
+    protected Map<String, List<String>> configListMap = new HashMap<>();
+
     public void addIndexConfig(String path) {
         indexConfigList.add(path);
     }
 
+    public void addConfigFile(String index, String path) {
+        List<String> list = configListMap.get(index);
+        if (list == null) {
+            list = new ArrayList<>();
+            configListMap.put(index, list);
+        }
+        list.add(path);
+    }
+
     public void setSettings(Map<String, String> settings) {
         this.settings = settings;
     }
@@ -214,6 +230,7 @@ public class FessEsClient implements Client {
                     if (settings != null) {
                         settingsBuilder.put(settings);
                     }
+                    settingsBuilder.put("path.plugins", System.getProperty("user.dir") + "/plugins");
                 });
                 runner.build(config);
             }
@@ -263,6 +280,27 @@ public class FessEsClient implements Client {
                     // ignore
             }
             if (!exists) {
+                if (runner != null) {// TODO replace with url
+                    configListMap.getOrDefault(configIndex, Collections.emptyList()).forEach(
+                            path -> {
+                                String source = null;
+                                final String filePath = indexConfigPath + "/" + configIndex + "/" + path;
+                                try {
+                                    source = FileUtil.readUTF8(filePath);
+                                    try (CurlResponse response =
+                                            Curl.post(runner.node(), "_configsync/file").param("path", path).body(source).execute()) {
+                                        if (response.getHttpStatusCode() == 200) {
+                                            logger.info("Register " + path + " to " + configIndex);
+                                        } else {
+                                            logger.warn("Invalid request for " + path);
+                                        }
+                                    }
+                                } catch (final Exception e) {
+                                    logger.warn("Failed to register " + filePath, e);
+                                }
+                            });
+                }
+
                 try {
                     String source = null;
                     final String indexConfigFile = indexConfigPath + "/" + configIndex + ".json";

src/main/resources/esclient.dicon

@@ -9,6 +9,18 @@
 		<initMethod name="addIndexConfig">
 			<arg>"fess/doc"</arg>
 		</initMethod>
+		<initMethod name="addConfigFile">
+			<arg>"fess"</arg>
+			<arg>"ja/mapping.txt"</arg>
+		</initMethod>
+		<initMethod name="addConfigFile">
+			<arg>"fess"</arg>
+			<arg>"ja/synonym.txt"</arg>
+		</initMethod>
+		<initMethod name="addConfigFile">
+			<arg>"fess"</arg>
+			<arg>"ja/kuromoji.txt"</arg>
+		</initMethod>
 		<initMethod name="addIndexConfig">
 			<arg>".fess_config/boost_document_rule"</arg>
 		</initMethod>

src/main/resources/fess_indices/fess/ja/kuromoji.txt

@@ -0,0 +1,3 @@
+日本経済新聞,日本 経済 新聞,ニホン ケイザイ シンブン,カスタム名詞
+関西国際空港,関西 国際 空港,カンサイ コクサイ クウコウ,テスト名詞
+朝青龍,朝青龍,アサショウリュウ,カスタム名詞

src/main/resources/fess_indices/fess/ja/mapping.txt

@@ -0,0 +1,189 @@
+# Half-width Katakana ＝＞ Full-width Katakana
+"ｱ" => "ア"
+"ｲ" => "イ"
+"ｳ" => "ウ"
+"ｴ" => "エ"
+"ｵ" => "オ"
+"ｶ" => "カ"
+"ｷ" => "キ"
+"ｸ" => "ク"
+"ｹ" => "ケ"
+"ｺ" => "コ"
+"ｻ" => "サ"
+"ｼ" => "シ"
+"ｽ" => "ス"
+"ｾ" => "セ"
+"ｿ" => "ソ"
+"ﾀ" => "タ"
+"ﾁ" => "チ"
+"ﾂ" => "ツ"
+"ﾃ" => "テ"
+"ﾄ" => "ト"
+"ﾅ" => "ナ"
+"ﾆ" => "ニ"
+"ﾇ" => "ヌ"
+"ﾈ" => "ネ"
+"ﾉ" => "ノ"
+"ﾊ" => "ハ"
+"ﾋ" => "ヒ"
+"ﾌ" => "フ"
+"ﾍ" => "ヘ"
+"ﾎ" => "ホ"
+"ﾏ" => "マ"
+"ﾐ" => "ミ"
+"ﾑ" => "ム"
+"ﾒ" => "メ"
+"ﾓ" => "モ"
+"ﾔ" => "ヤ"
+"ﾕ" => "ユ"
+"ﾖ" => "ヨ"
+"ﾗ" => "ラ"
+"ﾘ" => "リ"
+"ﾙ" => "ル"
+"ﾚ" => "レ"
+"ﾛ" => "ロ"
+"ﾜ" => "ワ"
+"ｦ" => "ヲ"
+"ﾝ" => "ン"
+"ｯ" => "ッ"
+"ｧ" => "ァ"
+"ｨ" => "ィ"
+"ｩ" => "ゥ"
+"ｪ" => "ェ"
+"ｫ" => "ォ"
+"ｬ" => "ャ"
+"ｭ" => "ュ"
+"ｮ" => "ョ"
+"ｶﾞ" => "ガ"
+"ｷﾞ" => "ギ"
+"ｸﾞ" => "グ"
+"ｹﾞ" => "ゲ"
+"ｺﾞ" => "ゴ"
+"ｻﾞ" => "ザ"
+"ｼﾞ" => "ジ"
+"ｽﾞ" => "ズ"
+"ｾﾞ" => "ゼ"
+"ｿﾞ" => "ゾ"
+"ﾀﾞ" => "ダ"
+"ﾁﾞ" => "ヂ"
+"ﾂﾞ" => "ヅ"
+"ﾃﾞ" => "デ"
+"ﾄﾞ" => "ド"
+"ﾊﾞ" => "バ"
+"ﾋﾞ" => "ビ"
+"ﾌﾞ" => "ブ"
+"ﾍﾞ" => "ベ"
+"ﾎﾞ" => "ボ"
+"ﾊﾟ" => "パ"
+"ﾋﾟ" => "ピ"
+"ﾌﾟ" => "プ"
+"ﾍﾟ" => "ペ"
+"ﾎﾟ" => "ポ"
+
+# Full-width alpha-numeric ＝＞ Half-width alpha-numeric
+"０" => "0"
+"１" => "1"
+"２" => "2"
+"３" => "3"
+"４" => "4"
+"５" => "5"
+"６" => "6"
+"７" => "7"
+"８" => "8"
+"９" => "9"
+
+"Ａ" => "A"
+"Ｂ" => "B"
+"Ｃ" => "C"
+"Ｄ" => "D"
+"Ｅ" => "E"
+"Ｆ" => "F"
+"Ｇ" => "G"
+"Ｈ" => "H"
+"Ｉ" => "I"
+"Ｊ" => "J"
+"Ｋ" => "K"
+"Ｌ" => "L"
+"Ｍ" => "M"
+"Ｎ" => "N"
+"Ｏ" => "O"
+"Ｐ" => "P"
+"Ｑ" => "Q"
+"Ｒ" => "R"
+"Ｓ" => "S"
+"Ｔ" => "T"
+"Ｕ" => "U"
+"Ｖ" => "V"
+"Ｗ" => "W"
+"Ｘ" => "X"
+"Ｙ" => "Y"
+"Ｚ" => "Z"
+
+"ａ" => "a"
+"ｂ" => "b"
+"ｃ" => "c"
+"ｄ" => "d"
+"ｅ" => "e"
+"ｆ" => "f"
+"ｇ" => "g"
+"ｈ" => "h"
+"ｉ" => "i"
+"ｊ" => "j"
+"ｋ" => "k"
+"ｌ" => "l"
+"ｍ" => "m"
+"ｎ" => "n"
+"ｏ" => "o"
+"ｐ" => "p"
+"ｑ" => "q"
+"ｒ" => "r"
+"ｓ" => "s"
+"ｔ" => "t"
+"ｕ" => "u"
+"ｖ" => "v"
+"ｗ" => "w"
+"ｘ" => "x"
+"ｙ" => "y"
+"ｚ" => "z"
+
+# !"#$%&'()=|-^\@[`{;:]+*}/_<>?
+"！" => "!"
+"”" => "\""
+"＃" => "#"
+"＄" => "$"
+"％" => "%"
+"＆" => "&"
+"’" => "'"
+"（" => "("
+"）" => ")"
+"＝" => "="
+"｜" => "|"
+"－" => "-"
+"＾" => "^"
+"￥" => "\\"
+"＠" => "@"
+"［" => "["
+"｀" => "`"
+"｛" => "{"
+"；" => ";"
+"：" => ":"
+"］" => "]"
+"＋" => "+"
+"＊" => "*"
+"｝" => "}"
+"／" => "/"
+"＿" => "_"
+"＜" => "<"
+"＞" => ">"
+"？" => "?"
+"‘" => "`"
+
+"①" => "1"
+"②" => "2"
+"③" => "3"
+"④" => "4"
+"⑤" => "5"
+"⑥" => "6"
+"⑦" => "7"
+"⑧" => "8"
+"⑨" => "9"

src/main/resources/fess_indices/fess/ja/synonym.txt

@@ -0,0 +1 @@
+fess,フェス