Also load config from /etc/elasticsearch/analysis-ik (#197)

Support install by `bin/plugin`, dealing with config files reallocation

README.md

@@ -169,7 +169,8 @@ Result
 
 ### Dictionary Configuration
 
-#### `plugins/elasticsearch-analysis-ik-*/config/ik/IKAnalyzer.cfg.xml`
+`IKAnalyzer.cfg.xml` can be located at `{conf}/analysis-ik/config/IKAnalyzer.cfg.xml`
+or `{plugins}/elasticsearch-analysis-ik-*/config/IKAnalyzer.cfg.xml`
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>

config/ik/IKAnalyzer.cfg.xml → config/IKAnalyzer.cfg.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">  
-<properties>  
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
 	<comment>IK Analyzer 扩展配置</comment>
-	<!--用户可以在这里配置自己的扩展字典 -->	
-	<entry key="ext_dict">custom/mydict.dic;custom/single_word_low_freq.dic</entry> 	
+	<!--用户可以在这里配置自己的扩展字典 -->
+	<entry key="ext_dict">custom/mydict.dic;custom/single_word_low_freq.dic</entry>
 	 <!--用户可以在这里配置自己的扩展停止词字典-->
 	<entry key="ext_stopwords">custom/ext_stopword.dic</entry>
-	<!--用户可以在这里配置远程扩展字典 -->	
+	<!--用户可以在这里配置远程扩展字典 -->
 	<!-- <entry key="remote_ext_dict">words_location</entry> -->
 	<!--用户可以在这里配置远程扩展停止词字典-->
 	<!-- <entry key="remote_ext_stopwords">words_location</entry> -->

src/main/java/org/elasticsearch/plugin/analysis/ik/AnalysisIkPlugin.java

@@ -23,14 +23,16 @@ import static java.rmi.Naming.bind;
 
 
 public class AnalysisIkPlugin extends Plugin {
+	
+	public static String PLUGIN_NAME = "analysis-ik";
 
     @Override public String name() {
-        return "analysis-ik";
+        return PLUGIN_NAME;
     }
 
 
     @Override public String description() {
-        return "ik analysis";
+        return PLUGIN_NAME;
     }
 
     @Override

src/main/java/org/wltea/analyzer/cfg/Configuration.java

@@ -20,118 +20,132 @@ import java.util.Properties;
 
 public class Configuration {
 
-	private static String FILE_NAME = "ik/IKAnalyzer.cfg.xml";
+	private static String FILE_NAME = "IKAnalyzer.cfg.xml";
 	private static final String EXT_DICT = "ext_dict";
 	private static final String REMOTE_EXT_DICT = "remote_ext_dict";
 	private static final String EXT_STOP = "ext_stopwords";
 	private static final String REMOTE_EXT_STOP = "remote_ext_stopwords";
-    private static ESLogger logger = Loggers.getLogger("ik-analyzer");
+	private static ESLogger logger = Loggers.getLogger("ik-analyzer");
+	private Path conf_dir;
 	private Properties props;
-    private Environment environment;
+	private Environment environment;
 
 	@Inject
-    public  Configuration(Environment env){
+	public Configuration(Environment env) {
 		props = new Properties();
-        environment = env;
-
-
-		Path fileConfig = PathUtils.get(getDictRoot(), FILE_NAME);
-
-
-        InputStream input = null;
-        try {
-            input = new FileInputStream(fileConfig.toFile());
-        } catch (FileNotFoundException e) {
-            logger.error("ik-analyzer",e);
-        }
-        if(input != null){
+		environment = env;
+
+		conf_dir = environment.configFile().resolve(AnalysisIkPlugin.PLUGIN_NAME);
+		Path configFile = conf_dir.resolve(FILE_NAME);
+
+		InputStream input = null;
+		try {
+			logger.info("try load config from {}", configFile);
+			input = new FileInputStream(configFile.toFile());
+		} catch (FileNotFoundException e) {
+			conf_dir = this.getConfigInPluginDir();
+			configFile = conf_dir.resolve(FILE_NAME);
+			try {
+				logger.info("try load config from {}", configFile);
+				input = new FileInputStream(configFile.toFile());
+			} catch (FileNotFoundException ex) {
+				// We should report origin exception
+				logger.error("ik-analyzer", e);
+			}
+		}
+		if (input != null) {
 			try {
 				props.loadFromXML(input);
 			} catch (InvalidPropertiesFormatException e) {
 				logger.error("ik-analyzer", e);
 			} catch (IOException e) {
-				logger.error("ik-analyzer",e);
+				logger.error("ik-analyzer", e);
 			}
 		}
 	}
 
-    public  List<String> getExtDictionarys(){
+	public List<String> getExtDictionarys() {
 		List<String> extDictFiles = new ArrayList<String>(2);
 		String extDictCfg = props.getProperty(EXT_DICT);
-		if(extDictCfg != null){
+		if (extDictCfg != null) {
 
 			String[] filePaths = extDictCfg.split(";");
-			if(filePaths != null){
-				for(String filePath : filePaths){
-					if(filePath != null && !"".equals(filePath.trim())){
-						Path file = PathUtils.get("ik", filePath.trim());
+			if (filePaths != null) {
+				for (String filePath : filePaths) {
+					if (filePath != null && !"".equals(filePath.trim())) {
+						Path file = PathUtils.get(filePath.trim());
 						extDictFiles.add(file.toString());
 
 					}
 				}
 			}
-		}		
-		return extDictFiles;		
+		}
+		return extDictFiles;
 	}
-    
-    public  List<String> getRemoteExtDictionarys(){
+
+	public List<String> getRemoteExtDictionarys() {
 		List<String> remoteExtDictFiles = new ArrayList<String>(2);
 		String remoteExtDictCfg = props.getProperty(REMOTE_EXT_DICT);
-		if(remoteExtDictCfg != null){
+		if (remoteExtDictCfg != null) {
 
 			String[] filePaths = remoteExtDictCfg.split(";");
-			if(filePaths != null){
-				for(String filePath : filePaths){
-					if(filePath != null && !"".equals(filePath.trim())){
+			if (filePaths != null) {
+				for (String filePath : filePaths) {
+					if (filePath != null && !"".equals(filePath.trim())) {
 						remoteExtDictFiles.add(filePath);
 
 					}
 				}
 			}
-		}		
-		return remoteExtDictFiles;		
+		}
+		return remoteExtDictFiles;
 	}
 
-	public List<String> getExtStopWordDictionarys(){
+	public List<String> getExtStopWordDictionarys() {
 		List<String> extStopWordDictFiles = new ArrayList<String>(2);
 		String extStopWordDictCfg = props.getProperty(EXT_STOP);
-		if(extStopWordDictCfg != null){
-			
+		if (extStopWordDictCfg != null) {
+
 			String[] filePaths = extStopWordDictCfg.split(";");
-			if(filePaths != null){
-				for(String filePath : filePaths){
-					if(filePath != null && !"".equals(filePath.trim())){
-						Path file = PathUtils.get("ik", filePath.trim());
+			if (filePaths != null) {
+				for (String filePath : filePaths) {
+					if (filePath != null && !"".equals(filePath.trim())) {
+						Path file = PathUtils.get(filePath.trim());
 						extStopWordDictFiles.add(file.toString());
 
 					}
 				}
 			}
-		}		
-		return extStopWordDictFiles;		
+		}
+		return extStopWordDictFiles;
 	}
-	
-	public  List<String> getRemoteExtStopWordDictionarys(){
+
+	public List<String> getRemoteExtStopWordDictionarys() {
 		List<String> remoteExtStopWordDictFiles = new ArrayList<String>(2);
 		String remoteExtStopWordDictCfg = props.getProperty(REMOTE_EXT_STOP);
-		if(remoteExtStopWordDictCfg != null){
+		if (remoteExtStopWordDictCfg != null) {
 
 			String[] filePaths = remoteExtStopWordDictCfg.split(";");
-			if(filePaths != null){
-				for(String filePath : filePaths){
-					if(filePath != null && !"".equals(filePath.trim())){
+			if (filePaths != null) {
+				for (String filePath : filePaths) {
+					if (filePath != null && !"".equals(filePath.trim())) {
 						remoteExtStopWordDictFiles.add(filePath);
 
 					}
 				}
 			}
 		}
-		return remoteExtStopWordDictFiles;		
+		return remoteExtStopWordDictFiles;
+	}
+
+	public String getDictRoot() {
+		return conf_dir.toAbsolutePath().toString();
 	}
 
-    public String getDictRoot() {
-		return PathUtils.get(
-				new File(AnalysisIkPlugin.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent(),"config")
-				.toAbsolutePath().toString();
-    }
+	private Path getConfigInPluginDir() {
+		return PathUtils
+				.get(new File(AnalysisIkPlugin.class.getProtectionDomain().getCodeSource().getLocation().getPath())
+						.getParent(), "config")
+				.toAbsolutePath();
+	}
 }