635 changed files with 5760 additions and 5083 deletions
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches:
+    - master
+    - "*.x"
+  pull_request:
+    branches:
+    - master
+    - "*.x"
+  schedule:
+    - cron: '36 4 * * 2'
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['java', 'javascript']
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 2
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -1,96 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-  schedule:
-    - cron: '38 6 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-    permissions:
-      # required for all workflows
-      security-events: write
-
-      # required to fetch internal or private CodeQL packs
-      packages: read
-
-      # only required for workflows in private repositories
-      actions: read
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - language: java-kotlin
-          build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
-        - language: javascript-typescript
-          build-mode: none
-        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
-        # Use `c-cpp` to analyze code written in C, C++ or both
-        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        build-mode: ${{ matrix.build-mode }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    # If the analyze step fails for one of the languages you are analyzing with
-    # "We were unable to automatically build your code", modify the matrix above
-    # to set the build mode to "manual" for that language. Then modify this step
-    # to build your code.
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-    - if: matrix.build-mode == 'manual'
-      shell: bash
-      run: |
-        echo 'If you are using a "manual" build mode for one or more of the' \
-          'languages you are analyzing, replace this with the commands to build' \
-          'your code, for example:'
-        echo '  make bootstrap'
-        echo '  make release'
-        exit 1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
-
--- a/.gitignore
+++ b/.gitignore
@ -6,8 +6,7 @@
 /src/main/webapp/WEB-INF/classes/
 /src/main/webapp/WEB-INF/lib/
 /src/main/webapp/WEB-INF/site/
-/src/main/webapp/WEB-INF/plugin/*
-!/src/main/webapp/WEB-INF/plugin/.keep
+/src/main/webapp/WEB-INF/plugin/
 /src/main/webapp/WEB-INF/env/crawler/lib/
 /src/main/webapp/WEB-INF/env/suggest/lib/
 /src/main/webapp/WEB-INF/env/thumbnail/lib/
--- a/README.md
+++ b/README.md
@ -8,7 +8,7 @@
 Fess is a very powerful and easily deployable Enterprise Search Server. You can quickly install and run Fess on any platform where you can run the Java Runtime Environment. Fess is provided under the [Apache License 2.0](LICENSE).

 Fess is based on [OpenSearch](https://github.com/opensearch-project/OpenSearch), but knowledge/experience about OpenSearch is _not_ required. Fess provides an easy to use Administration GUI to configure the system via your browser.
-Fess also contains a Crawler, which can crawl documents on a [web server](https://fess.codelibs.org/14.18/admin/webconfig-guide.html), [file system](https://fess.codelibs.org/14.18/admin/fileconfig-guide.html), or [Data Store](https://fess.codelibs.org/14.18/admin/dataconfig-guide.html) (such as a CSV or database). Many file formats are supported including (but not limited to): Microsoft Office, PDF, and zip.
+Fess also contains a Crawler, which can crawl documents on a [web server](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), [file system](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html), or [Data Store](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) (such as a CSV or database). Many file formats are supported including (but not limited to): Microsoft Office, PDF, and zip.

 *[Fess Site Search](https://github.com/codelibs/fess-site-search)* is a free alternative to [Google Site Search](https://enterprise.google.com/search/products/gss.html). For more details, see the [FSS JS Generator documentation](https://fss-generator.codelibs.org/docs/manual).

@ -26,15 +26,15 @@ There are 2 ways to try Fess. The first is to download and install yourself. The

 ### Download and Install/Run

-Fess 14.18 is now available and can be downloaded on the [Releases page](https://github.com/codelibs/fess/releases "download"). Downloads come in 3 flavors: deb, rpm, zip.
+Fess 14.17 is now available and can be downloaded on the [Releases page](https://github.com/codelibs/fess/releases "download"). Downloads come in 3 flavors: deb, rpm, zip.

 The following commands show how to use the zip download:

-    $ unzip fess-14.18.x.zip
-    $ cd fess-14.18.x
+    $ unzip fess-14.17.x.zip
+    $ cd fess-14.17.x
    $ ./bin/fess

-For more details, see the [Installation Guide](https://fess.codelibs.org/14.18/install/index.html).
+For more details, see the [Installation Guide](https://fess.codelibs.org/14.17/install/index.html).

 ### Docker

@ -50,7 +50,7 @@ We provide Docker images on [ghcr.io](https://github.com/orgs/codelibs/packages)

 ![Admin UI](https://fess.codelibs.org/_images/fess_admin_dashboard.png)

-You can register crawling targets in the Admin UI on the (Web, File, Data Store) crawler configuration pages, and then start the Crawler manually on the [Scheduler page](https://fess.codelibs.org/14.18/admin/scheduler-guide.html).
+You can register crawling targets in the Admin UI on the (Web, File, Data Store) crawler configuration pages, and then start the Crawler manually on the [Scheduler page](https://fess.codelibs.org/14.17/admin/scheduler-guide.html).

 ## Migration from another search provider

@ -58,7 +58,7 @@ Please see [MIGRATION.md](MIGRATION.md).

 ## Data Store

-Currently, Fess supports crawling the following [storage locations and APIs](https://fess.codelibs.org/14.18/admin/dataconfig-guide.html):
+Currently, Fess supports crawling the following [storage locations and APIs](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html):

 - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian)
 - [Box](https://github.com/codelibs/fess-ds-box)
--- a/dbflute.xml
+++ b/dbflute.xml
@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="fess-14.17" />
+	<property name="branch.name" value="fess-14.15" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />

 	<target name="mydbflute.check">
--- a/dbflute_fess/dfprop/esfluteMap.dfprop
+++ b/dbflute_fess/dfprop/esfluteMap.dfprop
@ -1,6 +1,6 @@
 map:{
    # base package of generated classes
-    ; basePackage = org.codelibs.fess.opensearch
+    ; basePackage = org.codelibs.fess.es

    # base path to JSON resource, URL or relative path
    ; basePath = ../src/main/config/es
--- a/deps.xml
+++ b/deps.xml
@ -16,6 +16,8 @@
 		<mkdir dir="${target.dir}" />
 		<delete dir="${webinf.dir}/lib" />
 		<mkdir dir="${webinf.dir}/lib" />
+		<delete dir="${webinf.dir}/plugin" />
+		<mkdir dir="${webinf.dir}/plugin" />
 		<delete dir="${crawler.dir}/lib" />
 		<mkdir dir="${crawler.dir}/lib" />
 		<delete dir="${suggest.dir}/lib" />
@ -41,11 +43,14 @@
 			</patternset>
 			<cutdirsmapper dirs="2" />
 		</unzip>
-		<delete>
-			<fileset dir="${webinf.dir}/plugin">
-				<include name="**/*.jar" />
-			</fileset>
-		</delete>
+		<!-- fess-script-groovy -->
+		<antcall target="install.plugin.jar">
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
+			<param name="jar.groupId" value="org/codelibs/fess" />
+			<param name="jar.artifactId" value="fess-script-groovy" />
+			<param name="jar.version" value="15.0.0-SNAPSHOT" />
+			<param name="file.version" value="15.0.0-20240201.072053-1" />
+		</antcall>
 	</target>

 	<target name="install.env.jar">
@ -59,4 +64,12 @@
 		<copy file="${target.dir}/${jar.artifactId}-${file.version}.jar"
 			todir="${thumbnail.dir}/lib"/>
 	</target>
+
+	<target name="install.plugin.jar">
+		<get dest="${target.dir}">
+			<url url="${repo.url}/${jar.groupId}/${jar.artifactId}/${jar.version}/${jar.artifactId}-${file.version}.jar" />
+		</get>
+		<copy file="${target.dir}/${jar.artifactId}-${file.version}.jar"
+			todir="${webinf.dir}/plugin"/>
+	</target>
 </project>
--- a/module.xml
+++ b/module.xml
@ -6,7 +6,7 @@
 	<!-- Maven Repository -->
 	<property name="maven.snapshot.repo.url" value="https://maven.codelibs.org/" />
 	<property name="maven.release.repo.url" value="https://maven.codelibs.org/" />
-	<property name="opensearch.version" value="2.18.0" />
+	<property name="opensearch.version" value="2.15.0" />

 	<target name="install.modules">
 		<mkdir dir="${target.dir}" />
--- a/plugin.xml
+++ b/plugin.xml
@ -17,8 +17,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="2.18.0" />
-			<param name="plugin.zip.version" value="2.18.0" />
+			<param name="plugin.version" value="2.15.0" />
+			<param name="plugin.zip.version" value="2.15.0" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
@ -26,8 +26,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="2.18.0" />
-			<param name="plugin.zip.version" value="2.18.0" />
+			<param name="plugin.version" value="2.15.0" />
+			<param name="plugin.zip.version" value="2.15.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
@ -35,8 +35,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="2.18.0" />
-			<param name="plugin.zip.version" value="2.18.0" />
+			<param name="plugin.version" value="2.15.0" />
+			<param name="plugin.zip.version" value="2.15.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
@ -44,8 +44,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="2.18.0" />
-			<param name="plugin.zip.version" value="2.18.0" />
+			<param name="plugin.version" value="2.15.0" />
+			<param name="plugin.zip.version" value="2.15.0" />
 		</antcall>

 		<antcall target="remove.jars" />
--- a/pom.xml
+++ b/pom.xml
@ -67,7 +67,7 @@
 			<id>integrationTests</id>
 			<properties>
 				<test.include.path>**/*Tests.java</test.include.path>
-				<test.command.args />
+				<test.command.args></test.command.args>
 			</properties>
 		</profile>
 	</profiles>
@ -109,7 +109,6 @@
 							<directory>${project.build.directory}/${project.build.finalName}-compress</directory>
 						</resource>
 					</webResources>
-					<packagingExcludes>**/*.min.map,**/*.min.css.map,**/*.min.js.map</packagingExcludes>
 				</configuration>
 			</plugin>
 			<plugin>
@ -1350,16 +1349,6 @@
 			<artifactId>bcmail-jdk18on</artifactId>
 			<version>${bouncycastle.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk18on</artifactId>
-			<version>${bouncycastle.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.esotericsoftware</groupId>
-			<artifactId>kryo</artifactId>
-			<version>${kryo.version}</version>
-		</dependency>

 		<!-- suggest library -->
 		<dependency>
@ -1446,7 +1435,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.codelibs.fess</groupId>
-			<artifactId>fess-crawler-opensearch</artifactId>
+			<artifactId>fess-crawler-es</artifactId>
 			<version>${crawler.version}</version>
 		</dependency>
 		<dependency>
@ -1532,13 +1521,6 @@
 			<scope>provided</scope>
 		</dependency>

-		<!-- groovy -->
-		<dependency>
-			<groupId>org.apache.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>${groovy.version}</version>
-		</dependency>
-
 		<!-- test -->
 		<dependency>
 			<groupId>junit</groupId>
@ -1573,7 +1555,23 @@
 		<dependency>
 			<groupId>io.rest-assured</groupId>
 			<artifactId>rest-assured</artifactId>
-			<version>5.5.0</version>
+			<version>4.3.2</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>httpclient</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>jakarta.xml.bind</groupId>
+					<artifactId>jakarta.xml.bind-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.groovy</groupId>
+			<artifactId>groovy</artifactId>
+			<version>${groovy.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
--- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
@ -50,6 +50,7 @@ import org.codelibs.fess.entity.PingResponse;
 import org.codelibs.fess.entity.SearchRenderData;
 import org.codelibs.fess.entity.SearchRequestParams;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
+import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidAccessTokenException;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
@ -64,7 +65,6 @@ import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.helper.UserInfoHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.suggest.entity.SuggestItem;
 import org.codelibs.fess.suggest.request.suggest.SuggestRequestBuilder;
 import org.codelibs.fess.suggest.request.suggest.SuggestResponse;
--- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
+++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
@ -22,10 +22,10 @@ import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.logic.AccessContextLogic;
 import org.codelibs.fess.app.service.ScheduledJobService;
+import org.codelibs.fess.es.config.exbhv.JobLogBhv;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.core.time.TimeManager;
--- a/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
+++ b/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
@ -19,12 +19,12 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.es.config.exentity.JobLog;
+import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.exception.ScheduledJobException;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.JobExecutor;
-import org.codelibs.fess.opensearch.config.exentity.JobLog;
-import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.job.JobManager;
 import org.lastaflute.job.LaJob;
--- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
+++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
@ -25,11 +25,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.AccessTokenPager;
+import org.codelibs.fess.es.config.cbean.AccessTokenCB;
+import org.codelibs.fess.es.config.exbhv.AccessTokenBhv;
+import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.exception.InvalidAccessTokenException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.AccessTokenCB;
-import org.codelibs.fess.opensearch.config.exbhv.AccessTokenBhv;
-import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
--- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java
@ -27,11 +27,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.BadWordPager;
+import org.codelibs.fess.es.client.SearchEngineClient;
+import org.codelibs.fess.es.config.cbean.BadWordCB;
+import org.codelibs.fess.es.config.exbhv.BadWordBhv;
+import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
-import org.codelibs.fess.opensearch.config.cbean.BadWordCB;
-import org.codelibs.fess.opensearch.config.exbhv.BadWordBhv;
-import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;
--- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.BoostDocPager;
+import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
+import org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv;
+import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.BoostDocumentRuleCB;
-import org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv;
-import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

--- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
@ -35,13 +35,13 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.CrawlingInfoPager;
+import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
+import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv;
+import org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv;
+import org.codelibs.fess.es.config.exentity.CrawlingInfo;
+import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.CrawlingInfoCB;
-import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoBhv;
-import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoParamBhv;
-import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
-import org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.ListResultBean;
--- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.DataConfigPager;
+import org.codelibs.fess.es.config.cbean.DataConfigCB;
+import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.DataConfigCB;
-import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
-import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
--- a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 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.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.DuplicateHostCB;
-import org.codelibs.fess.opensearch.config.exbhv.DuplicateHostBhv;
-import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

--- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
@ -31,16 +31,16 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ElevateWordPager;
+import org.codelibs.fess.es.client.SearchEngineClient;
+import org.codelibs.fess.es.config.cbean.ElevateWordCB;
+import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv;
+import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
+import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
+import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
-import org.codelibs.fess.opensearch.config.cbean.ElevateWordCB;
-import org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv;
-import org.codelibs.fess.opensearch.config.exbhv.ElevateWordToLabelBhv;
-import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
-import org.codelibs.fess.opensearch.config.exentity.ElevateWordToLabel;
-import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;
--- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
@ -26,13 +26,13 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FailureUrlPager;
+import org.codelibs.fess.es.config.cbean.FailureUrlCB;
+import org.codelibs.fess.es.config.exbhv.FailureUrlBhv;
+import org.codelibs.fess.es.config.exentity.CrawlingConfig;
+import org.codelibs.fess.es.config.exentity.FailureUrl;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.FailureUrlCB;
-import org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv;
-import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
-import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
@ -20,12 +20,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;

+import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.es.log.exentity.FavoriteLog;
+import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
-import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;

--- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FileAuthPager;
+import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
+import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
+import org.codelibs.fess.es.config.exentity.FileAuthentication;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.FileAuthenticationCB;
-import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
-import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
@ -21,11 +21,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FileConfigPager;
+import org.codelibs.fess.es.config.cbean.FileConfigCB;
+import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
+import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.FileConfigCB;
-import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
-import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
--- a/src/main/java/org/codelibs/fess/app/service/GroupService.java
+++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java
@ -22,11 +22,11 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.GroupPager;
+import org.codelibs.fess.es.user.cbean.GroupCB;
+import org.codelibs.fess.es.user.exbhv.GroupBhv;
+import org.codelibs.fess.es.user.exbhv.UserBhv;
+import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.user.cbean.GroupCB;
-import org.codelibs.fess.opensearch.user.exbhv.GroupBhv;
-import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
-import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/JobLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/JobLogService.java
@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.JobLogPager;
+import org.codelibs.fess.es.config.cbean.JobLogCB;
+import org.codelibs.fess.es.config.exbhv.JobLogBhv;
+import org.codelibs.fess.es.config.exentity.JobLog;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.JobLogCB;
-import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
-import org.codelibs.fess.opensearch.config.exentity.JobLog;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
+++ b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.KeyMatchPager;
+import org.codelibs.fess.es.config.cbean.KeyMatchCB;
+import org.codelibs.fess.es.config.exbhv.KeyMatchBhv;
+import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.KeyMatchCB;
-import org.codelibs.fess.opensearch.config.exbhv.KeyMatchBhv;
-import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

--- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
@ -21,11 +21,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.LabelTypePager;
+import org.codelibs.fess.es.config.cbean.LabelTypeCB;
+import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.LabelTypeHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.LabelTypeCB;
-import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
+++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
@ -22,10 +22,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.PathMapPager;
+import org.codelibs.fess.es.config.cbean.PathMappingCB;
+import org.codelibs.fess.es.config.exbhv.PathMappingBhv;
+import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.PathMappingCB;
-import org.codelibs.fess.opensearch.config.exbhv.PathMappingBhv;
-import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RelatedContentPager;
+import org.codelibs.fess.es.config.cbean.RelatedContentCB;
+import org.codelibs.fess.es.config.exbhv.RelatedContentBhv;
+import org.codelibs.fess.es.config.exentity.RelatedContent;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.RelatedContentCB;
-import org.codelibs.fess.opensearch.config.exbhv.RelatedContentBhv;
-import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RelatedQueryPager;
+import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
+import org.codelibs.fess.es.config.exbhv.RelatedQueryBhv;
+import org.codelibs.fess.es.config.exentity.RelatedQuery;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.RelatedQueryCB;
-import org.codelibs.fess.opensearch.config.exbhv.RelatedQueryBhv;
-import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ReqHeaderPager;
+import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
+import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
+import org.codelibs.fess.es.config.exentity.RequestHeader;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.RequestHeaderCB;
-import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
-import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

--- a/src/main/java/org/codelibs/fess/app/service/RoleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java
@ -22,11 +22,11 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RolePager;
+import org.codelibs.fess.es.user.cbean.RoleCB;
+import org.codelibs.fess.es.user.exbhv.RoleBhv;
+import org.codelibs.fess.es.user.exbhv.UserBhv;
+import org.codelibs.fess.es.user.exentity.Role;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.user.cbean.RoleCB;
-import org.codelibs.fess.opensearch.user.exbhv.RoleBhv;
-import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
-import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RoleTypePager;
+import org.codelibs.fess.es.config.cbean.RoleTypeCB;
+import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
+import org.codelibs.fess.es.config.exentity.RoleType;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.RoleTypeCB;
-import org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv;
-import org.codelibs.fess.opensearch.config.exentity.RoleType;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

--- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
@ -22,10 +22,10 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SchedulerPager;
+import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
+import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv;
+import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.ScheduledJobCB;
-import org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv;
-import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@ -33,22 +33,22 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SearchLogPager;
+import org.codelibs.fess.es.log.allcommon.EsPagingResultBean;
+import org.codelibs.fess.es.log.cbean.ClickLogCB;
+import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
+import org.codelibs.fess.es.log.cbean.SearchLogCB;
+import org.codelibs.fess.es.log.cbean.UserInfoCB;
+import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.es.log.exentity.ClickLog;
+import org.codelibs.fess.es.log.exentity.FavoriteLog;
+import org.codelibs.fess.es.log.exentity.SearchLog;
+import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.log.allcommon.EsPagingResultBean;
-import org.codelibs.fess.opensearch.log.cbean.ClickLogCB;
-import org.codelibs.fess.opensearch.log.cbean.FavoriteLogCB;
-import org.codelibs.fess.opensearch.log.cbean.SearchLogCB;
-import org.codelibs.fess.opensearch.log.cbean.UserInfoCB;
-import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.opensearch.log.exentity.ClickLog;
-import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
-import org.codelibs.fess.opensearch.log.exentity.SearchLog;
-import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.dbflute.optional.OptionalEntity;
 import org.opensearch.search.aggregations.AggregationBuilders;
--- a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java
@ -15,8 +15,8 @@
 */
 package org.codelibs.fess.app.service;

+import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;

 import jakarta.annotation.Resource;

--- a/src/main/java/org/codelibs/fess/app/service/UserService.java
+++ b/src/main/java/org/codelibs/fess/app/service/UserService.java
@ -22,11 +22,11 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.UserPager;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
+import org.codelibs.fess.es.user.cbean.UserCB;
+import org.codelibs.fess.es.user.exbhv.UserBhv;
+import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.exception.FessUserNotFoundException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.user.cbean.UserCB;
-import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
-import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.WebAuthPager;
+import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
+import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
+import org.codelibs.fess.es.config.exentity.WebAuthentication;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.WebAuthenticationCB;
-import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
-import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
@ -21,12 +21,12 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.WebConfigPager;
+import org.codelibs.fess.es.config.cbean.WebConfigCB;
+import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
+import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
+import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.cbean.WebConfigCB;
-import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
-import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
-import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
--- a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
@ -27,6 +27,7 @@ import org.codelibs.fess.app.web.admin.design.AdminDesignAction;
 import org.codelibs.fess.app.web.admin.dict.AdminDictAction;
 import org.codelibs.fess.app.web.admin.duplicatehost.AdminDuplicatehostAction;
 import org.codelibs.fess.app.web.admin.elevateword.AdminElevatewordAction;
+import org.codelibs.fess.app.web.admin.esreq.AdminEsreqAction;
 import org.codelibs.fess.app.web.admin.failureurl.AdminFailureurlAction;
 import org.codelibs.fess.app.web.admin.fileauth.AdminFileauthAction;
 import org.codelibs.fess.app.web.admin.fileconfig.AdminFileconfigAction;
@ -45,7 +46,6 @@ import org.codelibs.fess.app.web.admin.reqheader.AdminReqheaderAction;
 import org.codelibs.fess.app.web.admin.role.AdminRoleAction;
 import org.codelibs.fess.app.web.admin.scheduler.AdminSchedulerAction;
 import org.codelibs.fess.app.web.admin.searchlog.AdminSearchlogAction;
-import org.codelibs.fess.app.web.admin.sereq.AdminSereqAction;
 import org.codelibs.fess.app.web.admin.storage.AdminStorageAction;
 import org.codelibs.fess.app.web.admin.suggest.AdminSuggestAction;
 import org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction;
@ -142,8 +142,8 @@ public class AdminAction extends FessAdminAction {
            AdminBackupAction.ROLE + VIEW, //
            AdminMaintenanceAction.ROLE, //
            AdminMaintenanceAction.ROLE + VIEW, //
-            AdminSereqAction.ROLE, //
-            AdminSereqAction.ROLE + VIEW, //
+            AdminEsreqAction.ROLE, //
+            AdminEsreqAction.ROLE + VIEW, //
            AdminDashboardAction.ROLE, //
            AdminDashboardAction.ROLE + VIEW, //
            AdminWizardAction.ROLE, //
@ -216,8 +216,8 @@ public class AdminAction extends FessAdminAction {
            AdminBackupAction.ROLE + VIEW, //
            AdminMaintenanceAction.ROLE, //
            AdminMaintenanceAction.ROLE + VIEW, //
-            AdminSereqAction.ROLE, //
-            AdminSereqAction.ROLE + VIEW, //
+            AdminEsreqAction.ROLE, //
+            AdminEsreqAction.ROLE + VIEW, //
            AdminDashboardAction.ROLE, //
            AdminDashboardAction.ROLE + VIEW, //
            AdminWizardAction.ROLE, //
@ -290,8 +290,8 @@ public class AdminAction extends FessAdminAction {
            AdminBackupAction.ROLE + VIEW, //
            AdminMaintenanceAction.ROLE, //
            AdminMaintenanceAction.ROLE + VIEW, //
-            AdminSereqAction.ROLE, //
-            AdminSereqAction.ROLE + VIEW,//
+            AdminEsreqAction.ROLE, //
+            AdminEsreqAction.ROLE + VIEW,//

    })
    public HtmlResponse index() {
@ -413,8 +413,8 @@ public class AdminAction extends FessAdminAction {
        if (user.hasRoles(getActionRoles(AdminMaintenanceAction.ROLE))) {
            return AdminMaintenanceAction.class;
        }
-        if (user.hasRoles(getActionRoles(AdminSereqAction.ROLE))) {
-            return AdminSereqAction.class;
+        if (user.hasRoles(getActionRoles(AdminEsreqAction.ROLE))) {
+            return AdminEsreqAction.class;
        }
        return null;
    }
@ -423,4 +423,4 @@ public class AdminAction extends FessAdminAction {
        return new String[] { role, role + VIEW };
    }

-}
+}
--- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
@ -30,9 +30,9 @@ import org.codelibs.fess.app.pager.AccessTokenPager;
 import org.codelibs.fess.app.service.AccessTokenService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
@ -54,19 +54,19 @@ import org.codelibs.curl.CurlResponse;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.es.log.exentity.ClickLog;
+import org.codelibs.fess.es.log.exentity.FavoriteLog;
+import org.codelibs.fess.es.log.exentity.SearchLog;
+import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.opensearch.log.exentity.ClickLog;
-import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
-import org.codelibs.fess.opensearch.log.exentity.SearchLog;
-import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.GsaConfigParser;
 import org.codelibs.fess.util.RenderDataUtil;
--- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
@ -35,10 +35,10 @@ import org.codelibs.fess.app.pager.BadWordPager;
 import org.codelibs.fess.app.service.BadWordService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
@ -24,8 +24,8 @@ import org.codelibs.fess.app.pager.BoostDocPager;
 import org.codelibs.fess.app.service.BoostDocumentRuleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
@ -36,10 +36,10 @@ import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.ds.DataStoreFactory;
+import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
@ -23,8 +23,8 @@ 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.DuplicateHost;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
@ -42,11 +42,11 @@ import org.codelibs.fess.app.service.ElevateWordService;
 import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.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.sereq;
+package org.codelibs.fess.app.web.admin.esreq;

 import java.io.BufferedReader;
 import java.io.File;
@ -42,16 +42,16 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 /**
 * @author shinsuke
 */
-public class AdminSereqAction extends FessAdminAction {
+public class AdminEsreqAction extends FessAdminAction {

-    public static final String ROLE = "admin-sereq";
+    public static final String ROLE = "admin-esreq";

-    private static final Logger logger = LogManager.getLogger(AdminSereqAction.class);
+    private static final Logger logger = LogManager.getLogger(AdminEsreqAction.class);

    @Override
    protected void setupHtmlData(final ActionRuntime runtime) {
        super.setupHtmlData(runtime);
-        runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameSereq()));
+        runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameEsreq()));
    }

    @Override
@ -95,7 +95,7 @@ public class AdminSereqAction extends FessAdminAction {
            throwValidationError(messages -> messages.addErrorsInvalidHeaderForRequestFile(GLOBAL, msg), () -> asListHtml(this::saveToken));
        } else {
            try (final CurlResponse response = curlRequest.body(buf.toString()).execute()) {
-                final File tempFile = ComponentUtil.getSystemHelper().createTempFile("sereq_", ".json");
+                final File tempFile = ComponentUtil.getSystemHelper().createTempFile("esreq_", ".json");
                try (final InputStream in = response.getContentAsStream()) {
                    CopyUtil.copy(in, tempFile);
                } catch (final Exception e1) {
@ -160,7 +160,7 @@ public class AdminSereqAction extends FessAdminAction {
        if (runnable != null) {
            runnable.run();
        }
-        return asHtml(path_AdminSereq_AdminSereqJsp).useForm(UploadForm.class);
+        return asHtml(path_AdminEsreq_AdminEsreqJsp).useForm(UploadForm.class);
    }

 }
--- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/esreq/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.sereq;
+package org.codelibs.fess.app.web.admin.esreq;

 import org.lastaflute.web.ruts.multipart.MultipartFormFile;
 import org.lastaflute.web.validation.Required;
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
@ -30,9 +30,9 @@ import org.codelibs.fess.app.service.FileAuthenticationService;
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.FileAuthentication;
+import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
-import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
@ -32,10 +32,10 @@ import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
@ -27,8 +27,8 @@ import org.codelibs.fess.app.pager.GroupPager;
 import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.mylasta.action.FessMessages;
-import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
@ -27,9 +27,9 @@ import org.codelibs.fess.app.pager.KeyMatchPager;
 import org.codelibs.fess.app.service.KeyMatchService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.helper.KeyMatchHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
@ -31,9 +31,9 @@ import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
@ -37,8 +37,8 @@ import org.codelibs.curl.CurlResponse;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig.SimpleImpl;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.SearchEngineUtil;
 import org.lastaflute.web.Execute;
--- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
@ -23,8 +23,8 @@ import org.codelibs.fess.app.pager.PathMapPager;
 import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
@ -24,8 +24,8 @@ import org.codelibs.fess.app.pager.RelatedContentPager;
 import org.codelibs.fess.app.service.RelatedContentService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.RelatedContent;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
@ -31,8 +31,8 @@ import org.codelibs.fess.app.pager.RelatedQueryPager;
 import org.codelibs.fess.app.service.RelatedQueryService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.RelatedQuery;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
@ -29,9 +29,9 @@ import org.codelibs.fess.app.service.RequestHeaderService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.RequestHeader;
+import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
-import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
@ -25,7 +25,7 @@ import org.codelibs.fess.app.pager.RolePager;
 import org.codelibs.fess.app.service.RoleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.opensearch.user.exentity.Role;
+import org.codelibs.fess.es.user.exentity.Role;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
@ -26,9 +26,9 @@ import org.codelibs.fess.app.pager.SchedulerPager;
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.helper.ProcessHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
@ -29,6 +29,7 @@ import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.entity.SearchRenderData;
+import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.QueryHelper;
@ -36,7 +37,6 @@ import org.codelibs.fess.helper.SearchHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.action.FessMessages;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
--- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
@ -33,8 +33,8 @@ import org.codelibs.fess.app.service.UserService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
+import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.mylasta.action.FessMessages;
-import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
@ -30,9 +30,9 @@ import org.codelibs.fess.app.service.WebAuthenticationService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.WebAuthentication;
+import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
-import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
@ -33,10 +33,10 @@ import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
@ -31,10 +31,10 @@ import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.crawler.util.CharUtil;
+import org.codelibs.fess.es.config.exentity.FileConfig;
+import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.ProcessHelper;
-import org.codelibs.fess.opensearch.config.exentity.FileConfig;
-import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
-import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.job.JobManager;
 import org.lastaflute.job.key.LaJobUnique;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
@ -35,8 +35,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.helper.PermissionHelper;
-import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
@ -40,9 +40,9 @@ import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
-import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java
@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
+import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java
@ -27,8 +27,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiLogResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.CrawlingInfo;
 import org.codelibs.fess.helper.ProcessHelper;
-import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.PermissionHelper;
-import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java
@ -29,10 +29,10 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiBulkResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
 import org.codelibs.fess.app.web.api.admin.searchlist.ApiAdminSearchlistAction;
+import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.LanguageHelper;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
@ -31,7 +31,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
+import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
@ -43,10 +43,10 @@ import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SuggestHelper;
-import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java
@ -27,8 +27,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiLogResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.FailureUrl;
 import org.codelibs.fess.helper.ProcessHelper;
-import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
+import org.codelibs.fess.es.config.exentity.FileAuthentication;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.PermissionHelper;
-import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
@ -28,8 +28,8 @@ import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.user.exentity.Group;
-import org.codelibs.fess.opensearch.user.exentity.User;
+import org.codelibs.fess.es.user.exentity.Group;
+import org.codelibs.fess.es.user.exentity.User;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java
@ -27,7 +27,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiLogResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.JobLog;
+import org.codelibs.fess.es.config.exentity.JobLog;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
@ -31,7 +31,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
+import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
-import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
@ -28,7 +28,7 @@ import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.PathMapping;
+import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
@ -31,7 +31,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
+import org.codelibs.fess.es.config.exentity.RelatedContent;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
@ -34,7 +34,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
+import org.codelibs.fess.es.config.exentity.RelatedQuery;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
+import org.codelibs.fess.es.config.exentity.RequestHeader;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
@ -27,7 +27,7 @@ import org.codelibs.fess.app.service.RoleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.user.exentity.Role;
+import org.codelibs.fess.es.user.exentity.Role;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
@ -30,7 +30,7 @@ import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
+import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
@ -34,10 +34,10 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
 import org.codelibs.fess.entity.SearchRenderData;
+import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.SearchHelper;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java
@ -24,7 +24,7 @@ import java.util.Locale;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiStatsResponse;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
@ -28,7 +28,7 @@ import org.codelibs.fess.app.service.UserService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.user.exentity.User;
+import org.codelibs.fess.es.user.exentity.User;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
+import org.codelibs.fess.es.config.exentity.WebAuthentication;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

--- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
+import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.PermissionHelper;
-import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
--- a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java
+++ b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java
@ -23,10 +23,10 @@ import org.codelibs.fess.app.web.RootAction;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.login.LoginAction;
 import org.codelibs.fess.entity.FessUser;
+import org.codelibs.fess.es.user.exbhv.UserBhv;
 import org.codelibs.fess.exception.UserRoleLoginException;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
 import org.codelibs.fess.sso.SsoAuthenticator;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
--- a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
@ -28,10 +28,10 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.base.FessSearchAction;
 import org.codelibs.fess.app.web.error.ErrorAction;
 import org.codelibs.fess.crawler.util.CharUtil;
+import org.codelibs.fess.es.log.exentity.ClickLog;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SearchLogHelper;
 import org.codelibs.fess.helper.ViewHelper;
-import org.codelibs.fess.opensearch.log.exentity.ClickLog;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.dbflute.util.DfTypeUtil;
--- a/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java
+++ b/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java
@ -20,7 +20,7 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 import org.apache.commons.lang3.ArrayUtils;
 import org.codelibs.core.stream.StreamUtil.StreamOf;
 import org.codelibs.fess.auth.chain.AuthenticationChain;
-import org.codelibs.fess.opensearch.user.exentity.User;
+import org.codelibs.fess.es.user.exentity.User;

 public class AuthenticationManager {

--- a/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java
+++ b/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java
@ -15,7 +15,7 @@
 */
 package org.codelibs.fess.auth.chain;

-import org.codelibs.fess.opensearch.user.exentity.User;
+import org.codelibs.fess.es.user.exentity.User;

 public interface AuthenticationChain {

--- a/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java
+++ b/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java
@ -34,8 +34,8 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.fess.crawler.Constants;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
+import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.exception.CommandExecutionException;
-import org.codelibs.fess.opensearch.user.exentity.User;

 public class CommandChain implements AuthenticationChain {

--- a/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java
+++ b/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java
@ -15,7 +15,7 @@
 */
 package org.codelibs.fess.auth.chain;

-import org.codelibs.fess.opensearch.user.exentity.User;
+import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;

 public class LdapChain implements AuthenticationChain {
--- a/Show more
+++ b/Show more