rename path and jsp

pom.xml

@@ -277,9 +277,9 @@
 						<mkdir dir="${basedir}/target/plugins" />
 						<get dest="${basedir}/target/plugins">
 							<url
-								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-analysis-kuromoji-neologd/2.0.0-SNAPSHOT/elasticsearch-analysis-kuromoji-neologd-2.0.0-20151105.074711-1.zip" />
+								url="${maven.release.repo.url}/org/codelibs/elasticsearch-analysis-kuromoji-neologd/2.0.0/elasticsearch-analysis-kuromoji-neologd-2.0.0.zip" />
 							<url
-								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-analysis-synonym/2.0.0-SNAPSHOT/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
+								url="${maven.release.repo.url}/org/codelibs/elasticsearch-analysis-synonym/2.0.0/elasticsearch-analysis-synonym-2.0.0.zip" />
 							<url
 								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/2.0.0-SNAPSHOT/elasticsearch-configsync-2.0.0-20151105.213152-3.zip" />
 							<url
@@ -290,9 +290,9 @@
 						<delete dir="${basedir}/plugins" />
 						<mkdir dir="${basedir}/plugins" />
 						<unzip dest="${basedir}/plugins/analysis-kuromoji-neologd"
-							src="${basedir}/target/plugins/elasticsearch-analysis-kuromoji-neologd-2.0.0-20151105.074711-1.zip" />
+							src="${basedir}/target/plugins/elasticsearch-analysis-kuromoji-neologd-2.0.0.zip" />
 						<unzip dest="${basedir}/plugins/analysis-synonym"
-							src="${basedir}/target/plugins/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
+							src="${basedir}/target/plugins/elasticsearch-analysis-synonym-2.0.0.zip" />
 						<unzip dest="${basedir}/plugins/configsync"
 							src="${basedir}/target/plugins/elasticsearch-configsync-2.0.0-20151105.213152-3.zip" />
 						<unzip dest="${basedir}/plugins/langfield"

src/main/config/es/fess_config.json

@@ -324,7 +324,7 @@
           }
         }
       },
-      "overlapping_host" : {
+      "duplicate_host" : {
         "_all" : {
           "enabled" : false
         },
@@ -336,7 +336,7 @@
           "createdTime" : {
             "type" : "long"
           },
-          "overlappingName" : {
+          "duplicateHostName" : {
             "type" : "string",
             "index" : "not_analyzed"
           },

src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class OverlappingHostPager implements Serializable {
+public class DuplicateHostPager implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,7 +46,7 @@ public class OverlappingHostPager implements Serializable {
 
     public String regularName;
 
-    public String overlappingName;
+    public String duplicateHostName;
 
     public String sortOrder;
 
@@ -62,7 +62,7 @@ public class OverlappingHostPager implements Serializable {
 
         id = null;
         regularName = null;
-        overlappingName = null;
+        duplicateHostName = null;
         sortOrder = null;
         createdBy = null;
         createdTime = null;
@@ -136,7 +136,7 @@ public class OverlappingHostPager implements Serializable {
         this.pageNumberList = pageNumberList;
     }
 
-    public OverlappingHostPager() {
+    public DuplicateHostPager() {
         super();
     }
 

src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright 2012-2015 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.codelibs.fess.app.service;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.Constants;
+import org.codelibs.fess.app.pager.DuplicateHostPager;
+import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
+import org.codelibs.fess.es.config.exbhv.DuplicateHostBhv;
+import org.codelibs.fess.es.config.exentity.DuplicateHost;
+import org.dbflute.cbean.result.PagingResultBean;
+import org.dbflute.optional.OptionalEntity;
+
+public class DuplicateHostService implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Resource
+    protected DuplicateHostBhv duplicateHostBhv;
+
+    public DuplicateHostService() {
+        super();
+    }
+
+    public List<DuplicateHost> getDuplicateHostList(final DuplicateHostPager duplicateHostPager) {
+
+        final PagingResultBean<DuplicateHost> duplicateHostList = duplicateHostBhv.selectPage(cb -> {
+            cb.paging(duplicateHostPager.getPageSize(), duplicateHostPager.getCurrentPageNumber());
+            setupListCondition(cb, duplicateHostPager);
+        });
+
+        // update pager
+        BeanUtil.copyBeanToBean(duplicateHostList, duplicateHostPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+        duplicateHostPager.setPageNumberList(duplicateHostList.pageRange(op -> {
+            op.rangeSize(5);
+        }).createPageNumberList());
+
+        return duplicateHostList;
+    }
+
+    public OptionalEntity<DuplicateHost> getDuplicateHost(final String id) {
+        return duplicateHostBhv.selectByPK(id);
+    }
+
+    public void store(final DuplicateHost duplicateHost) {
+        setupStoreCondition(duplicateHost);
+
+        duplicateHostBhv.insertOrUpdate(duplicateHost, op -> {
+            op.setRefresh(true);
+        });
+
+    }
+
+    public void delete(final DuplicateHost duplicateHost) {
+        setupDeleteCondition(duplicateHost);
+
+        duplicateHostBhv.delete(duplicateHost, op -> {
+            op.setRefresh(true);
+        });
+
+    }
+
+    public List<DuplicateHost> getDuplicateHostList() {
+
+        return duplicateHostBhv.selectList(cb -> {
+            cb.query().addOrderBy_SortOrder_Asc();
+            cb.query().addOrderBy_RegularName_Asc();
+            cb.query().addOrderBy_DuplicateHostName_Asc();
+        });
+    }
+
+    protected void setupListCondition(final DuplicateHostCB cb, final DuplicateHostPager duplicateHostPager) {
+        if (duplicateHostPager.id != null) {
+            cb.query().docMeta().setId_Equal(duplicateHostPager.id);
+        }
+        // TODO Long, Integer, String supported only.
+
+        // setup condition
+        cb.query().addOrderBy_SortOrder_Asc();
+
+        // search
+
+    }
+
+    protected void setupEntityCondition(final DuplicateHostCB cb, final Map<String, String> keys) {
+
+        // setup condition
+
+    }
+
+    protected void setupStoreCondition(final DuplicateHost duplicateHost) {
+
+        // setup condition
+
+    }
+
+    protected void setupDeleteCondition(final DuplicateHost duplicateHost) {
+
+        // setup condition
+
+    }
+
+}

src/main/java/org/codelibs/fess/app/service/OverlappingHostService.java

@@ -1,122 +0,0 @@
-/*
- * Copyright 2012-2015 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.app.service;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.codelibs.core.beans.util.BeanUtil;
-import org.codelibs.fess.Constants;
-import org.codelibs.fess.app.pager.OverlappingHostPager;
-import org.codelibs.fess.es.config.cbean.OverlappingHostCB;
-import org.codelibs.fess.es.config.exbhv.OverlappingHostBhv;
-import org.codelibs.fess.es.config.exentity.OverlappingHost;
-import org.dbflute.cbean.result.PagingResultBean;
-import org.dbflute.optional.OptionalEntity;
-
-public class OverlappingHostService implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Resource
-    protected OverlappingHostBhv overlappingHostBhv;
-
-    public OverlappingHostService() {
-        super();
-    }
-
-    public List<OverlappingHost> getOverlappingHostList(final OverlappingHostPager overlappingHostPager) {
-
-        final PagingResultBean<OverlappingHost> overlappingHostList = overlappingHostBhv.selectPage(cb -> {
-            cb.paging(overlappingHostPager.getPageSize(), overlappingHostPager.getCurrentPageNumber());
-            setupListCondition(cb, overlappingHostPager);
-        });
-
-        // update pager
-        BeanUtil.copyBeanToBean(overlappingHostList, overlappingHostPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
-        overlappingHostPager.setPageNumberList(overlappingHostList.pageRange(op -> {
-            op.rangeSize(5);
-        }).createPageNumberList());
-
-        return overlappingHostList;
-    }
-
-    public OptionalEntity<OverlappingHost> getOverlappingHost(final String id) {
-        return overlappingHostBhv.selectByPK(id);
-    }
-
-    public void store(final OverlappingHost overlappingHost) {
-        setupStoreCondition(overlappingHost);
-
-        overlappingHostBhv.insertOrUpdate(overlappingHost, op -> {
-            op.setRefresh(true);
-        });
-
-    }
-
-    public void delete(final OverlappingHost overlappingHost) {
-        setupDeleteCondition(overlappingHost);
-
-        overlappingHostBhv.delete(overlappingHost, op -> {
-            op.setRefresh(true);
-        });
-
-    }
-
-    public List<OverlappingHost> getOverlappingHostList() {
-
-        return overlappingHostBhv.selectList(cb -> {
-            cb.query().addOrderBy_SortOrder_Asc();
-            cb.query().addOrderBy_RegularName_Asc();
-            cb.query().addOrderBy_OverlappingName_Asc();
-        });
-    }
-
-    protected void setupListCondition(final OverlappingHostCB cb, final OverlappingHostPager overlappingHostPager) {
-        if (overlappingHostPager.id != null) {
-            cb.query().docMeta().setId_Equal(overlappingHostPager.id);
-        }
-        // TODO Long, Integer, String supported only.
-
-        // setup condition
-        cb.query().addOrderBy_SortOrder_Asc();
-
-        // search
-
-    }
-
-    protected void setupEntityCondition(final OverlappingHostCB cb, final Map<String, String> keys) {
-
-        // setup condition
-
-    }
-
-    protected void setupStoreCondition(final OverlappingHost overlappingHost) {
-
-        // setup condition
-
-    }
-
-    protected void setupDeleteCondition(final OverlappingHost overlappingHost) {
-
-        // setup condition
-
-    }
-
-}

src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java

@@ -15,7 +15,7 @@
  */
 package org.codelibs.fess.app.web.admin;
 
-import org.codelibs.fess.app.web.admin.wizard.AdminWizardAction;
+import org.codelibs.fess.app.web.admin.dashboard.AdminDashboardAction;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
@@ -35,7 +35,7 @@ public class AdminAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index() {
-        return redirect(AdminWizardAction.class);
+        return redirect(AdminDashboardAction.class);
     }
 
 }

src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestbadword;
+package org.codelibs.fess.app.web.admin.badword;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -54,7 +54,7 @@ import org.lastaflute.web.validation.VaErrorHook;
 /**
  * @author Keiichi Watanabe
  */
-public class AdminSuggestbadwordAction extends FessAdminAction {
+public class AdminBadwordAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -84,7 +84,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -96,7 +96,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
         }).orElse(() -> {
             suggestBadWordPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -104,7 +104,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, suggestBadWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -112,7 +112,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         suggestBadWordPager.clear();
-        return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -133,7 +133,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminSuggestbadword_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminBadword_AdminBadwordEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -149,11 +149,11 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminSuggestbadword_DetailsJsp;
+            next = path_AdminBadword_AdminBadwordDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminSuggestbadword_EditJsp;
+            next = path_AdminBadword_AdminBadwordEditJsp;
             break;
         }
         final String id = form.id;
@@ -171,7 +171,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminSuggestbadword_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminBadword_AdminBadwordDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -191,7 +191,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse downloadpage(final SearchForm form) {
-        return asHtml(path_AdminSuggestbadword_DownloadJsp);
+        return asHtml(path_AdminBadword_AdminBadwordDownloadJsp);
     }
 
     @Execute
@@ -207,7 +207,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
         } catch (final Exception e) {
             e.printStackTrace();
         }
-        return asHtml(path_AdminSuggestbadword_DownloadJsp);
+        return asHtml(path_AdminBadword_AdminBadwordDownloadJsp);
     }
 
     // -----------------------------------------------------
@@ -216,7 +216,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse uploadpage(final UploadForm form) {
-        return asHtml(path_AdminSuggestbadword_UploadJsp);
+        return asHtml(path_AdminBadword_AdminBadwordUploadJsp);
     }
 
     // -----------------------------------------------------
@@ -371,7 +371,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminSuggestbadword_EditJsp);
+            return asHtml(path_AdminBadword_AdminBadwordEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestbadword;
+package org.codelibs.fess.app.web.admin.badword;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.pathmapping;
+package org.codelibs.fess.app.web.admin.badword;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/badword/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestbadword;
+package org.codelibs.fess.app.web.admin.badword;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestbadword;
+package org.codelibs.fess.app.web.admin.badword;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.boostdocumentrule;
+package org.codelibs.fess.app.web.admin.boostdoc;
 
 import javax.annotation.Resource;
 
@@ -36,7 +36,7 @@ import org.lastaflute.web.validation.VaErrorHook;
 /**
  * @author shinsuke
  */
-public class AdminBoostdocumentruleAction extends FessAdminAction {
+public class AdminBoostdocAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -62,7 +62,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -74,7 +74,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
         }).orElse(() -> {
             boostDocumentRulePager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -82,7 +82,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, boostDocumentRulePager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -90,7 +90,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         boostDocumentRulePager.clear();
-        return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -111,7 +111,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminBoostdoc_AdminBoostdocEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -127,11 +127,11 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminBoostdocumentrule_DetailsJsp;
+            next = path_AdminBoostdoc_AdminBoostdocDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminBoostdocumentrule_EditJsp;
+            next = path_AdminBoostdoc_AdminBoostdocEditJsp;
             break;
         }
         final String id = form.id;
@@ -149,7 +149,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminBoostdocumentrule_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminBoostdoc_AdminBoostdocDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -256,7 +256,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminBoostdocumentrule_EditJsp);
+            return asHtml(path_AdminBoostdoc_AdminBoostdocEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.boostdocumentrule;
+package org.codelibs.fess.app.web.admin.boostdoc;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.boostdocumentrule;
+package org.codelibs.fess.app.web.admin.boostdoc;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.boostdocumentrule;
+package org.codelibs.fess.app.web.admin.boostdoc;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java

@@ -70,7 +70,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
+        return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -78,7 +78,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
     @Execute
     public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
         crawlingSessionPager.setCurrentPageNumber(pageNumber);
-        return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
+        return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -86,7 +86,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, crawlingSessionPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
+        return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -94,14 +94,14 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         crawlingSessionPager.clear();
-        return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
+        return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     @Execute
     public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp).renderWith(data -> {
+        return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -123,7 +123,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminCrawlinginfo_CrawlinginfoDetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 crawlingSessionService.getCrawlingSession(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -171,7 +171,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
 
     protected VaErrorHook toIndexHtml() {
         return () -> {
-            return asHtml(path_AdminCrawlinginfo_CrawlinginfoListJsp);
+            return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java

@@ -55,7 +55,7 @@ public class AdminDashboardAction extends FessAdminAction {
     @Execute
     public HtmlResponse index() {
         esApiManager.saveToken();
-        return asHtml(path_AdminDashboard_DashboardJsp).renderWith(data -> {
+        return asHtml(path_AdminDashboard_AdminDashboardJsp).renderWith(data -> {
             data.register("serverPath", esApiManager.getServerPath());
         });
     }

src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java

@@ -80,7 +80,7 @@ public class AdminDataconfigAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminDataconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDataconfig_AdminDataconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -92,7 +92,7 @@ public class AdminDataconfigAction extends FessAdminAction {
         }).orElse(() -> {
             dataConfigPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminDataconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDataconfig_AdminDataconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -100,7 +100,7 @@ public class AdminDataconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, dataConfigPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminDataconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDataconfig_AdminDataconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -108,7 +108,7 @@ public class AdminDataconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         dataConfigPager.clear();
-        return asHtml(path_AdminDataconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDataconfig_AdminDataconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -129,7 +129,7 @@ public class AdminDataconfigAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminDataconfig_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminDataconfig_AdminDataconfigEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -148,11 +148,11 @@ public class AdminDataconfigAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminDataconfig_DetailsJsp;
+            next = path_AdminDataconfig_AdminDataconfigDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminDataconfig_EditJsp;
+            next = path_AdminDataconfig_AdminDataconfigEditJsp;
             break;
         }
         form.crudMode = CrudMode.EDIT;
@@ -173,8 +173,8 @@ public class AdminDataconfigAction extends FessAdminAction {
         validate(form, messages -> {}, toEditHtml());
         final ScheduledJob scheduledJob = new ScheduledJob();
         scheduledJob.setCrawler(true);
-        return asHtml(path_AdminScheduledjob_EditJsp).useForm(
-                org.codelibs.fess.app.web.admin.scheduledjob.CreateForm.class,
+        return asHtml(path_AdminScheduler_AdminSchedulerEditJsp).useForm(
+                org.codelibs.fess.app.web.admin.scheduler.CreateForm.class,
                 op -> {
                     op.setup(scheduledJobForm -> {
                         scheduledJobForm.initialize();
@@ -198,7 +198,7 @@ public class AdminDataconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminDataconfig_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminDataconfig_AdminDataconfigDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 dataConfigService.getDataConfig(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -324,7 +324,7 @@ public class AdminDataconfigAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminDataconfig_AdminDataconfigEditJsp).renderWith(data -> {
                 registerRolesAndLabels(data);
                 registerHandlerNames(data);
             });

src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java

@@ -107,6 +107,12 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
         return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class);
     }
 
+    @Execute
+    //(token = TxToken.SAVE)
+    public HtmlResponse back() {
+        return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class);
+    }
+
     @Execute
     public HtmlResponse upload(final DesignForm form) {
         validate(form, messages -> {}, toMainHtml());
@@ -254,12 +260,6 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
         return redirect(getClass());
     }
 
-    @Execute
-    //(token = TxToken.SAVE)
-    public HtmlResponse back() {
-        return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class);
-    }
-
     // ===================================================================================
     //                                                                        Assist Logic
     //                                                                        ============

src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java

@@ -53,7 +53,7 @@ public class AdminDictAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final ListForm form) {
-        return asHtml(path_AdminDict_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDict_AdminDictJsp).renderWith(data -> {
             final DictionaryFile<? extends DictionaryItem>[] dictFiles = dictionaryManager.getDictionaryFiles();
             data.register("dictFiles", dictFiles);
         });

src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java

@@ -75,7 +75,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     @Execute
     public HtmlResponse index(final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
-        return asHtml(path_AdminDictKuromoji_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -88,7 +88,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         }).orElse(() -> {
             kuromojiPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminDictKuromoji_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -97,7 +97,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     public HtmlResponse search(final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
         copyBeanToBean(form, kuromojiPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminDictKuromoji_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -106,7 +106,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     public HtmlResponse reset(final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
         kuromojiPager.clear();
-        return asHtml(path_AdminDictKuromoji_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -130,7 +130,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew(final String dictId) {
-        return asHtml(path_AdminDictKuromoji_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -147,11 +147,11 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminDictKuromoji_DetailsJsp;
+            next = path_AdminDictKuromoji_AdminDictKuromojiDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminDictKuromoji_EditJsp;
+            next = path_AdminDictKuromoji_AdminDictKuromojiEditJsp;
             break;
         }
         kuromojiService.getKuromojiItem(form.dictId, form.id).ifPresent(entity -> {
@@ -168,7 +168,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final String dictId, final int crudMode, final long id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminDictKuromoji_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 kuromojiService.getKuromojiItem(dictId, id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -189,7 +189,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     @Execute
     //(token = TxToken.VALIDATE)
     public HtmlResponse downloadpage(final String dictId) {
-        return asHtml(path_AdminDictKuromoji_DownloadJsp).useForm(DownloadForm.class, op -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiDownloadJsp).useForm(DownloadForm.class, op -> {
             op.setup(form -> {
                 form.dictId = dictId;
             });
@@ -224,7 +224,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     @Execute
     //(token = TxToken.VALIDATE)
     public HtmlResponse uploadpage(final String dictId) {
-        return asHtml(path_AdminDictKuromoji_UploadJsp).useForm(UploadForm.class, op -> {
+        return asHtml(path_AdminDictKuromoji_AdminDictKuromojiUploadJsp).useForm(UploadForm.class, op -> {
             op.setup(form -> {
                 form.dictId = dictId;
             });
@@ -352,7 +352,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminDictKuromoji_EditJsp);
+            return asHtml(path_AdminDictKuromoji_AdminDictKuromojiEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java

@@ -77,7 +77,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     @Execute
     public HtmlResponse index(final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
-        return asHtml(path_AdminDictSynonym_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -90,7 +90,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
         }).orElse(() -> {
             synonymPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminDictSynonym_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -99,7 +99,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     public HtmlResponse search(final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
         copyBeanToBean(form, synonymPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminDictSynonym_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -108,7 +108,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     public HtmlResponse reset(final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
         synonymPager.clear();
-        return asHtml(path_AdminDictSynonym_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -132,7 +132,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew(final String dictId) {
-        return asHtml(path_AdminDictSynonym_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -149,11 +149,11 @@ public class AdminDictSynonymAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminDictSynonym_DetailsJsp;
+            next = path_AdminDictSynonym_AdminDictSynonymDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminDictSynonym_EditJsp;
+            next = path_AdminDictSynonym_AdminDictSynonymEditJsp;
             break;
         }
         synonymService.getSynonymItem(form.dictId, form.id).ifPresent(entity -> {
@@ -171,7 +171,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final String dictId, final int crudMode, final long id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminDictSynonym_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 synonymService.getSynonymItem(dictId, id).ifPresent(entity -> {
                     form.inputs = entity.getInputsValue();
@@ -199,7 +199,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
         validateSynonymString(newInputs, () -> createnew(form.dictId));
         final String[] newOutputs = splitLine(form.outputs);
         validateSynonymString(newOutputs, () -> createnew(form.dictId));
-        return asHtml(path_AdminDictSynonym_DetailsJsp);
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymDetailsJsp);
     }
 
     @Execute
@@ -211,7 +211,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
         validateSynonymString(newInputs, () -> edit(form));
         final String[] newOutputs = splitLine(form.outputs);
         validateSynonymString(newOutputs, () -> edit(form));
-        return asHtml(path_AdminDictSynonym_DetailsJsp);
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymDetailsJsp);
     }
 
     // -----------------------------------------------------
@@ -220,7 +220,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     @Execute
     //(token = TxToken.VALIDATE)
     public HtmlResponse downloadpage(final String dictId) {
-        return asHtml(path_AdminDictSynonym_DownloadJsp).useForm(DownloadForm.class, op -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymDownloadJsp).useForm(DownloadForm.class, op -> {
             op.setup(form -> {
                 form.dictId = dictId;
             });
@@ -255,7 +255,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     @Execute
     //(token = TxToken.VALIDATE)
     public HtmlResponse uploadpage(final String dictId) {
-        return asHtml(path_AdminDictSynonym_UploadJsp).useForm(UploadForm.class, op -> {
+        return asHtml(path_AdminDictSynonym_AdminDictSynonymUploadJsp).useForm(UploadForm.class, op -> {
             op.setup(form -> {
                 form.dictId = dictId;
             });
@@ -385,7 +385,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminDictSynonym_EditJsp);
+            return asHtml(path_AdminDictSynonym_AdminDictSynonymEditJsp);
         };
     }
 

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java

@@ -13,16 +13,16 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.overlappinghost;
+package org.codelibs.fess.app.web.admin.duplicatehost;
 
 import javax.annotation.Resource;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.app.pager.OverlappingHostPager;
-import org.codelibs.fess.app.service.OverlappingHostService;
+import org.codelibs.fess.app.pager.DuplicateHostPager;
+import org.codelibs.fess.app.service.DuplicateHostService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.OverlappingHost;
+import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
 import org.dbflute.optional.OptionalThing;
@@ -37,15 +37,15 @@ import org.lastaflute.web.validation.VaErrorHook;
  * @author codelibs
  * @author Keiichi Watanabe
  */
-public class AdminOverlappinghostAction extends FessAdminAction {
+public class AdminDuplicatehostAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
     @Resource
-    private OverlappingHostService overlappingHostService;
+    private DuplicateHostService duplicateHostService;
     @Resource
-    private OverlappingHostPager overlappingHostPager;
+    private DuplicateHostPager duplicateHostPager;
     @Resource
     private SystemHelper systemHelper;
 
@@ -55,7 +55,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     @Override
     protected void setupHtmlData(final ActionRuntime runtime) {
         super.setupHtmlData(runtime);
-        runtime.registerData("helpLink", systemHelper.getHelpLink("overlappingHost"));
+        runtime.registerData("helpLink", systemHelper.getHelpLink("duplicateHost"));
     }
 
     // ===================================================================================
@@ -63,7 +63,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDuplicatehost_AdminDuplicatehostJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -71,36 +71,36 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     @Execute
     public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
         pageNumber.ifPresent(num -> {
-            overlappingHostPager.setCurrentPageNumber(pageNumber.get());
+            duplicateHostPager.setCurrentPageNumber(pageNumber.get());
         }).orElse(() -> {
-            overlappingHostPager.setCurrentPageNumber(0);
+            duplicateHostPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminDuplicatehost_AdminDuplicatehostJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     @Execute
     public HtmlResponse search(final SearchForm form) {
-        copyBeanToBean(form, overlappingHostPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> {
+        copyBeanToBean(form, duplicateHostPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
+        return asHtml(path_AdminDuplicatehost_AdminDuplicatehostJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     @Execute
     public HtmlResponse reset(final SearchForm form) {
-        overlappingHostPager.clear();
-        return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> {
+        duplicateHostPager.clear();
+        return asHtml(path_AdminDuplicatehost_AdminDuplicatehostJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     protected void searchPaging(final RenderData data, final SearchForm form) {
-        data.register("overlappingHostItems", overlappingHostService.getOverlappingHostList(overlappingHostPager)); // page navi
+        data.register("duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
 
         // restore from pager
-        copyBeanToBean(overlappingHostPager, form, op -> op.include("id"));
+        copyBeanToBean(duplicateHostPager, form, op -> op.include("id"));
     }
 
     // ===================================================================================
@@ -112,7 +112,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminOverlappinghost_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminDuplicatehost_AdminDuplicatehostEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -128,15 +128,15 @@ public class AdminOverlappinghostAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminOverlappinghost_DetailsJsp;
+            next = path_AdminDuplicatehost_AdminDuplicatehostEditJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminOverlappinghost_EditJsp;
+            next = path_AdminDuplicatehost_AdminDuplicatehostEditJsp;
             break;
         }
         final String id = form.id;
-        overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
+        duplicateHostService.getDuplicateHost(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
@@ -150,9 +150,9 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminOverlappinghost_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminDuplicatehost_AdminDuplicatehostDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
-                overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
+                duplicateHostService.getDuplicateHost(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
                         copyOp.excludeNull();
                     });
@@ -171,8 +171,8 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
-        createOverlappingHost(form).ifPresent(entity -> {
-            overlappingHostService.store(entity);
+        createDuplicateHost(form).ifPresent(entity -> {
+            duplicateHostService.store(entity);
             saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL), toEditHtml());
@@ -184,8 +184,8 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());
-        createOverlappingHost(form).ifPresent(entity -> {
-            overlappingHostService.store(entity);
+        createDuplicateHost(form).ifPresent(entity -> {
+            duplicateHostService.store(entity);
             saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml());
@@ -198,8 +198,8 @@ public class AdminOverlappinghostAction extends FessAdminAction {
         verifyCrudMode(form.crudMode, CrudMode.DETAILS);
         validate(form, messages -> {}, toEditHtml());
         final String id = form.id;
-        overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
-            overlappingHostService.delete(entity);
+        duplicateHostService.getDuplicateHost(id).ifPresent(entity -> {
+            duplicateHostService.delete(entity);
             saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
@@ -210,11 +210,11 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     // ===================================================================================
     //                                                                        Assist Logic
     //                                                                        ============
-    private OptionalEntity<OverlappingHost> getEntity(final CreateForm form, final String username, final long currentTime) {
+    private OptionalEntity<DuplicateHost> getEntity(final CreateForm form, final String username, final long currentTime) {
         switch (form.crudMode) {
         case CrudMode.CREATE:
             if (form instanceof CreateForm) {
-                return OptionalEntity.of(new OverlappingHost()).map(entity -> {
+                return OptionalEntity.of(new DuplicateHost()).map(entity -> {
                     entity.setCreatedBy(username);
                     entity.setCreatedTime(currentTime);
                     return entity;
@@ -223,7 +223,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
             break;
         case CrudMode.EDIT:
             if (form instanceof EditForm) {
-                return overlappingHostService.getOverlappingHost(((EditForm) form).id);
+                return duplicateHostService.getDuplicateHost(((EditForm) form).id);
             }
             break;
         default:
@@ -232,7 +232,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
         return OptionalEntity.empty();
     }
 
-    protected OptionalEntity<OverlappingHost> createOverlappingHost(final CreateForm form) {
+    protected OptionalEntity<DuplicateHost> createDuplicateHost(final CreateForm form) {
         final String username = systemHelper.getUsername();
         final long currentTime = systemHelper.getCurrentTimeAsLong();
         return getEntity(form, username, currentTime).map(entity -> {
@@ -256,7 +256,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminOverlappinghost_EditJsp);
+            return asHtml(path_AdminDuplicatehost_AdminDuplicatehostEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.overlappinghost;
+package org.codelibs.fess.app.web.admin.duplicatehost;
 
 import java.io.Serializable;
 
@@ -43,7 +43,7 @@ public class CreateForm implements Serializable {
 
     @Required
     @Size(max = 1000)
-    public String overlappingName;
+    public String duplicateHostName;
 
     @Required
     @Min(value = 0)

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.requestheader;
+package org.codelibs.fess.app.web.admin.duplicatehost;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.overlappinghost;
+package org.codelibs.fess.app.web.admin.duplicatehost;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestelevateword;
+package org.codelibs.fess.app.web.admin.elevateword;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -53,7 +53,7 @@ import org.lastaflute.web.validation.VaErrorHook;
 /**
  * @author Keiichi Watanabe
  */
-public class AdminSuggestelevatewordAction extends FessAdminAction {
+public class AdminElevatewordAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -81,7 +81,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminSuggestelevateword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -93,7 +93,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
         }).orElse(() -> {
             suggestElevateWordPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminSuggestelevateword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -101,7 +101,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, suggestElevateWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminSuggestelevateword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -109,7 +109,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         suggestElevateWordPager.clear();
-        return asHtml(path_AdminSuggestelevateword_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -130,7 +130,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminSuggestelevateword_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminElevateword_AdminElevatewordEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -146,11 +146,11 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminSuggestelevateword_DetailsJsp;
+            next = path_AdminElevateword_AdminElevatewordDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminSuggestelevateword_EditJsp;
+            next = path_AdminElevateword_AdminElevatewordEditJsp;
             break;
         }
         final String id = form.id;
@@ -168,7 +168,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminSuggestelevateword_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminElevateword_AdminElevatewordDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -188,7 +188,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse downloadpage(final SearchForm form) {
-        return asHtml(path_AdminSuggestelevateword_DownloadJsp);
+        return asHtml(path_AdminElevateword_AdminElevatewordDownloadJsp);
     }
 
     @Execute
@@ -204,7 +204,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
         } catch (final Exception e) {
             e.printStackTrace();
         }
-        return asHtml(path_AdminSuggestelevateword_DownloadJsp);
+        return asHtml(path_AdminElevateword_AdminElevatewordDownloadJsp);
     }
 
     // -----------------------------------------------------
@@ -213,7 +213,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse uploadpage(final UploadForm form) {
-        return asHtml(path_AdminSuggestelevateword_UploadJsp);
+        return asHtml(path_AdminElevateword_AdminElevatewordUploadJsp);
     }
 
     // -----------------------------------------------------
@@ -364,7 +364,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminSuggestelevateword_EditJsp);
+            return asHtml(path_AdminElevateword_AdminElevatewordEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestelevateword;
+package org.codelibs.fess.app.web.admin.elevateword;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestbadword;
+package org.codelibs.fess.app.web.admin.elevateword;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/elevateword/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestelevateword;
+package org.codelibs.fess.app.web.admin.elevateword;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.suggestelevateword;
+package org.codelibs.fess.app.web.admin.elevateword;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java

@@ -59,7 +59,7 @@ public class AdminFailureurlAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminFailureurl_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFailureurl_AdminFailureurlJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -67,7 +67,7 @@ public class AdminFailureurlAction extends FessAdminAction {
     @Execute
     public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
         failureUrlPager.setCurrentPageNumber(pageNumber);
-        return asHtml(path_AdminFailureurl_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFailureurl_AdminFailureurlJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -75,7 +75,7 @@ public class AdminFailureurlAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, failureUrlPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminFailureurl_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFailureurl_AdminFailureurlJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -83,14 +83,14 @@ public class AdminFailureurlAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         failureUrlPager.clear();
-        return asHtml(path_AdminFailureurl_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFailureurl_AdminFailureurlJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     @Execute
     public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminFailureurl_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFailureurl_AdminFailureurlJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -108,7 +108,7 @@ public class AdminFailureurlAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminFailureurl_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminFailureurl_AdminFailureurlDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 failureUrlService.getFailureUrl(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -159,7 +159,7 @@ public class AdminFailureurlAction extends FessAdminAction {
 
     protected VaErrorHook toIndexHtml() {
         return () -> {
-            return asHtml(path_AdminJoblog_IndexJsp);
+            return asHtml(path_AdminFailureurl_AdminFailureurlJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.fileauthentication;
+package org.codelibs.fess.app.web.admin.fileauth;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -46,7 +46,7 @@ import org.lastaflute.web.validation.VaErrorHook;
 /**
  * @author Keiichi Watanabe
  */
-public class AdminFileauthenticationAction extends FessAdminAction {
+public class AdminFileauthAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -75,7 +75,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminFileauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -87,7 +87,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
         }).orElse(() -> {
             fileAuthenticationPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminFileauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -95,7 +95,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, fileAuthenticationPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminFileauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -103,7 +103,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         fileAuthenticationPager.clear();
-        return asHtml(path_AdminFileauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -124,7 +124,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminFileauthentication_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminFileauth_AdminFileauthEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -143,11 +143,11 @@ public class AdminFileauthenticationAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminFileauthentication_DetailsJsp;
+            next = path_AdminFileauth_AdminFileauthDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminFileauthentication_EditJsp;
+            next = path_AdminFileauth_AdminFileauthEditJsp;
             break;
         }
         final String id = form.id;
@@ -168,7 +168,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminFileauthentication_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminFileauth_AdminFileauthDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -301,7 +301,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminFileauthentication_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminFileauth_AdminFileauthEditJsp).renderWith(data -> {
                 registerProtocolSchemeItems(data);
                 registerFileConfigItems(data);
             });

src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.fileauthentication;
+package org.codelibs.fess.app.web.admin.fileauth;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.fileauthentication;
+package org.codelibs.fess.app.web.admin.fileauth;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/fileauth/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.fileauthentication;
+package org.codelibs.fess.app.web.admin.fileauth;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java

@@ -72,7 +72,7 @@ public class AdminFileconfigAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileconfig_AdminFileconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -84,7 +84,7 @@ public class AdminFileconfigAction extends FessAdminAction {
         }).orElse(() -> {
             fileConfigPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileconfig_AdminFileconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -92,7 +92,7 @@ public class AdminFileconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, fileConfigPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileconfig_AdminFileconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -100,7 +100,7 @@ public class AdminFileconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         fileConfigPager.clear();
-        return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminFileconfig_AdminFileconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -121,7 +121,7 @@ public class AdminFileconfigAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminFileconfig_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminFileconfig_AdminFileconfigEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -139,11 +139,11 @@ public class AdminFileconfigAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminFileconfig_DetailsJsp;
+            next = path_AdminFileconfig_AdminFileconfigDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminFileconfig_EditJsp;
+            next = path_AdminFileconfig_AdminFileconfigEditJsp;
             break;
         }
         final String id = form.id;
@@ -162,8 +162,8 @@ public class AdminFileconfigAction extends FessAdminAction {
         validate(form, messages -> {}, toEditHtml());
         final ScheduledJob scheduledJob = new ScheduledJob();
         scheduledJob.setCrawler(true);
-        return asHtml(path_AdminScheduledjob_EditJsp).useForm(
-                org.codelibs.fess.app.web.admin.scheduledjob.CreateForm.class,
+        return asHtml(path_AdminScheduler_AdminSchedulerEditJsp).useForm(
+                org.codelibs.fess.app.web.admin.scheduler.CreateForm.class,
                 op -> {
                     op.setup(scheduledJobForm -> {
                         scheduledJobForm.initialize();
@@ -187,7 +187,7 @@ public class AdminFileconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminFileconfig_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminFileconfig_AdminFileconfigDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 fileConfigService.getFileConfig(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -300,7 +300,7 @@ public class AdminFileconfigAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminFileconfig_AdminFileconfigEditJsp).renderWith(data -> {
                 registerRolesAndLabels(data);
             });
         };

src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java

@@ -60,10 +60,11 @@ public class AdminGeneralAction extends FessAdminAction {
 
     // ===================================================================================
     //
+
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse index() {
-        return asHtml(path_AdminGeneral_IndexJsp).useForm(EditForm.class, setup -> {
+        return asHtml(path_AdminGeneral_AdminGeneralJsp).useForm(EditForm.class, setup -> {
             setup.setup(form -> {
                 updateForm(form);
             });
@@ -74,7 +75,7 @@ public class AdminGeneralAction extends FessAdminAction {
     //(token = TxToken.VALIDATE)
     public HtmlResponse update(final EditForm form) {
         validate(form, messages -> {}, () -> {
-            return asHtml(path_AdminGeneral_IndexJsp);
+            return asHtml(path_AdminGeneral_AdminGeneralJsp);
         });
 
         updateProperty(Constants.DIFF_CRAWLING_PROPERTY,

src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java

@@ -65,7 +65,7 @@ public class AdminGroupAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminGroup_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminGroup_AdminGroupJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -77,7 +77,7 @@ public class AdminGroupAction extends FessAdminAction {
         }).orElse(() -> {
             groupPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminGroup_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminGroup_AdminGroupJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -85,7 +85,7 @@ public class AdminGroupAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, groupPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminGroup_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminGroup_AdminGroupJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -93,7 +93,7 @@ public class AdminGroupAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         groupPager.clear();
-        return asHtml(path_AdminGroup_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminGroup_AdminGroupJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -114,7 +114,7 @@ public class AdminGroupAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminGroup_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminGroup_AdminGroupEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -130,11 +130,11 @@ public class AdminGroupAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminGroup_DetailsJsp;
+            next = path_AdminGroup_AdminGroupDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminGroup_EditJsp;
+            next = path_AdminGroup_AdminGroupEditJsp;
             break;
         }
         final String id = form.id;
@@ -152,7 +152,7 @@ public class AdminGroupAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminGroup_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminGroup_AdminGroupDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 groupService.getGroup(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -253,7 +253,7 @@ public class AdminGroupAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminGroup_EditJsp);
+            return asHtml(path_AdminGroup_AdminGroupEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java

@@ -59,7 +59,7 @@ public class AdminJoblogAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminJoblog_AdminJoblogJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -67,7 +67,7 @@ public class AdminJoblogAction extends FessAdminAction {
     @Execute
     public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
         jobLogPager.setCurrentPageNumber(pageNumber);
-        return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminJoblog_AdminJoblogJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -75,7 +75,7 @@ public class AdminJoblogAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, jobLogPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminJoblog_AdminJoblogJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -83,14 +83,14 @@ public class AdminJoblogAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         jobLogPager.clear();
-        return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminJoblog_AdminJoblogJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     @Execute
     public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminJoblog_AdminJoblogJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -112,7 +112,7 @@ public class AdminJoblogAction extends FessAdminAction {
     //(token = TxToken.SAVE)
     public HtmlResponse deletepage(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminJoblog_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminJoblog_AdminJoblogDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 jobLogService.getJobLog(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -137,7 +137,7 @@ public class AdminJoblogAction extends FessAdminAction {
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toIndexHtml());
         });
-        return asHtml(path_AdminJoblog_DetailsJsp);
+        return asHtml(path_AdminJoblog_AdminJoblogDetailsJsp);
     }
 
     // -----------------------------------------------------
@@ -146,7 +146,7 @@ public class AdminJoblogAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminJoblog_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminJoblog_AdminJoblogDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 jobLogService.getJobLog(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -192,7 +192,7 @@ public class AdminJoblogAction extends FessAdminAction {
 
     protected VaErrorHook toIndexHtml() {
         return () -> {
-            return asHtml(path_AdminJoblog_IndexJsp);
+            return asHtml(path_AdminJoblog_AdminJoblogJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java

@@ -64,7 +64,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_AdminKeymatchJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -76,7 +76,7 @@ public class AdminKeymatchAction extends FessAdminAction {
         }).orElse(() -> {
             keyMatchPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_AdminKeymatchJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -84,7 +84,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, keyMatchPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_AdminKeymatchJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -92,7 +92,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         keyMatchPager.clear();
-        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminKeymatch_AdminKeymatchJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -113,7 +113,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminKeymatch_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminKeymatch_AdminKeymatchEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -129,11 +129,11 @@ public class AdminKeymatchAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminKeymatch_DetailsJsp;
+            next = path_AdminKeymatch_AdminKeymatchDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminKeymatch_EditJsp;
+            next = path_AdminKeymatch_AdminKeymatchEditJsp;
             break;
         }
         final String id = form.id;
@@ -151,7 +151,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminKeymatch_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminKeymatch_AdminKeymatchDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 keyMatchService.getKeyMatch(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -261,7 +261,7 @@ public class AdminKeymatchAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminKeymatch_EditJsp);
+            return asHtml(path_AdminKeymatch_AdminKeymatchEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java

@@ -67,7 +67,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminLabeltype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminLabeltype_AdminLabeltypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -79,7 +79,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
         }).orElse(() -> {
             labelTypePager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminLabeltype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminLabeltype_AdminLabeltypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -87,7 +87,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, labelTypePager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminLabeltype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminLabeltype_AdminLabeltypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -95,7 +95,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         labelTypePager.clear();
-        return asHtml(path_AdminLabeltype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminLabeltype_AdminLabeltypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -116,7 +116,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminLabeltype_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminLabeltype_AdminLabeltypeEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -134,11 +134,11 @@ public class AdminLabeltypeAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminLabeltype_DetailsJsp;
+            next = path_AdminLabeltype_AdminLabeltypeDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminLabeltype_EditJsp;
+            next = path_AdminLabeltype_AdminLabeltypeEditJsp;
             break;
         }
         final String id = form.id;
@@ -158,7 +158,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminLabeltype_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminLabeltype_AdminLabeltypeDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 labelTypeService.getLabelType(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -271,7 +271,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminLabeltype_AdminLabeltypeEditJsp).renderWith(data -> {
                 registerRoleTypeItems(data);
             });
         };

src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java

@@ -106,7 +106,7 @@ public class AdminLogAction extends FessAdminAction {
     }
 
     private HtmlResponse toIndexPage() {
-        return asHtml(path_AdminLog_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminLog_AdminLogJsp).renderWith(data -> {
             data.register("logFileItems", getLogFileItems());
         });
     }

src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.pathmapping;
+package org.codelibs.fess.app.web.admin.pathmap;
 
 import javax.annotation.Resource;
 
@@ -38,7 +38,7 @@ import org.lastaflute.web.validation.VaErrorHook;
  * @author Shunji Makino
  * @author Keiichi Watanabe
  */
-public class AdminPathmappingAction extends FessAdminAction {
+public class AdminPathmapAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -64,7 +64,7 @@ public class AdminPathmappingAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminPathmapping_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -76,7 +76,7 @@ public class AdminPathmappingAction extends FessAdminAction {
         }).orElse(() -> {
             pathMappingPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminPathmapping_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -84,7 +84,7 @@ public class AdminPathmappingAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, pathMappingPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminPathmapping_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -92,7 +92,7 @@ public class AdminPathmappingAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         pathMappingPager.clear();
-        return asHtml(path_AdminPathmapping_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -113,7 +113,7 @@ public class AdminPathmappingAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminPathmapping_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminPathmap_AdminPathmapEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -129,11 +129,11 @@ public class AdminPathmappingAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminPathmapping_DetailsJsp;
+            next = path_AdminPathmap_AdminPathmapDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminPathmapping_EditJsp;
+            next = path_AdminPathmap_AdminPathmapEditJsp;
             break;
         }
         final String id = form.id;
@@ -151,7 +151,7 @@ public class AdminPathmappingAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminPathmapping_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminPathmap_AdminPathmapDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 pathMappingService.getPathMapping(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -257,7 +257,7 @@ public class AdminPathmappingAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminPathmapping_EditJsp);
+            return asHtml(path_AdminPathmap_AdminPathmapEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.pathmapping;
+package org.codelibs.fess.app.web.admin.pathmap;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.overlappinghost;
+package org.codelibs.fess.app.web.admin.pathmap;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/pathmap/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.pathmapping;
+package org.codelibs.fess.app.web.admin.pathmap;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.requestheader;
+package org.codelibs.fess.app.web.admin.reqheader;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +48,7 @@ import org.lastaflute.web.validation.VaErrorHook;
  * @author Shunji Makino
  * @author Keiichi Watanabe
  */
-public class AdminRequestheaderAction extends FessAdminAction {
+public class AdminReqheaderAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -76,7 +76,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -88,7 +88,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
         }).orElse(() -> {
             requestHeaderPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -96,7 +96,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, requestHeaderPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -104,7 +104,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         requestHeaderPager.clear();
-        return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -126,7 +126,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminRequestheader_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminReqheader_AdminReqheaderEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -145,11 +145,11 @@ public class AdminRequestheaderAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminRequestheader_DetailsJsp;
+            next = path_AdminReqheader_AdminReqheaderDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminRequestheader_EditJsp;
+            next = path_AdminReqheader_AdminReqheaderEditJsp;
             break;
         }
         final String id = form.id;
@@ -170,7 +170,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminRequestheader_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminReqheader_AdminReqheaderDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -307,7 +307,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminReqheader_AdminReqheaderEditJsp).renderWith(data -> {
                 registerProtocolSchemeItems(data);
                 registerWebConfigItems(data);
             });

src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.requestheader;
+package org.codelibs.fess.app.web.admin.reqheader;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2012-2015 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.codelibs.fess.app.web.admin.reqheader;
+
+import javax.validation.constraints.Size;
+
+import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
+
+/**
+ * @author Keiichi Watanabe
+ */
+public class EditForm extends CreateForm {
+
+    private static final long serialVersionUID = 1L;
+
+    @Required
+    @Size(max = 1000)
+    public String id;
+
+    @Size(max = 1000)
+    public String updatedBy;
+
+    @ValidateTypeFailure
+    public Long updatedTime;
+
+    @Required
+    @ValidateTypeFailure
+    public Integer versionNo;
+
+}

src/main/java/org/codelibs/fess/app/web/admin/reqheader/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.requestheader;
+package org.codelibs.fess.app.web.admin.reqheader;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java

@@ -65,7 +65,7 @@ public class AdminRoleAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminRole_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRole_AdminRoleJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -77,7 +77,7 @@ public class AdminRoleAction extends FessAdminAction {
         }).orElse(() -> {
             rolePager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminRole_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRole_AdminRoleJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -85,7 +85,7 @@ public class AdminRoleAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, rolePager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminRole_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRole_AdminRoleJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -93,7 +93,7 @@ public class AdminRoleAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         rolePager.clear();
-        return asHtml(path_AdminRole_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRole_AdminRoleJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -114,7 +114,7 @@ public class AdminRoleAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminRole_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminRole_AdminRoleEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -130,11 +130,11 @@ public class AdminRoleAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminRole_DetailsJsp;
+            next = path_AdminRole_AdminRoleDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminRole_EditJsp;
+            next = path_AdminRole_AdminRoleEditJsp;
             break;
         }
         final String id = form.id;
@@ -152,7 +152,7 @@ public class AdminRoleAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminRole_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminRole_AdminRoleDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 roleService.getRole(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -253,7 +253,7 @@ public class AdminRoleAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminRole_EditJsp);
+            return asHtml(path_AdminRole_AdminRoleEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java

@@ -63,7 +63,7 @@ public class AdminRoletypeAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRoletype_AdminRoletypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -75,7 +75,7 @@ public class AdminRoletypeAction extends FessAdminAction {
         }).orElse(() -> {
             roleTypePager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRoletype_AdminRoletypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -83,7 +83,7 @@ public class AdminRoletypeAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, roleTypePager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRoletype_AdminRoletypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -91,7 +91,7 @@ public class AdminRoletypeAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         roleTypePager.clear();
-        return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminRoletype_AdminRoletypeJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -112,7 +112,7 @@ public class AdminRoletypeAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminRoletype_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminRoletype_AdminRoletypeEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -128,11 +128,11 @@ public class AdminRoletypeAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminRoletype_DetailsJsp;
+            next = path_AdminRoletype_AdminRoletypeDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminRoletype_EditJsp;
+            next = path_AdminRoletype_AdminRoletypeEditJsp;
             break;
         }
         final String id = form.id;
@@ -150,7 +150,7 @@ public class AdminRoletypeAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminRoletype_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminRoletype_AdminRoletypeDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 roleTypeService.getRoleType(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -256,7 +256,7 @@ public class AdminRoletypeAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminRoletype_EditJsp);
+            return asHtml(path_AdminRoletype_AdminRoletypeEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.scheduledjob;
+package org.codelibs.fess.app.web.admin.scheduler;
 
 import javax.annotation.Resource;
 
@@ -40,7 +40,7 @@ import org.lastaflute.web.validation.VaErrorHook;
  * @author shinsuke
  * @author Keiichi Watanabe
  */
-public class AdminScheduledjobAction extends FessAdminAction {
+public class AdminSchedulerAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -68,7 +68,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -80,7 +80,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
         }).orElse(() -> {
             scheduledJobPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -88,7 +88,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, scheduledJobPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -96,7 +96,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         scheduledJobPager.clear();
-        return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -117,7 +117,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminScheduledjob_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminScheduler_AdminSchedulerEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -133,11 +133,11 @@ public class AdminScheduledjobAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminScheduledjob_DetailsJsp;
+            next = path_AdminScheduler_AdminSchedulerDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminScheduledjob_EditJsp;
+            next = path_AdminScheduler_AdminSchedulerEditJsp;
             break;
         }
         final String id = form.id;
@@ -155,7 +155,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminScheduledjob_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminScheduler_AdminSchedulerDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
                     loadScheduledJob(form, entity);
@@ -317,7 +317,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminScheduledjob_EditJsp);
+            return asHtml(path_AdminScheduler_AdminSchedulerEditJsp);
         };
     }
 }

src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.scheduledjob;
+package org.codelibs.fess.app.web.admin.scheduler;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.scheduledjob;
+package org.codelibs.fess.app.web.admin.scheduler;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/scheduler/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.scheduledjob;
+package org.codelibs.fess.app.web.admin.scheduler;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java

@@ -109,19 +109,19 @@ public class AdminSearchlistAction extends FessAdminAction {
     // ==============
     @Execute
     public HtmlResponse index(final ListForm form) {
-        validate(form, messages -> {}, () -> asHtml(path_ErrorJsp));
-        return asHtml(path_AdminSearchlist_IndexJsp);
+        validate(form, messages -> {}, () -> asHtml(path_AdminError_AdminErrorJsp));
+        return asHtml(path_AdminSearchlist_AdminSearchlistJsp);
     }
 
     protected HtmlResponse doSearch(final ListForm form) {
-        validate(form, messages -> {}, () -> asHtml(path_AdminSearchlist_IndexJsp));
+        validate(form, messages -> {}, () -> asHtml(path_AdminSearchlist_AdminSearchlistJsp));
 
         if (StringUtil.isBlank(form.query)) {
             // redirect to index page
             form.query = null;
             return redirect(getClass());
         }
-        return asHtml(path_AdminSearchlist_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminSearchlist_AdminSearchlistJsp).renderWith(data -> {
             doSearchInternal(data, form);
         });
     }
@@ -135,14 +135,14 @@ public class AdminSearchlistAction extends FessAdminAction {
             if (logger.isDebugEnabled()) {
                 logger.debug(e.getMessage(), e);
             }
-            throwValidationError(e.getMessageCode(), () -> asHtml(path_AdminSearchlist_IndexJsp));
+            throwValidationError(e.getMessageCode(), () -> asHtml(path_AdminSearchlist_AdminSearchlistJsp));
         } catch (final ResultOffsetExceededException e) {
             if (logger.isDebugEnabled()) {
                 logger.debug(e.getMessage(), e);
             }
             throwValidationError(messages -> {
                 messages.addErrorsResultSizeExceeded(GLOBAL);
-            }, () -> asHtml(path_ErrorJsp));
+            }, () -> asHtml(path_AdminError_AdminErrorJsp));
         }
     }
 
@@ -185,11 +185,11 @@ public class AdminSearchlistAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse delete(final DeleteForm form) {
-        validate(form, messages -> {}, () -> asHtml(path_AdminSearchlist_IndexJsp));
+        validate(form, messages -> {}, () -> asHtml(path_AdminSearchlist_AdminSearchlistJsp));
         final String docId = form.docId;
         if (jobHelper.isCrawlProcessRunning()) {
             throwValidationError(messages -> messages.addErrorsCannotDeleteDocBecauseOfRunning(GLOBAL),
-                    () -> asHtml(path_AdminSearchlist_IndexJsp));
+                    () -> asHtml(path_AdminSearchlist_AdminSearchlistJsp));
         }
         try {
             final QueryBuilder query = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId);
@@ -197,7 +197,7 @@ public class AdminSearchlistAction extends FessAdminAction {
             saveInfo(messages -> messages.addSuccessDeleteSolrIndex(GLOBAL));
         } catch (final Exception e) {
             throwValidationError(messages -> messages.addErrorsFailedToDeleteDocInAdmin(GLOBAL),
-                    () -> asHtml(path_AdminSearchlist_IndexJsp));
+                    () -> asHtml(path_AdminSearchlist_AdminSearchlistJsp));
         }
         return redirectWith(getClass(), moreUrl("search").params("query", form.query));
     }

src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/EditForm.java

@@ -1,44 +0,0 @@
-/*
- * Copyright 2012-2015 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.app.web.admin.suggestelevateword;
-
-import javax.validation.constraints.Size;
-
-import org.lastaflute.web.validation.Required;
-import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
-
-/**
- * @author Keiichi Watanabe
- */
-public class EditForm extends CreateForm {
-
-    private static final long serialVersionUID = 1L;
-
-    @Required
-    @Size(max = 1000)
-    public String id;
-
-    @Size(max = 1000)
-    public String updatedBy;
-
-    @ValidateTypeFailure
-    public Long updatedTime;
-
-    @Required
-    @ValidateTypeFailure
-    public Integer versionNo;
-
-}

src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java

@@ -63,7 +63,7 @@ public class AdminSysteminfoAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SystemInfoForm form) {
-        return asHtml(path_AdminSysteminfo_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminSysteminfo_AdminSysteminfoJsp).renderWith(data -> {
             registerEnvItems(data);
             registerPropItems(data);
             registerFessPropItems(data);

src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java

@@ -78,7 +78,7 @@ public class AdminUserAction extends FessAdminAction {
     @Execute
     public HtmlResponse index(final SearchForm form) {
         clearStoredPassword();
-        return asHtml(path_AdminUser_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminUser_AdminUserJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -91,7 +91,7 @@ public class AdminUserAction extends FessAdminAction {
         }).orElse(() -> {
             userPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminUser_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminUser_AdminUserJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -100,7 +100,7 @@ public class AdminUserAction extends FessAdminAction {
     public HtmlResponse search(final SearchForm form) {
         clearStoredPassword();
         copyBeanToBean(form, userPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminUser_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminUser_AdminUserJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -109,7 +109,7 @@ public class AdminUserAction extends FessAdminAction {
     public HtmlResponse reset(final SearchForm form) {
         clearStoredPassword();
         userPager.clear();
-        return asHtml(path_AdminUser_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminUser_AdminUserJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -135,7 +135,7 @@ public class AdminUserAction extends FessAdminAction {
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
         clearStoredPassword();
-        return asHtml(path_AdminUser_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminUser_AdminUserEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -153,11 +153,11 @@ public class AdminUserAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminUser_DetailsJsp;
+            next = path_AdminUser_AdminUserDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminUser_EditJsp;
+            next = path_AdminUser_AdminUserEditJsp;
             break;
         }
         final String id = form.id;
@@ -179,7 +179,7 @@ public class AdminUserAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminUser_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminUser_AdminUserDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 userService.getUser(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -339,7 +339,7 @@ public class AdminUserAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminUser_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminUser_AdminUserEditJsp).renderWith(data -> {
                 registerForms(data);
             });
         };

src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.webauthentication;
+package org.codelibs.fess.app.web.admin.webauth;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -47,7 +47,7 @@ import org.lastaflute.web.validation.VaErrorHook;
  * @author shinsuke
  * @author Shunji Makino
  */
-public class AdminWebauthenticationAction extends FessAdminAction {
+public class AdminWebauthAction extends FessAdminAction {
 
     // ===================================================================================
     //                                                                           Attribute
@@ -76,7 +76,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -88,7 +88,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
         }).orElse(() -> {
             webAuthenticationPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -96,7 +96,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, webAuthenticationPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -104,7 +104,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         webAuthenticationPager.clear();
-        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -125,7 +125,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminWebauthentication_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminWebauth_AdminWebauthEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -144,11 +144,11 @@ public class AdminWebauthenticationAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminWebauthentication_DetailsJsp;
+            next = path_AdminWebauth_AdminWebauthDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminWebauthentication_EditJsp;
+            next = path_AdminWebauth_AdminWebauthEditJsp;
             break;
         }
         final String id = form.id;
@@ -169,7 +169,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminWebauthentication_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminWebauth_AdminWebauthDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -306,7 +306,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminWebauthentication_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminWebauth_AdminWebauthEditJsp).renderWith(data -> {
                 registerWebConfigItems(data);
             });
         };

src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.webauthentication;
+package org.codelibs.fess.app.web.admin.webauth;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.webauthentication;
+package org.codelibs.fess.app.web.admin.webauth;
 
 import javax.validation.constraints.Size;
 

src/main/java/org/codelibs/fess/app/web/admin/webauth/SearchForm.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.admin.webauthentication;
+package org.codelibs.fess.app.web.admin.webauth;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java

@@ -76,7 +76,7 @@ public class AdminWebconfigAction extends FessAdminAction {
     //                                                                      ==============
     @Execute
     public HtmlResponse index(final SearchForm form) {
-        return asHtml(path_AdminWebconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebconfig_AdminWebconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -88,7 +88,7 @@ public class AdminWebconfigAction extends FessAdminAction {
         }).orElse(() -> {
             webConfigPager.setCurrentPageNumber(0);
         });
-        return asHtml(path_AdminWebconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebconfig_AdminWebconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -96,7 +96,7 @@ public class AdminWebconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse search(final SearchForm form) {
         copyBeanToBean(form, webConfigPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
-        return asHtml(path_AdminWebconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebconfig_AdminWebconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -104,7 +104,7 @@ public class AdminWebconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse reset(final SearchForm form) {
         webConfigPager.clear();
-        return asHtml(path_AdminWebconfig_IndexJsp).renderWith(data -> {
+        return asHtml(path_AdminWebconfig_AdminWebconfigJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
@@ -125,7 +125,7 @@ public class AdminWebconfigAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse createnew() {
-        return asHtml(path_AdminWebconfig_EditJsp).useForm(CreateForm.class, op -> {
+        return asHtml(path_AdminWebconfig_AdminWebconfigEditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
                 form.crudMode = CrudMode.CREATE;
@@ -143,11 +143,11 @@ public class AdminWebconfigAction extends FessAdminAction {
         switch (form.crudMode) {
         case CrudMode.EDIT: // back
             form.crudMode = CrudMode.DETAILS;
-            next = path_AdminWebconfig_DetailsJsp;
+            next = path_AdminWebconfig_AdminWebconfigDetailsJsp;
             break;
         default:
             form.crudMode = CrudMode.EDIT;
-            next = path_AdminWebconfig_EditJsp;
+            next = path_AdminWebconfig_AdminWebconfigEditJsp;
             break;
         }
         final String id = form.id;
@@ -166,8 +166,8 @@ public class AdminWebconfigAction extends FessAdminAction {
         validate(form, messages -> {}, toEditHtml());
         final ScheduledJob scheduledJob = new ScheduledJob();
         scheduledJob.setCrawler(true);
-        return asHtml(path_AdminScheduledjob_EditJsp).useForm(
-                org.codelibs.fess.app.web.admin.scheduledjob.CreateForm.class,
+        return asHtml(path_AdminScheduler_AdminSchedulerEditJsp).useForm(
+                org.codelibs.fess.app.web.admin.scheduler.CreateForm.class,
                 op -> {
                     op.setup(scheduledJobForm -> {
                         scheduledJobForm.initialize();
@@ -191,7 +191,7 @@ public class AdminWebconfigAction extends FessAdminAction {
     @Execute
     public HtmlResponse details(final int crudMode, final String id) {
         verifyCrudMode(crudMode, CrudMode.DETAILS);
-        return asHtml(path_AdminWebconfig_DetailsJsp).useForm(EditForm.class, op -> {
+        return asHtml(path_AdminWebconfig_AdminWebconfigDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 webConfigService.getWebConfig(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -304,7 +304,7 @@ public class AdminWebconfigAction extends FessAdminAction {
 
     protected VaErrorHook toEditHtml() {
         return () -> {
-            return asHtml(path_AdminWebconfig_EditJsp).renderWith(data -> {
+            return asHtml(path_AdminWebconfig_AdminWebconfigEditJsp).renderWith(data -> {
                 registerRolesAndLabels(data);
             });
         };

src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java

@@ -87,20 +87,20 @@ public class AdminWizardAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse index() {
-        return asHtml(path_AdminWizard_IndexJsp).useForm(IndexForm.class);
+        return asHtml(path_AdminWizard_AdminWizardJsp).useForm(IndexForm.class);
     }
 
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse crawlingConfigForm() {
-        return asHtml(path_AdminWizard_CrawlingConfigJsp).useForm(CrawlingConfigForm.class);
+        return asHtml(path_AdminWizard_AdminWizardConfigJsp).useForm(CrawlingConfigForm.class);
     }
 
     @Execute
     //(token = TxToken.VALIDATE)
     public HtmlResponse crawlingConfig(final CrawlingConfigForm form) {
         validate(form, messages -> {}, () -> {
-            return asHtml(path_AdminWizard_CrawlingConfigJsp);
+            return asHtml(path_AdminWizard_AdminWizardConfigJsp);
         });
         final String name = crawlingConfigInternal(form);
         saveInfo(messages -> messages.addSuccessCreateCrawlingConfigAtWizard(GLOBAL, name));
@@ -111,7 +111,7 @@ public class AdminWizardAction extends FessAdminAction {
     //(token = TxToken.VALIDATE)
     public HtmlResponse crawlingConfigNext(final CrawlingConfigForm form) {
         validate(form, messages -> {}, () -> {
-            return asHtml(path_AdminWizard_CrawlingConfigJsp);
+            return asHtml(path_AdminWizard_AdminWizardConfigJsp);
         });
         final String name = crawlingConfigInternal(form);
         saveInfo(messages -> messages.addSuccessCreateCrawlingConfigAtWizard(GLOBAL, name));
@@ -207,7 +207,7 @@ public class AdminWizardAction extends FessAdminAction {
         } catch (final Exception e) {
             logger.error("Failed to create crawling config: " + form.crawlingConfigPath, e);
             throwValidationError(messages -> messages.addErrorsFailedToCreateCrawlingConfigAtWizard(GLOBAL), () -> {
-                return asHtml(path_AdminWizard_CrawlingConfigJsp);
+                return asHtml(path_AdminWizard_AdminWizardConfigJsp);
             });
             return null;
         }
@@ -271,7 +271,7 @@ public class AdminWizardAction extends FessAdminAction {
     @Execute
     //(token = TxToken.SAVE)
     public HtmlResponse startCrawlingForm() {
-        return asHtml(path_AdminWizard_StartCrawlingJsp).useForm(StartCrawlingForm.class);
+        return asHtml(path_AdminWizard_AdminWizardStartJsp).useForm(StartCrawlingForm.class);
     }
 
     @Execute

src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java

@@ -53,9 +53,9 @@ import org.codelibs.fess.es.config.exentity.CrawlingConfig;
 import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingSessionHelper;
+import org.codelibs.fess.helper.DuplicateHostHelper;
 import org.codelibs.fess.helper.FileTypeHelper;
 import org.codelibs.fess.helper.LabelTypeHelper;
-import org.codelibs.fess.helper.OverlappingHostHelper;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
@@ -439,9 +439,9 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer {
 
     protected String replaceOverlappingHost(final String url) {
         try {
-            // remove overlapping host
-            final OverlappingHostHelper overlappingHostHelper = ComponentUtil.getOverlappingHostHelper();
-            return overlappingHostHelper.convert(url);
+            // remove duplicate host
+            final DuplicateHostHelper duplicateHostHelper = ComponentUtil.getDuplicateHostHelper();
+            return duplicateHostHelper.convert(url);
         } catch (final Exception e) {
             return url;
         }

src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java

@@ -21,9 +21,9 @@ import java.util.Map;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
-import org.codelibs.fess.es.config.bsentity.dbmeta.OverlappingHostDbm;
-import org.codelibs.fess.es.config.cbean.OverlappingHostCB;
-import org.codelibs.fess.es.config.exentity.OverlappingHost;
+import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
+import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
+import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
@@ -40,7 +40,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsOverlappingHostBhv extends EsAbstractBehavior<OverlappingHost, OverlappingHostCB> {
+public abstract class BsDuplicateHostBhv extends EsAbstractBehavior<DuplicateHost, DuplicateHostCB> {
 
     // ===================================================================================
     //                                                                    Control Override
@@ -57,26 +57,26 @@ public abstract class BsOverlappingHostBhv extends EsAbstractBehavior<Overlappin
 
     @Override
     public String asEsIndexType() {
-        return "overlapping_host";
+        return "duplicate_host";
     }
 
     @Override
     public String asEsSearchType() {
-        return "overlapping_host";
+        return "duplicate_host";
     }
 
     @Override
-    public OverlappingHostDbm asDBMeta() {
-        return OverlappingHostDbm.getInstance();
+    public DuplicateHostDbm asDBMeta() {
+        return DuplicateHostDbm.getInstance();
     }
 
     @Override
-    protected <RESULT extends OverlappingHost> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
+    protected <RESULT extends DuplicateHost> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setOverlappingName(DfTypeUtil.toString(source.get("overlappingName")));
+            result.setDuplicateHostName(DfTypeUtil.toString(source.get("duplicateHostName")));
             result.setRegularName(DfTypeUtil.toString(source.get("regularName")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
@@ -91,26 +91,25 @@ public abstract class BsOverlappingHostBhv extends EsAbstractBehavior<Overlappin
     // ===================================================================================
     //                                                                              Select
     //                                                                              ======
-    public int selectCount(CBCall<OverlappingHostCB> cbLambda) {
+    public int selectCount(CBCall<DuplicateHostCB> cbLambda) {
         return facadeSelectCount(createCB(cbLambda));
     }
 
-    public OptionalEntity<OverlappingHost> selectEntity(CBCall<OverlappingHostCB> cbLambda) {
+    public OptionalEntity<DuplicateHost> selectEntity(CBCall<DuplicateHostCB> cbLambda) {
         return facadeSelectEntity(createCB(cbLambda));
     }
 
-    protected OptionalEntity<OverlappingHost> facadeSelectEntity(OverlappingHostCB cb) {
+    protected OptionalEntity<DuplicateHost> facadeSelectEntity(DuplicateHostCB cb) {
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends OverlappingHost> OptionalEntity<ENTITY> doSelectOptionalEntity(OverlappingHostCB cb,
-            Class<? extends ENTITY> tp) {
+    protected <ENTITY extends DuplicateHost> OptionalEntity<ENTITY> doSelectOptionalEntity(DuplicateHostCB cb, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
     @Override
-    public OverlappingHostCB newConditionBean() {
-        return new OverlappingHostCB();
+    public DuplicateHostCB newConditionBean() {
+        return new DuplicateHostCB();
     }
 
     @Override
@@ -118,135 +117,135 @@ public abstract class BsOverlappingHostBhv extends EsAbstractBehavior<Overlappin
         return facadeSelectEntity(downcast(cb)).orElse(null);
     }
 
-    public OverlappingHost selectEntityWithDeletedCheck(CBCall<OverlappingHostCB> cbLambda) {
+    public DuplicateHost selectEntityWithDeletedCheck(CBCall<DuplicateHostCB> cbLambda) {
         return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
     }
 
-    public OptionalEntity<OverlappingHost> selectByPK(String id) {
+    public OptionalEntity<DuplicateHost> selectByPK(String id) {
         return facadeSelectByPK(id);
     }
 
-    protected OptionalEntity<OverlappingHost> facadeSelectByPK(String id) {
+    protected OptionalEntity<DuplicateHost> facadeSelectByPK(String id) {
         return doSelectOptionalByPK(id, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends OverlappingHost> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends DuplicateHost> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
         return doSelectEntity(xprepareCBAsPK(id), tp);
     }
 
-    protected OverlappingHostCB xprepareCBAsPK(String id) {
+    protected DuplicateHostCB xprepareCBAsPK(String id) {
         assertObjectNotNull("id", id);
         return newConditionBean().acceptPK(id);
     }
 
-    protected <ENTITY extends OverlappingHost> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends DuplicateHost> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectByPK(id, tp), id);
     }
 
     @Override
-    protected Class<? extends OverlappingHost> typeOfSelectedEntity() {
-        return OverlappingHost.class;
+    protected Class<? extends DuplicateHost> typeOfSelectedEntity() {
+        return DuplicateHost.class;
     }
 
     @Override
-    protected Class<OverlappingHost> typeOfHandlingEntity() {
-        return OverlappingHost.class;
+    protected Class<DuplicateHost> typeOfHandlingEntity() {
+        return DuplicateHost.class;
     }
 
     @Override
-    protected Class<OverlappingHostCB> typeOfHandlingConditionBean() {
-        return OverlappingHostCB.class;
+    protected Class<DuplicateHostCB> typeOfHandlingConditionBean() {
+        return DuplicateHostCB.class;
     }
 
-    public ListResultBean<OverlappingHost> selectList(CBCall<OverlappingHostCB> cbLambda) {
+    public ListResultBean<DuplicateHost> selectList(CBCall<DuplicateHostCB> cbLambda) {
         return facadeSelectList(createCB(cbLambda));
     }
 
-    public PagingResultBean<OverlappingHost> selectPage(CBCall<OverlappingHostCB> cbLambda) {
+    public PagingResultBean<DuplicateHost> selectPage(CBCall<DuplicateHostCB> cbLambda) {
         // #pending same?
-        return (PagingResultBean<OverlappingHost>) facadeSelectList(createCB(cbLambda));
+        return (PagingResultBean<DuplicateHost>) facadeSelectList(createCB(cbLambda));
     }
 
-    public void selectCursor(CBCall<OverlappingHostCB> cbLambda, EntityRowHandler<OverlappingHost> entityLambda) {
+    public void selectCursor(CBCall<DuplicateHostCB> cbLambda, EntityRowHandler<DuplicateHost> entityLambda) {
         facadeSelectCursor(createCB(cbLambda), entityLambda);
     }
 
-    public void selectBulk(CBCall<OverlappingHostCB> cbLambda, EntityRowHandler<List<OverlappingHost>> entityLambda) {
+    public void selectBulk(CBCall<DuplicateHostCB> cbLambda, EntityRowHandler<List<DuplicateHost>> entityLambda) {
         delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
     }
 
     // ===================================================================================
     //                                                                              Update
     //                                                                              ======
-    public void insert(OverlappingHost entity) {
+    public void insert(DuplicateHost entity) {
         doInsert(entity, null);
     }
 
-    public void insert(OverlappingHost entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insert(DuplicateHost entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsert(entity, null);
     }
 
-    public void update(OverlappingHost entity) {
+    public void update(DuplicateHost entity) {
         doUpdate(entity, null);
     }
 
-    public void update(OverlappingHost entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void update(DuplicateHost entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doUpdate(entity, null);
     }
 
-    public void insertOrUpdate(OverlappingHost entity) {
+    public void insertOrUpdate(DuplicateHost entity) {
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void insertOrUpdate(OverlappingHost entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insertOrUpdate(DuplicateHost entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void delete(OverlappingHost entity) {
+    public void delete(DuplicateHost entity) {
         doDelete(entity, null);
     }
 
-    public void delete(OverlappingHost entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
+    public void delete(DuplicateHost entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().deleteOption(opLambda);
         }
         doDelete(entity, null);
     }
 
-    public int queryDelete(CBCall<OverlappingHostCB> cbLambda) {
+    public int queryDelete(CBCall<DuplicateHostCB> cbLambda) {
         return doQueryDelete(createCB(cbLambda), null);
     }
 
-    public int[] batchInsert(List<OverlappingHost> list) {
+    public int[] batchInsert(List<DuplicateHost> list) {
         return batchInsert(list, null);
     }
 
-    public int[] batchInsert(List<OverlappingHost> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchInsert(List<DuplicateHost> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchInsert(new BulkList<>(list, call), null);
     }
 
-    public int[] batchUpdate(List<OverlappingHost> list) {
+    public int[] batchUpdate(List<DuplicateHost> list) {
         return batchUpdate(list, null);
     }
 
-    public int[] batchUpdate(List<OverlappingHost> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchUpdate(List<DuplicateHost> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchUpdate(new BulkList<>(list, call), null);
     }
 
-    public int[] batchDelete(List<OverlappingHost> list) {
+    public int[] batchDelete(List<DuplicateHost> list) {
         return batchDelete(list, null);
     }
 
-    public int[] batchDelete(List<OverlappingHost> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchDelete(List<DuplicateHost> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchDelete(new BulkList<>(list, call), null);
     }
 

src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java

@@ -20,13 +20,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.OverlappingHostDbm;
+import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
 
 /**
  * ${table.comment}
  * @author ESFlute (using FreeGen)
  */
-public class BsOverlappingHost extends EsAbstractEntity {
+public class BsDuplicateHost extends EsAbstractEntity {
 
     // ===================================================================================
     //                                                                          Definition
@@ -43,8 +43,8 @@ public class BsOverlappingHost extends EsAbstractEntity {
     /** createdTime */
     protected Long createdTime;
 
-    /** overlappingName */
-    protected String overlappingName;
+    /** duplicateHostName */
+    protected String duplicateHostName;
 
     /** regularName */
     protected String regularName;
@@ -64,13 +64,13 @@ public class BsOverlappingHost extends EsAbstractEntity {
     //                                                                             DB Meta
     //                                                                             =======
     @Override
-    public OverlappingHostDbm asDBMeta() {
-        return OverlappingHostDbm.getInstance();
+    public DuplicateHostDbm asDBMeta() {
+        return DuplicateHostDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "overlapping_host";
+        return "duplicate_host";
     }
 
     // ===================================================================================
@@ -85,8 +85,8 @@ public class BsOverlappingHost extends EsAbstractEntity {
         if (createdTime != null) {
             sourceMap.put("createdTime", createdTime);
         }
-        if (overlappingName != null) {
-            sourceMap.put("overlappingName", overlappingName);
+        if (duplicateHostName != null) {
+            sourceMap.put("duplicateHostName", duplicateHostName);
         }
         if (regularName != null) {
             sourceMap.put("regularName", regularName);
@@ -111,7 +111,7 @@ public class BsOverlappingHost extends EsAbstractEntity {
         StringBuilder sb = new StringBuilder();
         sb.append(dm).append(createdBy);
         sb.append(dm).append(createdTime);
-        sb.append(dm).append(overlappingName);
+        sb.append(dm).append(duplicateHostName);
         sb.append(dm).append(regularName);
         sb.append(dm).append(sortOrder);
         sb.append(dm).append(updatedBy);
@@ -146,14 +146,14 @@ public class BsOverlappingHost extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getOverlappingName() {
-        checkSpecifiedProperty("overlappingName");
-        return convertEmptyToNull(overlappingName);
+    public String getDuplicateHostName() {
+        checkSpecifiedProperty("duplicateHostName");
+        return convertEmptyToNull(duplicateHostName);
     }
 
-    public void setOverlappingName(String value) {
-        registerModifiedProperty("overlappingName");
-        this.overlappingName = value;
+    public void setDuplicateHostName(String value) {
+        registerModifiedProperty("duplicateHostName");
+        this.duplicateHostName = value;
     }
 
     public String getRegularName() {

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.OverlappingHost;
+import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -32,19 +32,19 @@ import org.dbflute.util.DfTypeUtil;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class OverlappingHostDbm extends AbstractDBMeta {
+public class DuplicateHostDbm extends AbstractDBMeta {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
     // ===================================================================================
     //                                                                           Singleton
     //                                                                           =========
-    private static final OverlappingHostDbm _instance = new OverlappingHostDbm();
+    private static final DuplicateHostDbm _instance = new DuplicateHostDbm();
 
-    private OverlappingHostDbm() {
+    private DuplicateHostDbm() {
     }
 
-    public static OverlappingHostDbm getInstance() {
+    public static DuplicateHostDbm getInstance() {
         return _instance;
     }
 
@@ -79,20 +79,20 @@ public class OverlappingHostDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getCreatedBy(),
-                (et, vl) -> ((OverlappingHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getCreatedTime(),
-                (et, vl) -> ((OverlappingHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getOverlappingName(),
-                (et, vl) -> ((OverlappingHost) et).setOverlappingName(DfTypeUtil.toString(vl)), "overlappingName");
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getRegularName(),
-                (et, vl) -> ((OverlappingHost) et).setRegularName(DfTypeUtil.toString(vl)), "regularName");
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getSortOrder(),
-                (et, vl) -> ((OverlappingHost) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getUpdatedBy(),
-                (et, vl) -> ((OverlappingHost) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getUpdatedTime(),
-                (et, vl) -> ((OverlappingHost) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedBy(),
+                (et, vl) -> ((DuplicateHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedTime(),
+                (et, vl) -> ((DuplicateHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et -> ((DuplicateHost) et).getDuplicateHostName(),
+                (et, vl) -> ((DuplicateHost) et).setDuplicateHostName(DfTypeUtil.toString(vl)), "duplicateHostName");
+        setupEpg(_epgMap, et -> ((DuplicateHost) et).getRegularName(),
+                (et, vl) -> ((DuplicateHost) et).setRegularName(DfTypeUtil.toString(vl)), "regularName");
+        setupEpg(_epgMap, et -> ((DuplicateHost) et).getSortOrder(),
+                (et, vl) -> ((DuplicateHost) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
+        setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedBy(),
+                (et, vl) -> ((DuplicateHost) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedTime(),
+                (et, vl) -> ((DuplicateHost) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
     }
 
     @Override
@@ -103,9 +103,9 @@ public class OverlappingHostDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                          Table Info
     //                                                                          ==========
-    protected final String _tableDbName = "overlapping_host";
-    protected final String _tableDispName = "overlapping_host";
-    protected final String _tablePropertyName = "OverlappingHost";
+    protected final String _tableDbName = "duplicate_host";
+    protected final String _tableDispName = "duplicate_host";
+    protected final String _tablePropertyName = "DuplicateHost";
 
     public String getTableDbName() {
         return _tableDbName;
@@ -133,8 +133,8 @@ public class OverlappingHostDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnOverlappingName = cci("overlappingName", "overlappingName", null, null, String.class,
-            "overlappingName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class,
+            "duplicateHostName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
@@ -152,8 +152,8 @@ public class OverlappingHostDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnOverlappingName() {
-        return _columnOverlappingName;
+    public ColumnInfo columnDuplicateHostName() {
+        return _columnDuplicateHostName;
     }
 
     public ColumnInfo columnRegularName() {
@@ -176,7 +176,7 @@ public class OverlappingHostDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnOverlappingName());
+        ls.add(columnDuplicateHostName());
         ls.add(columnRegularName());
         ls.add(columnSortOrder());
         ls.add(columnUpdatedBy());
@@ -207,17 +207,17 @@ public class OverlappingHostDbm extends AbstractDBMeta {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.OverlappingHost";
+        return "org.codelibs.fess.es.config.exentity.DuplicateHost";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.OverlappingHostCB";
+        return "org.codelibs.fess.es.config.cbean.DuplicateHostCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.OverlappingHostBhv";
+        return "org.codelibs.fess.es.config.exbhv.DuplicateHostBhv";
     }
 
     // ===================================================================================
@@ -225,7 +225,7 @@ public class OverlappingHostDbm extends AbstractDBMeta {
     //                                                                         ===========
     @Override
     public Class<? extends Entity> getEntityType() {
-        return OverlappingHost.class;
+        return DuplicateHost.class;
     }
 
     // ===================================================================================
@@ -233,7 +233,7 @@ public class OverlappingHostDbm extends AbstractDBMeta {
     //                                                                     ===============
     @Override
     public Entity newEntity() {
-        return new OverlappingHost();
+        return new DuplicateHost();
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsOverlappingHostCB;
+import org.codelibs.fess.es.config.cbean.bs.BsDuplicateHostCB;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class OverlappingHostCB extends BsOverlappingHostCB {
+public class DuplicateHostCB extends BsDuplicateHostCB {
 }

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java

@@ -20,10 +20,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
-import org.codelibs.fess.es.config.bsentity.dbmeta.OverlappingHostDbm;
-import org.codelibs.fess.es.config.cbean.OverlappingHostCB;
-import org.codelibs.fess.es.config.cbean.cq.OverlappingHostCQ;
-import org.codelibs.fess.es.config.cbean.cq.bs.BsOverlappingHostCQ;
+import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
+import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
+import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
@@ -32,25 +32,25 @@ import org.elasticsearch.index.query.QueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class BsOverlappingHostCB extends EsAbstractConditionBean {
+public class BsDuplicateHostCB extends EsAbstractConditionBean {
 
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected BsOverlappingHostCQ _conditionQuery;
+    protected BsDuplicateHostCQ _conditionQuery;
     protected HpSpecification _specification;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
     @Override
-    public OverlappingHostDbm asDBMeta() {
-        return OverlappingHostDbm.getInstance();
+    public DuplicateHostDbm asDBMeta() {
+        return DuplicateHostDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "overlapping_host";
+        return "duplicate_host";
     }
 
     @Override
@@ -66,11 +66,11 @@ public class BsOverlappingHostCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                         Primary Key
     //                                                                         ===========
-    public OverlappingHostCB acceptPK(String id) {
+    public DuplicateHostCB acceptPK(String id) {
         assertObjectNotNull("id", id);
-        BsOverlappingHostCB cb = this;
+        BsDuplicateHostCB cb = this;
         cb.query().docMeta().setId_Equal(id);
-        return (OverlappingHostCB) this;
+        return (DuplicateHostCB) this;
     }
 
     @Override
@@ -114,20 +114,20 @@ public class BsOverlappingHostCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Query
     //                                                                               =====
-    public BsOverlappingHostCQ query() {
+    public BsDuplicateHostCQ query() {
         assertQueryPurpose();
         return doGetConditionQuery();
     }
 
-    protected BsOverlappingHostCQ doGetConditionQuery() {
+    protected BsDuplicateHostCQ doGetConditionQuery() {
         if (_conditionQuery == null) {
             _conditionQuery = createLocalCQ();
         }
         return _conditionQuery;
     }
 
-    protected BsOverlappingHostCQ createLocalCQ() {
-        return new OverlappingHostCQ();
+    protected BsDuplicateHostCQ createLocalCQ() {
+        return new DuplicateHostCQ();
     }
 
     // ===================================================================================
@@ -166,8 +166,8 @@ public class BsOverlappingHostCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnOverlappingName() {
-            doColumn("overlappingName");
+        public void columnDuplicateHostName() {
+            doColumn("duplicateHostName");
         }
 
         public void columnRegularName() {

src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsOverlappingHostCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class OverlappingHostCQ extends BsOverlappingHostCQ {
+public class DuplicateHostCQ extends BsDuplicateHostCQ {
 }

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.OverlappingHostCQ;
+import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -36,7 +36,7 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
+public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
@@ -45,33 +45,33 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
     //                                                                       =============
     @Override
     public String asTableDbName() {
-        return "overlapping_host";
+        return "duplicate_host";
     }
 
     @Override
     public String xgetAliasName() {
-        return "overlapping_host";
+        return "duplicate_host";
     }
 
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<OverlappingHostCQ, OverlappingHostCQ> filteredLambda) {
+    public void filtered(FilteredCall<DuplicateHostCQ, DuplicateHostCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<OverlappingHostCQ, OverlappingHostCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+    public void filtered(FilteredCall<DuplicateHostCQ, DuplicateHostCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
         bool((must, should, mustNot, filter) -> {
             filteredLambda.callback(must, filter);
         }, opLambda);
     }
 
-    public void not(OperatorCall<OverlappingHostCQ> notLambda) {
+    public void not(OperatorCall<DuplicateHostCQ> notLambda) {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<OverlappingHostCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        OverlappingHostCQ notQuery = new OverlappingHostCQ();
+    public void not(OperatorCall<DuplicateHostCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        DuplicateHostCQ notQuery = new DuplicateHostCQ();
         notLambda.callback(notQuery);
         if (notQuery.hasQueries()) {
             if (notQuery.getQueryBuilderList().size() > 1) {
@@ -85,15 +85,15 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public void bool(BoolCall<OverlappingHostCQ> boolLambda) {
+    public void bool(BoolCall<DuplicateHostCQ> boolLambda) {
         bool(boolLambda, null);
     }
 
-    public void bool(BoolCall<OverlappingHostCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        OverlappingHostCQ mustQuery = new OverlappingHostCQ();
-        OverlappingHostCQ shouldQuery = new OverlappingHostCQ();
-        OverlappingHostCQ mustNotQuery = new OverlappingHostCQ();
-        OverlappingHostCQ filterQuery = new OverlappingHostCQ();
+    public void bool(BoolCall<DuplicateHostCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        DuplicateHostCQ mustQuery = new DuplicateHostCQ();
+        DuplicateHostCQ shouldQuery = new DuplicateHostCQ();
+        DuplicateHostCQ mustNotQuery = new DuplicateHostCQ();
+        DuplicateHostCQ filterQuery = new DuplicateHostCQ();
         boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
         if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
             BoolQueryBuilder builder =
@@ -165,12 +165,12 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         setId_Terms(idList, opLambda);
     }
 
-    public BsOverlappingHostCQ addOrderBy_Id_Asc() {
+    public BsDuplicateHostCQ addOrderBy_Id_Asc() {
         regOBA("_id");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_Id_Desc() {
+    public BsDuplicateHostCQ addOrderBy_Id_Desc() {
         regOBD("_id");
         return this;
     }
@@ -331,12 +331,12 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsOverlappingHostCQ addOrderBy_CreatedBy_Asc() {
+    public BsDuplicateHostCQ addOrderBy_CreatedBy_Asc() {
         regOBA("createdBy");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_CreatedBy_Desc() {
+    public BsDuplicateHostCQ addOrderBy_CreatedBy_Desc() {
         regOBD("createdBy");
         return this;
     }
@@ -486,179 +486,179 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsOverlappingHostCQ addOrderBy_CreatedTime_Asc() {
+    public BsDuplicateHostCQ addOrderBy_CreatedTime_Asc() {
         regOBA("createdTime");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_CreatedTime_Desc() {
+    public BsDuplicateHostCQ addOrderBy_CreatedTime_Desc() {
         regOBD("createdTime");
         return this;
     }
 
-    public void setOverlappingName_Equal(String overlappingName) {
-        setOverlappingName_Term(overlappingName, null);
+    public void setDuplicateHostName_Equal(String duplicateHostName) {
+        setDuplicateHostName_Term(duplicateHostName, null);
     }
 
-    public void setOverlappingName_Equal(String overlappingName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setOverlappingName_Term(overlappingName, opLambda);
+    public void setDuplicateHostName_Equal(String duplicateHostName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setDuplicateHostName_Term(duplicateHostName, opLambda);
     }
 
-    public void setOverlappingName_Term(String overlappingName) {
-        setOverlappingName_Term(overlappingName, null);
+    public void setDuplicateHostName_Term(String duplicateHostName) {
+        setDuplicateHostName_Term(duplicateHostName, null);
     }
 
-    public void setOverlappingName_Term(String overlappingName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("overlappingName", overlappingName);
+    public void setDuplicateHostName_Term(String duplicateHostName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_NotEqual(String overlappingName) {
-        setOverlappingName_NotTerm(overlappingName, null);
+    public void setDuplicateHostName_NotEqual(String duplicateHostName) {
+        setDuplicateHostName_NotTerm(duplicateHostName, null);
     }
 
-    public void setOverlappingName_NotEqual(String overlappingName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setOverlappingName_NotTerm(overlappingName, opLambda);
+    public void setDuplicateHostName_NotEqual(String duplicateHostName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setDuplicateHostName_NotTerm(duplicateHostName, opLambda);
     }
 
-    public void setOverlappingName_NotTerm(String overlappingName) {
-        setOverlappingName_NotTerm(overlappingName, null);
+    public void setDuplicateHostName_NotTerm(String duplicateHostName) {
+        setDuplicateHostName_NotTerm(duplicateHostName, null);
     }
 
-    public void setOverlappingName_NotTerm(String overlappingName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("overlappingName", overlappingName));
+    public void setDuplicateHostName_NotTerm(String duplicateHostName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("duplicateHostName", duplicateHostName));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_Terms(Collection<String> overlappingNameList) {
-        setOverlappingName_Terms(overlappingNameList, null);
+    public void setDuplicateHostName_Terms(Collection<String> duplicateHostNameList) {
+        setDuplicateHostName_Terms(duplicateHostNameList, null);
     }
 
-    public void setOverlappingName_Terms(Collection<String> overlappingNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("overlappingName", overlappingNameList);
+    public void setDuplicateHostName_Terms(Collection<String> duplicateHostNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("duplicateHostName", duplicateHostNameList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_InScope(Collection<String> overlappingNameList) {
-        setOverlappingName_Terms(overlappingNameList, null);
+    public void setDuplicateHostName_InScope(Collection<String> duplicateHostNameList) {
+        setDuplicateHostName_Terms(duplicateHostNameList, null);
     }
 
-    public void setOverlappingName_InScope(Collection<String> overlappingNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setOverlappingName_Terms(overlappingNameList, opLambda);
+    public void setDuplicateHostName_InScope(Collection<String> duplicateHostNameList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setDuplicateHostName_Terms(duplicateHostNameList, opLambda);
     }
 
-    public void setOverlappingName_Match(String overlappingName) {
-        setOverlappingName_Match(overlappingName, null);
+    public void setDuplicateHostName_Match(String duplicateHostName) {
+        setDuplicateHostName_Match(duplicateHostName, null);
     }
 
-    public void setOverlappingName_Match(String overlappingName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("overlappingName", overlappingName);
+    public void setDuplicateHostName_Match(String duplicateHostName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_MatchPhrase(String overlappingName) {
-        setOverlappingName_MatchPhrase(overlappingName, null);
+    public void setDuplicateHostName_MatchPhrase(String duplicateHostName) {
+        setDuplicateHostName_MatchPhrase(duplicateHostName, null);
     }
 
-    public void setOverlappingName_MatchPhrase(String overlappingName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("overlappingName", overlappingName);
+    public void setDuplicateHostName_MatchPhrase(String duplicateHostName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchPhraseQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_MatchPhrasePrefix(String overlappingName) {
-        setOverlappingName_MatchPhrasePrefix(overlappingName, null);
+    public void setDuplicateHostName_MatchPhrasePrefix(String duplicateHostName) {
+        setDuplicateHostName_MatchPhrasePrefix(duplicateHostName, null);
     }
 
-    public void setOverlappingName_MatchPhrasePrefix(String overlappingName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("overlappingName", overlappingName);
+    public void setDuplicateHostName_MatchPhrasePrefix(String duplicateHostName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchPhrasePrefixQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_Fuzzy(String overlappingName) {
-        setOverlappingName_Fuzzy(overlappingName, null);
+    public void setDuplicateHostName_Fuzzy(String duplicateHostName) {
+        setDuplicateHostName_Fuzzy(duplicateHostName, null);
     }
 
-    public void setOverlappingName_Fuzzy(String overlappingName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("overlappingName", overlappingName);
+    public void setDuplicateHostName_Fuzzy(String duplicateHostName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
+        FuzzyQueryBuilder builder = regFuzzyQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_Prefix(String overlappingName) {
-        setOverlappingName_Prefix(overlappingName, null);
+    public void setDuplicateHostName_Prefix(String duplicateHostName) {
+        setDuplicateHostName_Prefix(duplicateHostName, null);
     }
 
-    public void setOverlappingName_Prefix(String overlappingName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("overlappingName", overlappingName);
+    public void setDuplicateHostName_Prefix(String duplicateHostName, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_GreaterThan(String overlappingName) {
-        setOverlappingName_GreaterThan(overlappingName, null);
+    public void setDuplicateHostName_GreaterThan(String duplicateHostName) {
+        setDuplicateHostName_GreaterThan(duplicateHostName, null);
     }
 
-    public void setOverlappingName_GreaterThan(String overlappingName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("overlappingName", ConditionKey.CK_GREATER_THAN, overlappingName);
+    public void setDuplicateHostName_GreaterThan(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_GREATER_THAN, duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_LessThan(String overlappingName) {
-        setOverlappingName_LessThan(overlappingName, null);
+    public void setDuplicateHostName_LessThan(String duplicateHostName) {
+        setDuplicateHostName_LessThan(duplicateHostName, null);
     }
 
-    public void setOverlappingName_LessThan(String overlappingName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("overlappingName", ConditionKey.CK_LESS_THAN, overlappingName);
+    public void setDuplicateHostName_LessThan(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_LESS_THAN, duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_GreaterEqual(String overlappingName) {
-        setOverlappingName_GreaterEqual(overlappingName, null);
+    public void setDuplicateHostName_GreaterEqual(String duplicateHostName) {
+        setDuplicateHostName_GreaterEqual(duplicateHostName, null);
     }
 
-    public void setOverlappingName_GreaterEqual(String overlappingName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("overlappingName", ConditionKey.CK_GREATER_EQUAL, overlappingName);
+    public void setDuplicateHostName_GreaterEqual(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_GREATER_EQUAL, duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setOverlappingName_LessEqual(String overlappingName) {
-        setOverlappingName_LessEqual(overlappingName, null);
+    public void setDuplicateHostName_LessEqual(String duplicateHostName) {
+        setDuplicateHostName_LessEqual(duplicateHostName, null);
     }
 
-    public void setOverlappingName_LessEqual(String overlappingName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("overlappingName", ConditionKey.CK_LESS_EQUAL, overlappingName);
+    public void setDuplicateHostName_LessEqual(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_LESS_EQUAL, duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsOverlappingHostCQ addOrderBy_OverlappingName_Asc() {
-        regOBA("overlappingName");
+    public BsDuplicateHostCQ addOrderBy_DuplicateHostName_Asc() {
+        regOBA("duplicateHostName");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_OverlappingName_Desc() {
-        regOBD("overlappingName");
+    public BsDuplicateHostCQ addOrderBy_DuplicateHostName_Desc() {
+        regOBD("duplicateHostName");
         return this;
     }
 
@@ -818,12 +818,12 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsOverlappingHostCQ addOrderBy_RegularName_Asc() {
+    public BsDuplicateHostCQ addOrderBy_RegularName_Asc() {
         regOBA("regularName");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_RegularName_Desc() {
+    public BsDuplicateHostCQ addOrderBy_RegularName_Desc() {
         regOBD("regularName");
         return this;
     }
@@ -973,12 +973,12 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsOverlappingHostCQ addOrderBy_SortOrder_Asc() {
+    public BsDuplicateHostCQ addOrderBy_SortOrder_Asc() {
         regOBA("sortOrder");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_SortOrder_Desc() {
+    public BsDuplicateHostCQ addOrderBy_SortOrder_Desc() {
         regOBD("sortOrder");
         return this;
     }
@@ -1139,12 +1139,12 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsOverlappingHostCQ addOrderBy_UpdatedBy_Asc() {
+    public BsDuplicateHostCQ addOrderBy_UpdatedBy_Asc() {
         regOBA("updatedBy");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_UpdatedBy_Desc() {
+    public BsDuplicateHostCQ addOrderBy_UpdatedBy_Desc() {
         regOBD("updatedBy");
         return this;
     }
@@ -1294,12 +1294,12 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsOverlappingHostCQ addOrderBy_UpdatedTime_Asc() {
+    public BsDuplicateHostCQ addOrderBy_UpdatedTime_Asc() {
         regOBA("updatedTime");
         return this;
     }
 
-    public BsOverlappingHostCQ addOrderBy_UpdatedTime_Desc() {
+    public BsDuplicateHostCQ addOrderBy_UpdatedTime_Desc() {
         regOBD("updatedTime");
         return this;
     }

src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.es.config.exbhv;
 
-import org.codelibs.fess.es.config.bsbhv.BsOverlappingHostBhv;
+import org.codelibs.fess.es.config.bsbhv.BsDuplicateHostBhv;
 
 /**
  * @author FreeGen
  */
-public class OverlappingHostBhv extends BsOverlappingHostBhv {
+public class DuplicateHostBhv extends BsDuplicateHostBhv {
 
 }

src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.es.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsOverlappingHost;
+import org.codelibs.fess.es.config.bsentity.BsDuplicateHost;
 
 /**
- * @author FreeGen
+ * @author ESFlute (using FreeGen)
  */
-public class OverlappingHost extends BsOverlappingHost {
+public class DuplicateHost extends BsDuplicateHost {
 
     private static final long serialVersionUID = 1L;
 
@@ -41,7 +41,7 @@ public class OverlappingHost extends BsOverlappingHost {
     }
 
     public String convert(final String url) {
-        final String targetStr = getOverlappingName().replaceAll("\\.", "\\\\.");
+        final String targetStr = getDuplicateHostName().replaceAll("\\.", "\\\\.");
         return url.replaceFirst("://" + targetStr + "$", "://" + getRegularName()).replaceFirst("://" + targetStr + "([:/])",
                 "://" + getRegularName() + "$1");
     }

src/main/java/org/codelibs/fess/exec/Crawler.java

@@ -40,7 +40,7 @@ import org.codelibs.fess.crawler.client.EsClient;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.helper.CrawlingSessionHelper;
 import org.codelibs.fess.helper.DataIndexHelper;
-import org.codelibs.fess.helper.OverlappingHostHelper;
+import org.codelibs.fess.helper.DuplicateHostHelper;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.WebFsIndexHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
@@ -333,12 +333,12 @@ public class Crawler implements Serializable {
             ptList.add(Constants.PROCESS_TYPE_BOTH);
             pathMappingHelper.setPathMappingList(options.sessionId, pathMappingService.getPathMappingList(ptList));
 
-            // overlapping host
+            // duplicate host
             try {
-                final OverlappingHostHelper overlappingHostHelper = ComponentUtil.getOverlappingHostHelper();
-                overlappingHostHelper.init();
+                final DuplicateHostHelper duplicateHostHelper = ComponentUtil.getDuplicateHostHelper();
+                duplicateHostHelper.init();
             } catch (final Exception e) {
-                logger.warn("Could not initialize overlappingHostHelper.", e);
+                logger.warn("Could not initialize duplicateHostHelper.", e);
             }
 
             // delete expired sessions

src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java

@@ -21,44 +21,44 @@ import java.util.List;
 
 import javax.annotation.PostConstruct;
 
-import org.codelibs.fess.app.service.OverlappingHostService;
-import org.codelibs.fess.es.config.exentity.OverlappingHost;
+import org.codelibs.fess.app.service.DuplicateHostService;
+import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.lastaflute.di.core.SingletonLaContainer;
 
-public class OverlappingHostHelper implements Serializable {
+public class DuplicateHostHelper implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private List<OverlappingHost> overlappingHostList;
+    private List<DuplicateHost> duplicateHostList;
 
     @PostConstruct
     public void init() {
-        if (overlappingHostList == null) {
-            overlappingHostList = new ArrayList<OverlappingHost>();
+        if (duplicateHostList == null) {
+            duplicateHostList = new ArrayList<DuplicateHost>();
         }
-        final OverlappingHostService overlappingHostService = SingletonLaContainer.getComponent(OverlappingHostService.class);
-        overlappingHostList.addAll(overlappingHostService.getOverlappingHostList());
+        final DuplicateHostService duplicateHostService = SingletonLaContainer.getComponent(DuplicateHostService.class);
+        duplicateHostList.addAll(duplicateHostService.getDuplicateHostList());
     }
 
-    public void setOverlappingHostList(final List<OverlappingHost> overlappingHostList) {
-        this.overlappingHostList = overlappingHostList;
+    public void setDuplicateHostList(final List<DuplicateHost> duplicateHostList) {
+        this.duplicateHostList = duplicateHostList;
     }
 
-    public void add(final OverlappingHost overlappingHost) {
-        if (overlappingHostList == null) {
-            overlappingHostList = new ArrayList<OverlappingHost>();
+    public void add(final DuplicateHost duplicateHost) {
+        if (duplicateHostList == null) {
+            duplicateHostList = new ArrayList<DuplicateHost>();
         }
-        overlappingHostList.add(overlappingHost);
+        duplicateHostList.add(duplicateHost);
     }
 
     public String convert(final String url) {
-        if (overlappingHostList == null) {
+        if (duplicateHostList == null) {
             init();
         }
 
         String newUrl = url;
-        for (final OverlappingHost overlappingHost : overlappingHostList) {
-            newUrl = overlappingHost.convert(newUrl);
+        for (final DuplicateHost duplicateHost : duplicateHostList) {
+            newUrl = duplicateHost.convert(newUrl);
         }
         return newUrl;
     }

src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java

@@ -23,35 +23,50 @@ import org.lastaflute.web.response.next.HtmlNext;
  */
 public interface FessHtmlPath {
 
-    /** The path of the HTML: /admin/boostdocumentrule/details.jsp */
-    HtmlNext path_AdminBoostdocumentrule_DetailsJsp = new HtmlNext("/admin/boostdocumentrule/details.jsp");
+    /** The path of the HTML: /admin/badword/admin_badword.jsp */
+    HtmlNext path_AdminBadword_AdminBadwordJsp = new HtmlNext("/admin/badword/admin_badword.jsp");
 
-    /** The path of the HTML: /admin/boostdocumentrule/edit.jsp */
-    HtmlNext path_AdminBoostdocumentrule_EditJsp = new HtmlNext("/admin/boostdocumentrule/edit.jsp");
+    /** The path of the HTML: /admin/badword/admin_badword_details.jsp */
+    HtmlNext path_AdminBadword_AdminBadwordDetailsJsp = new HtmlNext("/admin/badword/admin_badword_details.jsp");
 
-    /** The path of the HTML: /admin/boostdocumentrule/index.jsp */
-    HtmlNext path_AdminBoostdocumentrule_IndexJsp = new HtmlNext("/admin/boostdocumentrule/index.jsp");
+    /** The path of the HTML: /admin/badword/admin_badword_download.jsp */
+    HtmlNext path_AdminBadword_AdminBadwordDownloadJsp = new HtmlNext("/admin/badword/admin_badword_download.jsp");
 
-    /** The path of the HTML: /admin/crawlinginfo/crawlinginfo_details.jsp */
-    HtmlNext path_AdminCrawlinginfo_CrawlinginfoDetailsJsp = new HtmlNext("/admin/crawlinginfo/crawlinginfo_details.jsp");
+    /** The path of the HTML: /admin/badword/admin_badword_edit.jsp */
+    HtmlNext path_AdminBadword_AdminBadwordEditJsp = new HtmlNext("/admin/badword/admin_badword_edit.jsp");
 
-    /** The path of the HTML: /admin/crawlinginfo/crawlinginfo_list.jsp */
-    HtmlNext path_AdminCrawlinginfo_CrawlinginfoListJsp = new HtmlNext("/admin/crawlinginfo/crawlinginfo_list.jsp");
+    /** The path of the HTML: /admin/badword/admin_badword_upload.jsp */
+    HtmlNext path_AdminBadword_AdminBadwordUploadJsp = new HtmlNext("/admin/badword/admin_badword_upload.jsp");
 
-    /** The path of the HTML: /admin/dashboard/dashboard.jsp */
-    HtmlNext path_AdminDashboard_DashboardJsp = new HtmlNext("/admin/dashboard/dashboard.jsp");
+    /** The path of the HTML: /admin/boostdoc/admin_boostdoc.jsp */
+    HtmlNext path_AdminBoostdoc_AdminBoostdocJsp = new HtmlNext("/admin/boostdoc/admin_boostdoc.jsp");
 
-    /** The path of the HTML: /admin/data/index.jsp */
-    HtmlNext path_AdminData_IndexJsp = new HtmlNext("/admin/data/index.jsp");
+    /** The path of the HTML: /admin/boostdoc/admin_boostdoc_details.jsp */
+    HtmlNext path_AdminBoostdoc_AdminBoostdocDetailsJsp = new HtmlNext("/admin/boostdoc/admin_boostdoc_details.jsp");
 
-    /** The path of the HTML: /admin/dataconfig/details.jsp */
-    HtmlNext path_AdminDataconfig_DetailsJsp = new HtmlNext("/admin/dataconfig/details.jsp");
+    /** The path of the HTML: /admin/boostdoc/admin_boostdoc_edit.jsp */
+    HtmlNext path_AdminBoostdoc_AdminBoostdocEditJsp = new HtmlNext("/admin/boostdoc/admin_boostdoc_edit.jsp");
 
-    /** The path of the HTML: /admin/dataconfig/edit.jsp */
-    HtmlNext path_AdminDataconfig_EditJsp = new HtmlNext("/admin/dataconfig/edit.jsp");
+    /** The path of the HTML: /admin/crawlinginfo/admin_crawlinginfo.jsp */
+    HtmlNext path_AdminCrawlinginfo_AdminCrawlinginfoJsp = new HtmlNext("/admin/crawlinginfo/admin_crawlinginfo.jsp");
 
-    /** The path of the HTML: /admin/dataconfig/index.jsp */
-    HtmlNext path_AdminDataconfig_IndexJsp = new HtmlNext("/admin/dataconfig/index.jsp");
+    /** The path of the HTML: /admin/crawlinginfo/admin_crawlinginfo_details.jsp */
+    HtmlNext path_AdminCrawlinginfo_AdminCrawlinginfoDetailsJsp = new HtmlNext("/admin/crawlinginfo/admin_crawlinginfo_details.jsp");
+
+    /** The path of the HTML: /admin/dashboard/admin_dashboard.jsp */
+    HtmlNext path_AdminDashboard_AdminDashboardJsp = new HtmlNext("/admin/dashboard/admin_dashboard.jsp");
+
+    /** The path of the HTML: /admin/data/admin_data.jsp */
+    HtmlNext path_AdminData_AdminDataJsp = new HtmlNext("/admin/data/admin_data.jsp");
+
+    /** The path of the HTML: /admin/dataconfig/admin_dataconfig.jsp */
+    HtmlNext path_AdminDataconfig_AdminDataconfigJsp = new HtmlNext("/admin/dataconfig/admin_dataconfig.jsp");
+
+    /** The path of the HTML: /admin/dataconfig/admin_dataconfig_details.jsp */
+    HtmlNext path_AdminDataconfig_AdminDataconfigDetailsJsp = new HtmlNext("/admin/dataconfig/admin_dataconfig_details.jsp");
+
+    /** The path of the HTML: /admin/dataconfig/admin_dataconfig_edit.jsp */
+    HtmlNext path_AdminDataconfig_AdminDataconfigEditJsp = new HtmlNext("/admin/dataconfig/admin_dataconfig_edit.jsp");
 
     /** The path of the HTML: /admin/design/admin_design.jsp */
     HtmlNext path_AdminDesign_AdminDesignJsp = new HtmlNext("/admin/design/admin_design.jsp");
@@ -59,236 +74,215 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/design/admin_design_edit.jsp */
     HtmlNext path_AdminDesign_AdminDesignEditJsp = new HtmlNext("/admin/design/admin_design_edit.jsp");
 
-    /** The path of the HTML: /admin/dict/index.jsp */
-    HtmlNext path_AdminDict_IndexJsp = new HtmlNext("/admin/dict/index.jsp");
+    /** The path of the HTML: /admin/dict/admin_dict.jsp */
+    HtmlNext path_AdminDict_AdminDictJsp = new HtmlNext("/admin/dict/admin_dict.jsp");
 
-    /** The path of the HTML: /admin/dict/kuromoji/details.jsp */
-    HtmlNext path_AdminDictKuromoji_DetailsJsp = new HtmlNext("/admin/dict/kuromoji/details.jsp");
+    /** The path of the HTML: /admin/dict/kuromoji/admin_dict_kuromoji.jsp */
+    HtmlNext path_AdminDictKuromoji_AdminDictKuromojiJsp = new HtmlNext("/admin/dict/kuromoji/admin_dict_kuromoji.jsp");
 
-    /** The path of the HTML: /admin/dict/kuromoji/download.jsp */
-    HtmlNext path_AdminDictKuromoji_DownloadJsp = new HtmlNext("/admin/dict/kuromoji/download.jsp");
+    /** The path of the HTML: /admin/dict/kuromoji/admin_dict_kuromoji_details.jsp */
+    HtmlNext path_AdminDictKuromoji_AdminDictKuromojiDetailsJsp = new HtmlNext("/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp");
 
-    /** The path of the HTML: /admin/dict/kuromoji/edit.jsp */
-    HtmlNext path_AdminDictKuromoji_EditJsp = new HtmlNext("/admin/dict/kuromoji/edit.jsp");
+    /** The path of the HTML: /admin/dict/kuromoji/admin_dict_kuromoji_download.jsp */
+    HtmlNext path_AdminDictKuromoji_AdminDictKuromojiDownloadJsp = new HtmlNext("/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp");
 
-    /** The path of the HTML: /admin/dict/kuromoji/error.jsp */
-    HtmlNext path_AdminDictKuromoji_ErrorJsp = new HtmlNext("/admin/dict/kuromoji/error.jsp");
+    /** The path of the HTML: /admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp */
+    HtmlNext path_AdminDictKuromoji_AdminDictKuromojiEditJsp = new HtmlNext("/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp");
 
-    /** The path of the HTML: /admin/dict/kuromoji/index.jsp */
-    HtmlNext path_AdminDictKuromoji_IndexJsp = new HtmlNext("/admin/dict/kuromoji/index.jsp");
+    /** The path of the HTML: /admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp */
+    HtmlNext path_AdminDictKuromoji_AdminDictKuromojiUploadJsp = new HtmlNext("/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp");
 
-    /** The path of the HTML: /admin/dict/kuromoji/upload.jsp */
-    HtmlNext path_AdminDictKuromoji_UploadJsp = new HtmlNext("/admin/dict/kuromoji/upload.jsp");
+    /** The path of the HTML: /admin/dict/synonym/admin_dict_synonym.jsp */
+    HtmlNext path_AdminDictSynonym_AdminDictSynonymJsp = new HtmlNext("/admin/dict/synonym/admin_dict_synonym.jsp");
 
-    /** The path of the HTML: /admin/dict/synonym/details.jsp */
-    HtmlNext path_AdminDictSynonym_DetailsJsp = new HtmlNext("/admin/dict/synonym/details.jsp");
+    /** The path of the HTML: /admin/dict/synonym/admin_dict_synonym_details.jsp */
+    HtmlNext path_AdminDictSynonym_AdminDictSynonymDetailsJsp = new HtmlNext("/admin/dict/synonym/admin_dict_synonym_details.jsp");
 
-    /** The path of the HTML: /admin/dict/synonym/download.jsp */
-    HtmlNext path_AdminDictSynonym_DownloadJsp = new HtmlNext("/admin/dict/synonym/download.jsp");
+    /** The path of the HTML: /admin/dict/synonym/admin_dict_synonym_download.jsp */
+    HtmlNext path_AdminDictSynonym_AdminDictSynonymDownloadJsp = new HtmlNext("/admin/dict/synonym/admin_dict_synonym_download.jsp");
 
-    /** The path of the HTML: /admin/dict/synonym/edit.jsp */
-    HtmlNext path_AdminDictSynonym_EditJsp = new HtmlNext("/admin/dict/synonym/edit.jsp");
+    /** The path of the HTML: /admin/dict/synonym/admin_dict_synonym_edit.jsp */
+    HtmlNext path_AdminDictSynonym_AdminDictSynonymEditJsp = new HtmlNext("/admin/dict/synonym/admin_dict_synonym_edit.jsp");
 
-    /** The path of the HTML: /admin/dict/synonym/error.jsp */
-    HtmlNext path_AdminDictSynonym_ErrorJsp = new HtmlNext("/admin/dict/synonym/error.jsp");
+    /** The path of the HTML: /admin/dict/synonym/admin_dict_synonym_upload.jsp */
+    HtmlNext path_AdminDictSynonym_AdminDictSynonymUploadJsp = new HtmlNext("/admin/dict/synonym/admin_dict_synonym_upload.jsp");
 
-    /** The path of the HTML: /admin/dict/synonym/index.jsp */
-    HtmlNext path_AdminDictSynonym_IndexJsp = new HtmlNext("/admin/dict/synonym/index.jsp");
+    /** The path of the HTML: /admin/duplicatehost/admin_duplicatehost.jsp */
+    HtmlNext path_AdminDuplicatehost_AdminDuplicatehostJsp = new HtmlNext("/admin/duplicatehost/admin_duplicatehost.jsp");
 
-    /** The path of the HTML: /admin/dict/synonym/upload.jsp */
-    HtmlNext path_AdminDictSynonym_UploadJsp = new HtmlNext("/admin/dict/synonym/upload.jsp");
+    /** The path of the HTML: /admin/duplicatehost/admin_duplicatehost_details.jsp */
+    HtmlNext path_AdminDuplicatehost_AdminDuplicatehostDetailsJsp = new HtmlNext("/admin/duplicatehost/admin_duplicatehost_details.jsp");
 
-    /** The path of the HTML: /admin/error/error.jsp */
-    HtmlNext path_AdminError_ErrorJsp = new HtmlNext("/admin/error/error.jsp");
+    /** The path of the HTML: /admin/duplicatehost/admin_duplicatehost_edit.jsp */
+    HtmlNext path_AdminDuplicatehost_AdminDuplicatehostEditJsp = new HtmlNext("/admin/duplicatehost/admin_duplicatehost_edit.jsp");
 
-    /** The path of the HTML: /admin/failureurl/details.jsp */
-    HtmlNext path_AdminFailureurl_DetailsJsp = new HtmlNext("/admin/failureurl/details.jsp");
+    /** The path of the HTML: /admin/elevateword/admin_elevateword.jsp */
+    HtmlNext path_AdminElevateword_AdminElevatewordJsp = new HtmlNext("/admin/elevateword/admin_elevateword.jsp");
 
-    /** The path of the HTML: /admin/failureurl/index.jsp */
-    HtmlNext path_AdminFailureurl_IndexJsp = new HtmlNext("/admin/failureurl/index.jsp");
+    /** The path of the HTML: /admin/elevateword/admin_elevateword_details.jsp */
+    HtmlNext path_AdminElevateword_AdminElevatewordDetailsJsp = new HtmlNext("/admin/elevateword/admin_elevateword_details.jsp");
 
-    /** The path of the HTML: /admin/fileauthentication/details.jsp */
-    HtmlNext path_AdminFileauthentication_DetailsJsp = new HtmlNext("/admin/fileauthentication/details.jsp");
+    /** The path of the HTML: /admin/elevateword/admin_elevateword_download.jsp */
+    HtmlNext path_AdminElevateword_AdminElevatewordDownloadJsp = new HtmlNext("/admin/elevateword/admin_elevateword_download.jsp");
 
-    /** The path of the HTML: /admin/fileauthentication/edit.jsp */
-    HtmlNext path_AdminFileauthentication_EditJsp = new HtmlNext("/admin/fileauthentication/edit.jsp");
+    /** The path of the HTML: /admin/elevateword/admin_elevateword_edit.jsp */
+    HtmlNext path_AdminElevateword_AdminElevatewordEditJsp = new HtmlNext("/admin/elevateword/admin_elevateword_edit.jsp");
 
-    /** The path of the HTML: /admin/fileauthentication/index.jsp */
-    HtmlNext path_AdminFileauthentication_IndexJsp = new HtmlNext("/admin/fileauthentication/index.jsp");
+    /** The path of the HTML: /admin/elevateword/admin_elevateword_upload.jsp */
+    HtmlNext path_AdminElevateword_AdminElevatewordUploadJsp = new HtmlNext("/admin/elevateword/admin_elevateword_upload.jsp");
 
-    /** The path of the HTML: /admin/fileconfig/details.jsp */
-    HtmlNext path_AdminFileconfig_DetailsJsp = new HtmlNext("/admin/fileconfig/details.jsp");
+    /** The path of the HTML: /admin/error/admin_error.jsp */
+    HtmlNext path_AdminError_AdminErrorJsp = new HtmlNext("/admin/error/admin_error.jsp");
 
-    /** The path of the HTML: /admin/fileconfig/edit.jsp */
-    HtmlNext path_AdminFileconfig_EditJsp = new HtmlNext("/admin/fileconfig/edit.jsp");
+    /** The path of the HTML: /admin/failureurl/admin_failureurl.jsp */
+    HtmlNext path_AdminFailureurl_AdminFailureurlJsp = new HtmlNext("/admin/failureurl/admin_failureurl.jsp");
 
-    /** The path of the HTML: /admin/fileconfig/index.jsp */
-    HtmlNext path_AdminFileconfig_IndexJsp = new HtmlNext("/admin/fileconfig/index.jsp");
+    /** The path of the HTML: /admin/failureurl/admin_failureurl_details.jsp */
+    HtmlNext path_AdminFailureurl_AdminFailureurlDetailsJsp = new HtmlNext("/admin/failureurl/admin_failureurl_details.jsp");
 
-    /** The path of the HTML: /admin/general/index.jsp */
-    HtmlNext path_AdminGeneral_IndexJsp = new HtmlNext("/admin/general/index.jsp");
+    /** The path of the HTML: /admin/fileauth/admin_fileauth.jsp */
+    HtmlNext path_AdminFileauth_AdminFileauthJsp = new HtmlNext("/admin/fileauth/admin_fileauth.jsp");
 
-    /** The path of the HTML: /admin/group/details.jsp */
-    HtmlNext path_AdminGroup_DetailsJsp = new HtmlNext("/admin/group/details.jsp");
+    /** The path of the HTML: /admin/fileauth/admin_fileauth_details.jsp */
+    HtmlNext path_AdminFileauth_AdminFileauthDetailsJsp = new HtmlNext("/admin/fileauth/admin_fileauth_details.jsp");
 
-    /** The path of the HTML: /admin/group/edit.jsp */
-    HtmlNext path_AdminGroup_EditJsp = new HtmlNext("/admin/group/edit.jsp");
+    /** The path of the HTML: /admin/fileauth/admin_fileauth_edit.jsp */
+    HtmlNext path_AdminFileauth_AdminFileauthEditJsp = new HtmlNext("/admin/fileauth/admin_fileauth_edit.jsp");
 
-    /** The path of the HTML: /admin/group/index.jsp */
-    HtmlNext path_AdminGroup_IndexJsp = new HtmlNext("/admin/group/index.jsp");
+    /** The path of the HTML: /admin/fileconfig/admin_fileconfig.jsp */
+    HtmlNext path_AdminFileconfig_AdminFileconfigJsp = new HtmlNext("/admin/fileconfig/admin_fileconfig.jsp");
 
-    /** The path of the HTML: /admin/joblog/details.jsp */
-    HtmlNext path_AdminJoblog_DetailsJsp = new HtmlNext("/admin/joblog/details.jsp");
+    /** The path of the HTML: /admin/fileconfig/admin_fileconfig_details.jsp */
+    HtmlNext path_AdminFileconfig_AdminFileconfigDetailsJsp = new HtmlNext("/admin/fileconfig/admin_fileconfig_details.jsp");
 
-    /** The path of the HTML: /admin/joblog/index.jsp */
-    HtmlNext path_AdminJoblog_IndexJsp = new HtmlNext("/admin/joblog/index.jsp");
+    /** The path of the HTML: /admin/fileconfig/admin_fileconfig_edit.jsp */
+    HtmlNext path_AdminFileconfig_AdminFileconfigEditJsp = new HtmlNext("/admin/fileconfig/admin_fileconfig_edit.jsp");
 
-    /** The path of the HTML: /admin/keymatch/details.jsp */
-    HtmlNext path_AdminKeymatch_DetailsJsp = new HtmlNext("/admin/keymatch/details.jsp");
+    /** The path of the HTML: /admin/general/admin_general.jsp */
+    HtmlNext path_AdminGeneral_AdminGeneralJsp = new HtmlNext("/admin/general/admin_general.jsp");
 
-    /** The path of the HTML: /admin/keymatch/edit.jsp */
-    HtmlNext path_AdminKeymatch_EditJsp = new HtmlNext("/admin/keymatch/edit.jsp");
+    /** The path of the HTML: /admin/group/admin_group.jsp */
+    HtmlNext path_AdminGroup_AdminGroupJsp = new HtmlNext("/admin/group/admin_group.jsp");
 
-    /** The path of the HTML: /admin/keymatch/index.jsp */
-    HtmlNext path_AdminKeymatch_IndexJsp = new HtmlNext("/admin/keymatch/index.jsp");
+    /** The path of the HTML: /admin/group/admin_group_details.jsp */
+    HtmlNext path_AdminGroup_AdminGroupDetailsJsp = new HtmlNext("/admin/group/admin_group_details.jsp");
 
-    /** The path of the HTML: /admin/labeltype/details.jsp */
-    HtmlNext path_AdminLabeltype_DetailsJsp = new HtmlNext("/admin/labeltype/details.jsp");
+    /** The path of the HTML: /admin/group/admin_group_edit.jsp */
+    HtmlNext path_AdminGroup_AdminGroupEditJsp = new HtmlNext("/admin/group/admin_group_edit.jsp");
 
-    /** The path of the HTML: /admin/labeltype/edit.jsp */
-    HtmlNext path_AdminLabeltype_EditJsp = new HtmlNext("/admin/labeltype/edit.jsp");
+    /** The path of the HTML: /admin/joblog/admin_joblog.jsp */
+    HtmlNext path_AdminJoblog_AdminJoblogJsp = new HtmlNext("/admin/joblog/admin_joblog.jsp");
 
-    /** The path of the HTML: /admin/labeltype/index.jsp */
-    HtmlNext path_AdminLabeltype_IndexJsp = new HtmlNext("/admin/labeltype/index.jsp");
+    /** The path of the HTML: /admin/joblog/admin_joblog_details.jsp */
+    HtmlNext path_AdminJoblog_AdminJoblogDetailsJsp = new HtmlNext("/admin/joblog/admin_joblog_details.jsp");
 
-    /** The path of the HTML: /admin/log/index.jsp */
-    HtmlNext path_AdminLog_IndexJsp = new HtmlNext("/admin/log/index.jsp");
+    /** The path of the HTML: /admin/keymatch/admin_keymatch.jsp */
+    HtmlNext path_AdminKeymatch_AdminKeymatchJsp = new HtmlNext("/admin/keymatch/admin_keymatch.jsp");
 
-    /** The path of the HTML: /admin/overlappinghost/details.jsp */
-    HtmlNext path_AdminOverlappinghost_DetailsJsp = new HtmlNext("/admin/overlappinghost/details.jsp");
+    /** The path of the HTML: /admin/keymatch/admin_keymatch_details.jsp */
+    HtmlNext path_AdminKeymatch_AdminKeymatchDetailsJsp = new HtmlNext("/admin/keymatch/admin_keymatch_details.jsp");
 
-    /** The path of the HTML: /admin/overlappinghost/edit.jsp */
-    HtmlNext path_AdminOverlappinghost_EditJsp = new HtmlNext("/admin/overlappinghost/edit.jsp");
+    /** The path of the HTML: /admin/keymatch/admin_keymatch_edit.jsp */
+    HtmlNext path_AdminKeymatch_AdminKeymatchEditJsp = new HtmlNext("/admin/keymatch/admin_keymatch_edit.jsp");
 
-    /** The path of the HTML: /admin/overlappinghost/index.jsp */
-    HtmlNext path_AdminOverlappinghost_IndexJsp = new HtmlNext("/admin/overlappinghost/index.jsp");
+    /** The path of the HTML: /admin/labeltype/admin_labeltype.jsp */
+    HtmlNext path_AdminLabeltype_AdminLabeltypeJsp = new HtmlNext("/admin/labeltype/admin_labeltype.jsp");
 
-    /** The path of the HTML: /admin/pathmapping/details.jsp */
-    HtmlNext path_AdminPathmapping_DetailsJsp = new HtmlNext("/admin/pathmapping/details.jsp");
+    /** The path of the HTML: /admin/labeltype/admin_labeltype_details.jsp */
+    HtmlNext path_AdminLabeltype_AdminLabeltypeDetailsJsp = new HtmlNext("/admin/labeltype/admin_labeltype_details.jsp");
 
-    /** The path of the HTML: /admin/pathmapping/edit.jsp */
-    HtmlNext path_AdminPathmapping_EditJsp = new HtmlNext("/admin/pathmapping/edit.jsp");
+    /** The path of the HTML: /admin/labeltype/admin_labeltype_edit.jsp */
+    HtmlNext path_AdminLabeltype_AdminLabeltypeEditJsp = new HtmlNext("/admin/labeltype/admin_labeltype_edit.jsp");
 
-    /** The path of the HTML: /admin/pathmapping/index.jsp */
-    HtmlNext path_AdminPathmapping_IndexJsp = new HtmlNext("/admin/pathmapping/index.jsp");
+    /** The path of the HTML: /admin/log/admin_log.jsp */
+    HtmlNext path_AdminLog_AdminLogJsp = new HtmlNext("/admin/log/admin_log.jsp");
 
-    /** The path of the HTML: /admin/requestheader/details.jsp */
-    HtmlNext path_AdminRequestheader_DetailsJsp = new HtmlNext("/admin/requestheader/details.jsp");
+    /** The path of the HTML: /admin/pathmap/admin_pathmap.jsp */
+    HtmlNext path_AdminPathmap_AdminPathmapJsp = new HtmlNext("/admin/pathmap/admin_pathmap.jsp");
 
-    /** The path of the HTML: /admin/requestheader/edit.jsp */
-    HtmlNext path_AdminRequestheader_EditJsp = new HtmlNext("/admin/requestheader/edit.jsp");
+    /** The path of the HTML: /admin/pathmap/admin_pathmap_details.jsp */
+    HtmlNext path_AdminPathmap_AdminPathmapDetailsJsp = new HtmlNext("/admin/pathmap/admin_pathmap_details.jsp");
 
-    /** The path of the HTML: /admin/requestheader/index.jsp */
-    HtmlNext path_AdminRequestheader_IndexJsp = new HtmlNext("/admin/requestheader/index.jsp");
+    /** The path of the HTML: /admin/pathmap/admin_pathmap_edit.jsp */
+    HtmlNext path_AdminPathmap_AdminPathmapEditJsp = new HtmlNext("/admin/pathmap/admin_pathmap_edit.jsp");
 
-    /** The path of the HTML: /admin/role/details.jsp */
-    HtmlNext path_AdminRole_DetailsJsp = new HtmlNext("/admin/role/details.jsp");
+    /** The path of the HTML: /admin/reqheader/admin_reqheader.jsp */
+    HtmlNext path_AdminReqheader_AdminReqheaderJsp = new HtmlNext("/admin/reqheader/admin_reqheader.jsp");
 
-    /** The path of the HTML: /admin/role/edit.jsp */
-    HtmlNext path_AdminRole_EditJsp = new HtmlNext("/admin/role/edit.jsp");
+    /** The path of the HTML: /admin/reqheader/admin_reqheader_details.jsp */
+    HtmlNext path_AdminReqheader_AdminReqheaderDetailsJsp = new HtmlNext("/admin/reqheader/admin_reqheader_details.jsp");
 
-    /** The path of the HTML: /admin/role/index.jsp */
-    HtmlNext path_AdminRole_IndexJsp = new HtmlNext("/admin/role/index.jsp");
+    /** The path of the HTML: /admin/reqheader/admin_reqheader_edit.jsp */
+    HtmlNext path_AdminReqheader_AdminReqheaderEditJsp = new HtmlNext("/admin/reqheader/admin_reqheader_edit.jsp");
 
-    /** The path of the HTML: /admin/roletype/details.jsp */
-    HtmlNext path_AdminRoletype_DetailsJsp = new HtmlNext("/admin/roletype/details.jsp");
+    /** The path of the HTML: /admin/role/admin_role.jsp */
+    HtmlNext path_AdminRole_AdminRoleJsp = new HtmlNext("/admin/role/admin_role.jsp");
 
-    /** The path of the HTML: /admin/roletype/edit.jsp */
-    HtmlNext path_AdminRoletype_EditJsp = new HtmlNext("/admin/roletype/edit.jsp");
+    /** The path of the HTML: /admin/role/admin_role_details.jsp */
+    HtmlNext path_AdminRole_AdminRoleDetailsJsp = new HtmlNext("/admin/role/admin_role_details.jsp");
 
-    /** The path of the HTML: /admin/roletype/index.jsp */
-    HtmlNext path_AdminRoletype_IndexJsp = new HtmlNext("/admin/roletype/index.jsp");
+    /** The path of the HTML: /admin/role/admin_role_edit.jsp */
+    HtmlNext path_AdminRole_AdminRoleEditJsp = new HtmlNext("/admin/role/admin_role_edit.jsp");
 
-    /** The path of the HTML: /admin/scheduledjob/details.jsp */
-    HtmlNext path_AdminScheduledjob_DetailsJsp = new HtmlNext("/admin/scheduledjob/details.jsp");
+    /** The path of the HTML: /admin/roletype/admin_roletype.jsp */
+    HtmlNext path_AdminRoletype_AdminRoletypeJsp = new HtmlNext("/admin/roletype/admin_roletype.jsp");
 
-    /** The path of the HTML: /admin/scheduledjob/edit.jsp */
-    HtmlNext path_AdminScheduledjob_EditJsp = new HtmlNext("/admin/scheduledjob/edit.jsp");
+    /** The path of the HTML: /admin/roletype/admin_roletype_details.jsp */
+    HtmlNext path_AdminRoletype_AdminRoletypeDetailsJsp = new HtmlNext("/admin/roletype/admin_roletype_details.jsp");
 
-    /** The path of the HTML: /admin/scheduledjob/index.jsp */
-    HtmlNext path_AdminScheduledjob_IndexJsp = new HtmlNext("/admin/scheduledjob/index.jsp");
+    /** The path of the HTML: /admin/roletype/admin_roletype_edit.jsp */
+    HtmlNext path_AdminRoletype_AdminRoletypeEditJsp = new HtmlNext("/admin/roletype/admin_roletype_edit.jsp");
 
-    /** The path of the HTML: /admin/searchlist/index.jsp */
-    HtmlNext path_AdminSearchlist_IndexJsp = new HtmlNext("/admin/searchlist/index.jsp");
+    /** The path of the HTML: /admin/scheduler/admin_scheduler.jsp */
+    HtmlNext path_AdminScheduler_AdminSchedulerJsp = new HtmlNext("/admin/scheduler/admin_scheduler.jsp");
 
-    /** The path of the HTML: /admin/suggestbadword/details.jsp */
-    HtmlNext path_AdminSuggestbadword_DetailsJsp = new HtmlNext("/admin/suggestbadword/details.jsp");
+    /** The path of the HTML: /admin/scheduler/admin_scheduler_details.jsp */
+    HtmlNext path_AdminScheduler_AdminSchedulerDetailsJsp = new HtmlNext("/admin/scheduler/admin_scheduler_details.jsp");
 
-    /** The path of the HTML: /admin/suggestbadword/download.jsp */
-    HtmlNext path_AdminSuggestbadword_DownloadJsp = new HtmlNext("/admin/suggestbadword/download.jsp");
+    /** The path of the HTML: /admin/scheduler/admin_scheduler_edit.jsp */
+    HtmlNext path_AdminScheduler_AdminSchedulerEditJsp = new HtmlNext("/admin/scheduler/admin_scheduler_edit.jsp");
 
-    /** The path of the HTML: /admin/suggestbadword/edit.jsp */
-    HtmlNext path_AdminSuggestbadword_EditJsp = new HtmlNext("/admin/suggestbadword/edit.jsp");
+    /** The path of the HTML: /admin/searchlist/admin_searchlist.jsp */
+    HtmlNext path_AdminSearchlist_AdminSearchlistJsp = new HtmlNext("/admin/searchlist/admin_searchlist.jsp");
 
-    /** The path of the HTML: /admin/suggestbadword/index.jsp */
-    HtmlNext path_AdminSuggestbadword_IndexJsp = new HtmlNext("/admin/suggestbadword/index.jsp");
+    /** The path of the HTML: /admin/systeminfo/admin_systeminfo.jsp */
+    HtmlNext path_AdminSysteminfo_AdminSysteminfoJsp = new HtmlNext("/admin/systeminfo/admin_systeminfo.jsp");
 
-    /** The path of the HTML: /admin/suggestbadword/upload.jsp */
-    HtmlNext path_AdminSuggestbadword_UploadJsp = new HtmlNext("/admin/suggestbadword/upload.jsp");
+    /** The path of the HTML: /admin/user/admin_user.jsp */
+    HtmlNext path_AdminUser_AdminUserJsp = new HtmlNext("/admin/user/admin_user.jsp");
 
-    /** The path of the HTML: /admin/suggestelevateword/details.jsp */
-    HtmlNext path_AdminSuggestelevateword_DetailsJsp = new HtmlNext("/admin/suggestelevateword/details.jsp");
+    /** The path of the HTML: /admin/user/admin_user_details.jsp */
+    HtmlNext path_AdminUser_AdminUserDetailsJsp = new HtmlNext("/admin/user/admin_user_details.jsp");
 
-    /** The path of the HTML: /admin/suggestelevateword/download.jsp */
-    HtmlNext path_AdminSuggestelevateword_DownloadJsp = new HtmlNext("/admin/suggestelevateword/download.jsp");
+    /** The path of the HTML: /admin/user/admin_user_edit.jsp */
+    HtmlNext path_AdminUser_AdminUserEditJsp = new HtmlNext("/admin/user/admin_user_edit.jsp");
 
-    /** The path of the HTML: /admin/suggestelevateword/edit.jsp */
-    HtmlNext path_AdminSuggestelevateword_EditJsp = new HtmlNext("/admin/suggestelevateword/edit.jsp");
+    /** The path of the HTML: /admin/webauth/admin_webauth.jsp */
+    HtmlNext path_AdminWebauth_AdminWebauthJsp = new HtmlNext("/admin/webauth/admin_webauth.jsp");
 
-    /** The path of the HTML: /admin/suggestelevateword/index.jsp */
-    HtmlNext path_AdminSuggestelevateword_IndexJsp = new HtmlNext("/admin/suggestelevateword/index.jsp");
+    /** The path of the HTML: /admin/webauth/admin_webauth_details.jsp */
+    HtmlNext path_AdminWebauth_AdminWebauthDetailsJsp = new HtmlNext("/admin/webauth/admin_webauth_details.jsp");
 
-    /** The path of the HTML: /admin/suggestelevateword/upload.jsp */
-    HtmlNext path_AdminSuggestelevateword_UploadJsp = new HtmlNext("/admin/suggestelevateword/upload.jsp");
+    /** The path of the HTML: /admin/webauth/admin_webauth_edit.jsp */
+    HtmlNext path_AdminWebauth_AdminWebauthEditJsp = new HtmlNext("/admin/webauth/admin_webauth_edit.jsp");
 
-    /** The path of the HTML: /admin/systeminfo/index.jsp */
-    HtmlNext path_AdminSysteminfo_IndexJsp = new HtmlNext("/admin/systeminfo/index.jsp");
+    /** The path of the HTML: /admin/webconfig/admin_webconfig.jsp */
+    HtmlNext path_AdminWebconfig_AdminWebconfigJsp = new HtmlNext("/admin/webconfig/admin_webconfig.jsp");
 
-    /** The path of the HTML: /admin/user/details.jsp */
-    HtmlNext path_AdminUser_DetailsJsp = new HtmlNext("/admin/user/details.jsp");
+    /** The path of the HTML: /admin/webconfig/admin_webconfig_details.jsp */
+    HtmlNext path_AdminWebconfig_AdminWebconfigDetailsJsp = new HtmlNext("/admin/webconfig/admin_webconfig_details.jsp");
 
-    /** The path of the HTML: /admin/user/edit.jsp */
-    HtmlNext path_AdminUser_EditJsp = new HtmlNext("/admin/user/edit.jsp");
+    /** The path of the HTML: /admin/webconfig/admin_webconfig_edit.jsp */
+    HtmlNext path_AdminWebconfig_AdminWebconfigEditJsp = new HtmlNext("/admin/webconfig/admin_webconfig_edit.jsp");
 
-    /** The path of the HTML: /admin/user/index.jsp */
-    HtmlNext path_AdminUser_IndexJsp = new HtmlNext("/admin/user/index.jsp");
+    /** The path of the HTML: /admin/wizard/admin_wizard.jsp */
+    HtmlNext path_AdminWizard_AdminWizardJsp = new HtmlNext("/admin/wizard/admin_wizard.jsp");
 
-    /** The path of the HTML: /admin/webauthentication/details.jsp */
-    HtmlNext path_AdminWebauthentication_DetailsJsp = new HtmlNext("/admin/webauthentication/details.jsp");
+    /** The path of the HTML: /admin/wizard/admin_wizard_config.jsp */
+    HtmlNext path_AdminWizard_AdminWizardConfigJsp = new HtmlNext("/admin/wizard/admin_wizard_config.jsp");
 
-    /** The path of the HTML: /admin/webauthentication/edit.jsp */
-    HtmlNext path_AdminWebauthentication_EditJsp = new HtmlNext("/admin/webauthentication/edit.jsp");
-
-    /** The path of the HTML: /admin/webauthentication/index.jsp */
-    HtmlNext path_AdminWebauthentication_IndexJsp = new HtmlNext("/admin/webauthentication/index.jsp");
-
-    /** The path of the HTML: /admin/webconfig/details.jsp */
-    HtmlNext path_AdminWebconfig_DetailsJsp = new HtmlNext("/admin/webconfig/details.jsp");
-
-    /** The path of the HTML: /admin/webconfig/edit.jsp */
-    HtmlNext path_AdminWebconfig_EditJsp = new HtmlNext("/admin/webconfig/edit.jsp");
-
-    /** The path of the HTML: /admin/webconfig/index.jsp */
-    HtmlNext path_AdminWebconfig_IndexJsp = new HtmlNext("/admin/webconfig/index.jsp");
-
-    /** The path of the HTML: /admin/wizard/crawlingConfig.jsp */
-    HtmlNext path_AdminWizard_CrawlingConfigJsp = new HtmlNext("/admin/wizard/crawlingConfig.jsp");
-
-    /** The path of the HTML: /admin/wizard/index.jsp */
-    HtmlNext path_AdminWizard_IndexJsp = new HtmlNext("/admin/wizard/index.jsp");
-
-    /** The path of the HTML: /admin/wizard/startCrawling.jsp */
-    HtmlNext path_AdminWizard_StartCrawlingJsp = new HtmlNext("/admin/wizard/startCrawling.jsp");
+    /** The path of the HTML: /admin/wizard/admin_wizard_start.jsp */
+    HtmlNext path_AdminWizard_AdminWizardStartJsp = new HtmlNext("/admin/wizard/admin_wizard_start.jsp");
 
     /** The path of the HTML: /error/badRequest.jsp */
     HtmlNext path_Error_BadRequestJsp = new HtmlNext("/error/badRequest.jsp");

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -86,8 +86,8 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Num of Thread */
     public static final String LABELS_NUM_OF_THREAD = "{labels.numOfThread}";
 
-    /** The key of the message: Overlapping Name */
-    public static final String LABELS_OVERLAPPING_NAME = "{labels.overlappingName}";
+    /** The key of the message: Duplicate Name */
+    public static final String LABELS_DUPLICATE_HOST_NAME = "{labels.duplicateHostName}";
 
     /** The key of the message: Page Number */
     public static final String LABELS_PAGE_NUMBER = "{labels.pageNumber}";
@@ -525,7 +525,7 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_menu_crawl_config = "{labels.menu_crawl_config}";
 
     /** The key of the message: Scheduler */
-    public static final String LABELS_menu_scheduled_job_config = "{labels.menu_scheduled_job_config}";
+    public static final String LABELS_menu_scheduler_config = "{labels.menu_scheduler_config}";
 
     /** The key of the message: Dashboard */
     public static final String LABELS_menu_dashboard_config = "{labels.menu_dashboard_config}";
@@ -575,8 +575,8 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Request Header */
     public static final String LABELS_menu_request_header = "{labels.menu_request_header}";
 
-    /** The key of the message: Overlapping Host */
-    public static final String LABELS_menu_overlapping_host = "{labels.menu_overlapping_host}";
+    /** The key of the message: Duplicate Host */
+    public static final String LABELS_menu_duplicate_host = "{labels.menu_duplicate_host}";
 
     /** The key of the message: Role */
     public static final String LABELS_menu_role_type = "{labels.menu_role_type}";
@@ -1262,8 +1262,8 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Regular Name */
     public static final String LABELS_regular_name = "{labels.regular_name}";
 
-    /** The key of the message: Overlapping Name */
-    public static final String LABELS_overlapping_name = "{labels.overlapping_name}";
+    /** The key of the message: Duplicate Name */
+    public static final String LABELS_duplicate_name = "{labels.duplicate_name}";
 
     /** The key of the message: Create */
     public static final String LABELS_path_mapping_button_create = "{labels.path_mapping_button_create}";
@@ -1310,62 +1310,62 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Next */
     public static final String LABELS_path_mapping_link_next_page = "{labels.path_mapping_link_next_page}";
 
-    /** The key of the message: Overlapping Host */
-    public static final String LABELS_overlapping_host_configuration = "{labels.overlapping_host_configuration}";
+    /** The key of the message: Duplicate Host */
+    public static final String LABELS_duplicate_host_configuration = "{labels.duplicate_host_configuration}";
 
-    /** The key of the message: Overlapping Host */
-    public static final String LABELS_overlapping_host_title_details = "{labels.overlapping_host_title_details}";
+    /** The key of the message: Duplicate Host */
+    public static final String LABELS_duplicate_host_title_details = "{labels.duplicate_host_title_details}";
 
     /** The key of the message: Confirm */
-    public static final String LABELS_overlapping_host_button_confirm = "{labels.overlapping_host_button_confirm}";
+    public static final String LABELS_duplicate_host_button_confirm = "{labels.duplicate_host_button_confirm}";
 
-    /** The key of the message: Confirm Overlapping Host */
-    public static final String LABELS_overlapping_host_title_confirm = "{labels.overlapping_host_title_confirm}";
+    /** The key of the message: Confirm Duplicate Host */
+    public static final String LABELS_duplicate_host_title_confirm = "{labels.duplicate_host_title_confirm}";
 
     /** The key of the message: Create */
-    public static final String LABELS_overlapping_host_button_create = "{labels.overlapping_host_button_create}";
+    public static final String LABELS_duplicate_host_button_create = "{labels.duplicate_host_button_create}";
 
     /** The key of the message: Back */
-    public static final String LABELS_overlapping_host_button_back = "{labels.overlapping_host_button_back}";
+    public static final String LABELS_duplicate_host_button_back = "{labels.duplicate_host_button_back}";
 
     /** The key of the message: Update */
-    public static final String LABELS_overlapping_host_button_update = "{labels.overlapping_host_button_update}";
+    public static final String LABELS_duplicate_host_button_update = "{labels.duplicate_host_button_update}";
 
     /** The key of the message: Delete */
-    public static final String LABELS_overlapping_host_button_delete = "{labels.overlapping_host_button_delete}";
+    public static final String LABELS_duplicate_host_button_delete = "{labels.duplicate_host_button_delete}";
 
     /** The key of the message: Edit */
-    public static final String LABELS_overlapping_host_button_edit = "{labels.overlapping_host_button_edit}";
+    public static final String LABELS_duplicate_host_button_edit = "{labels.duplicate_host_button_edit}";
 
     /** The key of the message: Create New */
-    public static final String LABELS_overlapping_host_link_create_new = "{labels.overlapping_host_link_create_new}";
+    public static final String LABELS_duplicate_host_link_create_new = "{labels.duplicate_host_link_create_new}";
 
     /** The key of the message: List */
-    public static final String LABELS_overlapping_host_link_list = "{labels.overlapping_host_link_list}";
+    public static final String LABELS_duplicate_host_link_list = "{labels.duplicate_host_link_list}";
 
     /** The key of the message: Create New */
-    public static final String LABELS_overlapping_host_link_create = "{labels.overlapping_host_link_create}";
+    public static final String LABELS_duplicate_host_link_create = "{labels.duplicate_host_link_create}";
 
     /** The key of the message: Edit */
-    public static final String LABELS_overlapping_host_link_update = "{labels.overlapping_host_link_update}";
+    public static final String LABELS_duplicate_host_link_update = "{labels.duplicate_host_link_update}";
 
     /** The key of the message: Details */
-    public static final String LABELS_overlapping_host_link_confirm = "{labels.overlapping_host_link_confirm}";
+    public static final String LABELS_duplicate_host_link_confirm = "{labels.duplicate_host_link_confirm}";
 
     /** The key of the message: Details */
-    public static final String LABELS_overlapping_host_link_details = "{labels.overlapping_host_link_details}";
+    public static final String LABELS_duplicate_host_link_details = "{labels.duplicate_host_link_details}";
 
     /** The key of the message: Edit */
-    public static final String LABELS_overlapping_host_link_edit = "{labels.overlapping_host_link_edit}";
+    public static final String LABELS_duplicate_host_link_edit = "{labels.duplicate_host_link_edit}";
 
     /** The key of the message: Delete */
-    public static final String LABELS_overlapping_host_link_delete = "{labels.overlapping_host_link_delete}";
+    public static final String LABELS_duplicate_host_link_delete = "{labels.duplicate_host_link_delete}";
 
     /** The key of the message: Prev */
-    public static final String LABELS_overlapping_host_link_prev_page = "{labels.overlapping_host_link_prev_page}";
+    public static final String LABELS_duplicate_host_link_prev_page = "{labels.duplicate_host_link_prev_page}";
 
     /** The key of the message: Next */
-    public static final String LABELS_overlapping_host_link_next_page = "{labels.overlapping_host_link_next_page}";
+    public static final String LABELS_duplicate_host_link_next_page = "{labels.duplicate_host_link_next_page}";
 
     /** The key of the message: System Configuration */
     public static final String LABELS_dashboard_title_configuration = "{labels.dashboard_title_configuration}";

src/main/java/org/codelibs/fess/util/ComponentUtil.java

@@ -27,6 +27,7 @@ import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.helper.AdRoleHelper;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingSessionHelper;
+import org.codelibs.fess.helper.DuplicateHostHelper;
 import org.codelibs.fess.helper.FileTypeHelper;
 import org.codelibs.fess.helper.HotSearchWordHelper;
 import org.codelibs.fess.helper.IndexingHelper;
@@ -34,7 +35,6 @@ import org.codelibs.fess.helper.IntervalControlHelper;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.KeyMatchHelper;
 import org.codelibs.fess.helper.LabelTypeHelper;
-import org.codelibs.fess.helper.OverlappingHostHelper;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.QueryHelper;
 import org.codelibs.fess.helper.SambaHelper;
@@ -80,7 +80,7 @@ public final class ComponentUtil {
 
     private static final String JOB_HELPER = "jobHelper";
 
-    private static final String OVERLAPPING_HOST_HELPER = "overlappingHostHelper";
+    private static final String DUPLICATE_HOST_HELPER = "duplicateHostHelper";
 
     private static final String PATH_MAPPING_HELPER = "pathMappingHelper";
 
@@ -177,8 +177,8 @@ public final class ComponentUtil {
         return SingletonLaContainer.getComponent(PATH_MAPPING_HELPER);
     }
 
-    public static OverlappingHostHelper getOverlappingHostHelper() {
-        return SingletonLaContainer.getComponent(OVERLAPPING_HOST_HELPER);
+    public static DuplicateHostHelper getDuplicateHostHelper() {
+        return SingletonLaContainer.getComponent(DUPLICATE_HOST_HELPER);
     }
 
     public static JobHelper getJobHelper() {

src/main/resources/esclient.xml

@@ -73,7 +73,7 @@
 			<arg>".fess_config/label_type"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/overlapping_host"</arg>
+			<arg>".fess_config/duplicate_host"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
 			<arg>".fess_config/path_mapping"</arg>

src/main/resources/esflute_config.xml

@@ -11,6 +11,7 @@
     <component name="dataConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigToLabelBhv"/>
     <component name="dataConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigToRoleBhv"/>
     <component name="dataConfigBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigBhv"/>
+    <component name="duplicateHostBhv" class="org.codelibs.fess.es.config.exbhv.DuplicateHostBhv"/>
     <component name="failureUrlBhv" class="org.codelibs.fess.es.config.exbhv.FailureUrlBhv"/>
     <component name="fileAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv"/>
     <component name="fileConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigToLabelBhv"/>
@@ -20,7 +21,6 @@
     <component name="keyMatchBhv" class="org.codelibs.fess.es.config.exbhv.KeyMatchBhv"/>
     <component name="labelTypeBhv" class="org.codelibs.fess.es.config.exbhv.LabelTypeBhv"/>
     <component name="labelToRoleBhv" class="org.codelibs.fess.es.config.exbhv.LabelToRoleBhv"/>
-    <component name="overlappingHostBhv" class="org.codelibs.fess.es.config.exbhv.OverlappingHostBhv"/>
     <component name="pathMappingBhv" class="org.codelibs.fess.es.config.exbhv.PathMappingBhv"/>
     <component name="requestHeaderBhv" class="org.codelibs.fess.es.config.exbhv.RequestHeaderBhv"/>
     <component name="roleTypeBhv" class="org.codelibs.fess.es.config.exbhv.RoleTypeBhv"/>

src/main/resources/fess_indices/.fess_config/duplicate_host.json

@@ -1,5 +1,5 @@
 {
-  "overlapping_host": {
+  "duplicate_host": {
     "_source": {
       "enabled": true
     },
@@ -11,7 +11,7 @@
         "type": "string",
         "index": "not_analyzed"
       },
-      "overlappingName": {
+      "duplicateHostName": {
         "type": "string",
         "index": "not_analyzed"
       },

src/main/resources/fess_label.properties

@@ -19,7 +19,7 @@ labels.intervalTime=Interval Time
 labels.maxAccessCount=Max Access Count
 labels.name=Name
 labels.numOfThread=Num of Thread
-labels.overlappingName=Overlapping Name
+labels.duplicateHostName=Duplicate Name
 labels.pageNumber=Page Number
 labels.password=Password
 labels.paths=Paths
@@ -171,7 +171,7 @@ labels.suggestBadWordFile=Bad Word File
 labels.menu_system=System
 labels.menu_wizard=Wizard
 labels.menu_crawl_config=General
-labels.menu_scheduled_job_config=Scheduler
+labels.menu_scheduler_config=Scheduler
 labels.menu_dashboard_config=Dashboard
 labels.menu_document_config=Index
 labels.menu_design=Page Design
@@ -188,7 +188,7 @@ labels.menu_path_mapping=Path Mapping
 labels.menu_web_authentication=Web Authentication
 labels.menu_file_authentication=File Authentication
 labels.menu_request_header=Request Header
-labels.menu_overlapping_host=Overlapping Host
+labels.menu_duplicate_host=Duplicate Host
 labels.menu_role_type=Role
 labels.menu_user=User
 labels.menu_role=Role
@@ -424,7 +424,7 @@ labels.path_mapping_pt_displaying=Displaying
 labels.path_mapping_pt_both=Crawling/Displaying
 labels.path_mapping_title_confirm=Confirm Path Mapping
 labels.regular_name=Regular Name
-labels.overlapping_name=Overlapping Name
+labels.duplicate_name=Duplicate Name
 labels.path_mapping_button_create=Create
 labels.path_mapping_button_back=Back
 labels.path_mapping_button_update=Update
@@ -441,28 +441,28 @@ labels.path_mapping_link_edit=Edit
 labels.path_mapping_link_delete=Delete
 labels.path_mapping_link_prev_page=Prev
 labels.path_mapping_link_next_page=Next
-labels.overlapping_host_configuration=Overlapping Host
-labels.overlapping_host_title_details=Overlapping Host
-labels.overlapping_host_button_create=Create
-labels.overlapping_host_button_back=Back
-labels.overlapping_host_button_confirm=Confirm
-labels.overlapping_host_title_confirm=Confirm Overlapping Host
-labels.overlapping_host_button_create=Create
-labels.overlapping_host_button_back=Back
-labels.overlapping_host_button_update=Update
-labels.overlapping_host_button_delete=Delete
-labels.overlapping_host_button_edit=Edit
-labels.overlapping_host_link_create_new=Create New
-labels.overlapping_host_link_list=List
-labels.overlapping_host_link_create=Create New
-labels.overlapping_host_link_update=Edit
-labels.overlapping_host_link_delete=Delete
-labels.overlapping_host_link_confirm=Details
-labels.overlapping_host_link_details=Details
-labels.overlapping_host_link_edit=Edit
-labels.overlapping_host_link_delete=Delete
-labels.overlapping_host_link_prev_page=Prev
-labels.overlapping_host_link_next_page=Next
+labels.duplicate_host_configuration=Duplicate Host
+labels.duplicate_host_title_details=Duplicate Host
+labels.duplicate_host_button_create=Create
+labels.duplicate_host_button_back=Back
+labels.duplicate_host_button_confirm=Confirm
+labels.duplicate_host_title_confirm=Confirm Duplicate Host
+labels.duplicate_host_button_create=Create
+labels.duplicate_host_button_back=Back
+labels.duplicate_host_button_update=Update
+labels.duplicate_host_button_delete=Delete
+labels.duplicate_host_button_edit=Edit
+labels.duplicate_host_link_create_new=Create New
+labels.duplicate_host_link_list=List
+labels.duplicate_host_link_create=Create New
+labels.duplicate_host_link_update=Edit
+labels.duplicate_host_link_delete=Delete
+labels.duplicate_host_link_confirm=Details
+labels.duplicate_host_link_details=Details
+labels.duplicate_host_link_edit=Edit
+labels.duplicate_host_link_delete=Delete
+labels.duplicate_host_link_prev_page=Prev
+labels.duplicate_host_link_next_page=Next
 labels.dashboard_title_configuration=System Configuration
 labels.system_title_system_status=System Status
 labels.es_button_update=Update

src/main/webapp/WEB-INF/crawler/resources/app.xml

@@ -16,7 +16,7 @@
 	</component>
 	<component name="dataIndexHelper" class="org.codelibs.fess.helper.DataIndexHelper">
 	</component>
-	<component name="overlappingHostHelper" class="org.codelibs.fess.helper.OverlappingHostHelper">
+	<component name="duplicateHostHelper" class="org.codelibs.fess.helper.DuplicateHostHelper">
 	</component>
 	<component name="intervalControlHelper" class="org.codelibs.fess.helper.IntervalControlHelper">
 		<!-- 

src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp

@@ -28,7 +28,7 @@
 							<div class="box-header with-border">
 								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								<div class="btn-group pull-right">
-									<la:link href="/admin/suggestbadword"
+									<la:link href="/admin/badword"
 										styleClass="btn btn-default btn-xs">
 										<la:message key="labels.suggest_bad_word_link_list" />
 									</la:link>
@@ -72,7 +72,7 @@
 													<c:forEach var="data" varStatus="s"
 														items="${suggestBadWordItems}">
 														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-															data-href="${contextPath}/admin/suggestbadword/details/4/${f:u(data.id)}">
+															data-href="${contextPath}/admin/badword/details/4/${f:u(data.id)}">
 															<td style="overflow-x: auto;">${f:h(data.suggestWord)}</td>
 														</tr>
 													</c:forEach>

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp

@@ -21,7 +21,7 @@
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 			<section class="content">
-				<la:form>
+				<la:form action="/admin/badword/">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 						<la:hidden property="id" />

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp

@@ -20,7 +20,7 @@
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/suggestbadword">
+					<li class="active"><la:link href="/admin/badword">
 							<la:message key="labels.suggest_bad_word_link_list" />
 						</la:link></li>
 					<li class="active"><a href="#"><la:message
@@ -34,7 +34,7 @@
 							<div class="box-header with-border">
 								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								<div class="btn-group pull-right">
-									<la:link href="/admin/suggestbadword"
+									<la:link href="/admin/badword"
 										styleClass="btn btn-default btn-xs">
 										<la:message key="labels.suggest_bad_word_link_list" />
 									</la:link>
@@ -52,7 +52,7 @@
 							</div>
 							<!-- /.box-header -->
 							<div class="box-body">
-								<la:form>
+								<la:form action="/admin/badword/">
 									<table class="table table-bordered">
 										<tbody>
 											<tr>

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp

@@ -21,7 +21,7 @@
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 			<section class="content">
-				<la:form styleClass="form-horizontal">
+				<la:form  action="/admin/badword/" styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 						<la:hidden property="id" />

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp

@@ -23,7 +23,7 @@
 				</h1>
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/suggestbadword">
+					<li class="active"><la:link href="/admin/badword">
 							<la:message key="labels.suggest_bad_word_link_list" />
 						</la:link></li>
 					<li class="active"><a href="#"><la:message
@@ -40,7 +40,7 @@
 							<div class="box-header with-border">
 								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								<div class="btn-group pull-right">
-									<la:link href="/admin/suggestbadword"
+									<la:link href="/admin/badword"
 										styleClass="btn btn-default btn-xs">
 										<la:message key="labels.suggest_bad_word_link_list" />
 									</la:link>
@@ -58,7 +58,7 @@
 							</div>
 							<!-- /.box-header -->
 							<div class="box-body">
-								<la:form action="upload" enctype="multipart/form-data">
+								<la:form action="/admin/badword/" enctype="multipart/form-data">
 									<table class="table table-bordered">
 										<tbody>
 											<tr>

src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp

@@ -58,7 +58,7 @@
 													<c:forEach var="data" varStatus="s"
 														items="${boostDocumentRuleItems}">
 														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-															data-href="${contextPath}/admin/boostdocumentrule/details/4/${f:u(data.id)}">
+															data-href="${contextPath}/admin/boostdoc/details/4/${f:u(data.id)}">
 															<td>${f:h(data.urlExpr)}</td>
 														</tr>
 													</c:forEach>

src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_details.jsp

@@ -21,7 +21,7 @@
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 			<section class="content">
-				<la:form>
+				<la:form action="/admin/boostdoc/">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 						<la:hidden property="id" />

src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_edit.jsp

@@ -21,7 +21,7 @@
 				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 			<section class="content">
-				<la:form styleClass="form-horizontal">
+				<la:form action="/admin/boostdoc/" styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
 						<la:hidden property="id" />

src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp

@@ -45,7 +45,7 @@
 								</div>
 								<div class="row">
 									<div class="col-sm-12">
-										<la:form styleClass="form-inline" action="/admin/crawlinginfo">
+										<la:form styleClass="form-inline" action="/admin/crawlinginfo/">
 											<div class="form-group">
 												<c:set var="ph_session_id">
 													<la:message key="labels.crawling_session_session_id_search" />

src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp

@@ -35,7 +35,7 @@
 			<section class="content">
 
 				<%-- Form --%>
-				<la:form action="/admin/crawlinginfo">
+				<la:form action="/admin/crawlinginfo/">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==4}">
 						<la:hidden property="id" />

src/main/webapp/WEB-INF/view/admin/data/index.jsp

@@ -1,98 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert
-	template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title">
-		<la:message key="labels.data_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="data" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
-
-		<div id="main">
-
-			<%-- Message: BEGIN --%>
-			<div>
-				<la:info id="msg" message="true">
-					<div class="alert-message info">${msg}</div>
-				</la:info>
-				<la:errors />
-			</div>
-			<%-- Message: END --%>
-
-			<la:form>
-				<div>
-					<h3>
-						<la:message key="labels.backup_title_edit" />
-					</h3>
-					<table class="bordered-table zebra-striped">
-						<tbody>
-							<tr>
-								<th style="width: 200px;"><la:message
-										key="labels.backup_config" /></th>
-								<td><la:link href="download">
-										<la:message key="labels.download_data" />
-									</la:link></td>
-							</tr>
-							<tr>
-								<th style="width: 200px;"><la:message
-										key="labels.backup_session_info" /></th>
-								<td><la:link href="downloadCrawlingSession">
-										<la:message key="labels.download_data_csv" />
-									</la:link></td>
-							</tr>
-							<tr>
-								<th style="width: 200px;"><la:message
-										key="labels.backup_search_log" /></th>
-								<td><la:link href="downloadSearchLog">
-										<la:message key="labels.download_data_csv" />
-									</la:link></td>
-							</tr>
-							<tr>
-								<th style="width: 200px;"><la:message
-										key="labels.backup_click_log" /></th>
-								<td><la:link href="downloadClickLog">
-										<la:message key="labels.download_data_csv" />
-									</la:link></td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</la:form>
-			<la:form action="upload" enctype="multipart/form-data"
-				style="margin-top:10px;">
-				<div>
-					<h3>
-						<la:message key="labels.restore_title_edit" />
-					</h3>
-					<table>
-						<tbody>
-							<tr>
-								<th><la:message key="labels.restore" /></th>
-								<td><input type="file" name="uploadedFile" /></td>
-							</tr>
-							<tr>
-								<th><la:message key="labels.overwrite" /></th>
-								<td><la:checkbox property="overwrite" />
-									<la:message key="labels.enabled" /></td>
-							</tr>
-						</tbody>
-						<tfoot>
-							<tr>
-								<td colspan="2">
-									<button type="submit" class="btn btn-danger" name="upload"
-										value="<la:message key="labels.upload_button" />">
-										<la:message key="labels.upload_button" />
-									</button>
-								</td>
-							</tr>
-						</tfoot>
-					</table>
-				</div>
-			</la:form>
-
-		</div>
-
-	</tiles:put>
-</tiles:insert>