From 50230bfa640f78c2157bc23cebed6f45379970b1 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 3 Aug 2017 16:59:35 +0800
Subject: [PATCH] fix install by plugin command

---
 config/IKAnalyzer.cfg.xml                          |  4 ++--
 config/custom/mydict.dic                           | 14 --------------
 config/{custom/sougou.dic => extra_main.dic}       |  0
 .../single_word.dic => extra_single_word.dic}      |  0
 ...le_word_full.dic => extra_single_word_full.dic} |  0
 ...low_freq.dic => extra_single_word_low_freq.dic} |  0
 .../ext_stopword.dic => extra_stopword.dic}        |  0
 src/main/assemblies/plugin.xml                     |  8 ++++----
 8 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 config/custom/mydict.dic
 rename config/{custom/sougou.dic => extra_main.dic} (100%)
 rename config/{custom/single_word.dic => extra_single_word.dic} (100%)
 rename config/{custom/single_word_full.dic => extra_single_word_full.dic} (100%)
 rename config/{custom/single_word_low_freq.dic => extra_single_word_low_freq.dic} (100%)
 rename config/{custom/ext_stopword.dic => extra_stopword.dic} (100%)

diff --git a/config/IKAnalyzer.cfg.xml b/config/IKAnalyzer.cfg.xml
index 9a935c1..fe69bb2 100644
--- a/config/IKAnalyzer.cfg.xml
+++ b/config/IKAnalyzer.cfg.xml
@@ -3,9 +3,9 @@
 <properties>
 	<comment>IK Analyzer 扩展配置</comment>
 	<!--用户可以在这里配置自己的扩展字典 -->
-	<entry key="ext_dict">custom/mydict.dic;custom/single_word_low_freq.dic</entry>
+	<entry key="ext_dict"></entry>
 	 <!--用户可以在这里配置自己的扩展停止词字典-->
-	<entry key="ext_stopwords">custom/ext_stopword.dic</entry>
+	<entry key="ext_stopwords"></entry>
 	<!--用户可以在这里配置远程扩展字典 -->
 	<!-- <entry key="remote_ext_dict">words_location</entry> -->
 	<!--用户可以在这里配置远程扩展停止词字典-->
diff --git a/config/custom/mydict.dic b/config/custom/mydict.dic
deleted file mode 100644
index 26fe68b..0000000
--- a/config/custom/mydict.dic
+++ /dev/null
@@ -1,14 +0,0 @@
-medcl
-elastic
-elasticsearch
-kogstash
-kibana
-marvel
-shield
-watcher
-beats
-packetbeat
-filebeat
-topbeat
-metrixbeat
-kimchy
\ No newline at end of file
diff --git a/config/custom/sougou.dic b/config/extra_main.dic
similarity index 100%
rename from config/custom/sougou.dic
rename to config/extra_main.dic
diff --git a/config/custom/single_word.dic b/config/extra_single_word.dic
similarity index 100%
rename from config/custom/single_word.dic
rename to config/extra_single_word.dic
diff --git a/config/custom/single_word_full.dic b/config/extra_single_word_full.dic
similarity index 100%
rename from config/custom/single_word_full.dic
rename to config/extra_single_word_full.dic
diff --git a/config/custom/single_word_low_freq.dic b/config/extra_single_word_low_freq.dic
similarity index 100%
rename from config/custom/single_word_low_freq.dic
rename to config/extra_single_word_low_freq.dic
diff --git a/config/custom/ext_stopword.dic b/config/extra_stopword.dic
similarity index 100%
rename from config/custom/ext_stopword.dic
rename to config/extra_stopword.dic
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
index cd9d31e..a9fe2e0 100644
--- a/src/main/assemblies/plugin.xml
+++ b/src/main/assemblies/plugin.xml
@@ -8,20 +8,20 @@
     <fileSets>
         <fileSet>
         <directory>${project.basedir}/config</directory>
-            <outputDirectory>/config</outputDirectory>
+            <outputDirectory>elasticsearch/config</outputDirectory>
         </fileSet>
     </fileSets>
 
     <files>
         <file>
             <source>${project.basedir}/src/main/resources/plugin-descriptor.properties</source>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>elasticsearch</outputDirectory>
             <filtered>true</filtered>
         </file>
     </files>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>elasticsearch</outputDirectory>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <excludes>
@@ -29,7 +29,7 @@
             </excludes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>elasticsearch</outputDirectory>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>