#2867 Organized and updated referenced JavaScript files in JSP views for consistency and functionality.

fix #2545 add userMenu to id attribute
fix #2544 Add lang attribute.
2025-01-18 21:09:07 +09:00 · 2025-01-18 20:58:45 +09:00 · 2025-01-18 20:38:54 +09:00 · 2025-01-18 14:47:48 +09:00 · 2025-01-18 14:32:37 +09:00 · 2025-01-12 15:14:02 +09:00
807 changed files with 5769 additions and 6450 deletions
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@ -16,14 +16,14 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-latest
+    runs-on: macos-14
    timeout-minutes: 15
    steps:
    - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
      uses: actions/setup-java@v4
      with:
-        java-version: '17'
+        java-version: '21'
        distribution: 'temurin'
    - uses: actions/cache@v4
      with:
--- a/.gitignore
+++ b/.gitignore
@ -6,7 +6,8 @@
 /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/*
+!/src/main/webapp/WEB-INF/plugin/.keep
 /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.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 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 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.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.
+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.

 The following commands show how to use the zip download:

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

-For more details, see the [Installation Guide](https://fess.codelibs.org/14.17/install/index.html).
+For more details, see the [Installation Guide](https://fess.codelibs.org/14.18/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.17/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.18/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.17/admin/dataconfig-guide.html):
+Currently, Fess supports crawling the following [storage locations and APIs](https://fess.codelibs.org/14.18/admin/dataconfig-guide.html):

 - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian)
 - [Box](https://github.com/codelibs/fess-ds-box)
--- 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.es
+    ; basePackage = org.codelibs.fess.opensearch

    # base path to JSON resource, URL or relative path
    ; basePath = ../src/main/config/es
--- a/deps.xml
+++ b/deps.xml
@ -16,21 +16,19 @@
 		<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" />
 		<mkdir dir="${suggest.dir}/lib" />
 		<delete dir="${thumbnail.dir}/lib" />
 		<mkdir dir="${thumbnail.dir}/lib" />
-		<!-- javax.annotation-api -->
+		<!-- annotation-api -->
 		<antcall target="install.env.jar">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="jar.groupId" value="javax/annotation" />
-			<param name="jar.artifactId" value="javax.annotation-api" />
-			<param name="jar.version" value="1.3.2" />
-			<param name="file.version" value="1.3.2" />
+			<param name="jar.groupId" value="jakarta/annotation" />
+			<param name="jar.artifactId" value="jakarta.annotation-api" />
+			<param name="jar.version" value="2.1.1" />
+			<param name="file.version" value="2.1.1" />
 		</antcall>
 		<!-- kopf -->
 		<get dest="${target.dir}/kopf.zip">
@ -43,14 +41,11 @@
 			</patternset>
 			<cutdirsmapper dirs="2" />
 		</unzip>
-		<!-- fess-script-groovy -->
-		<antcall target="install.plugin.jar">
-			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="jar.groupId" value="org/codelibs/fess" />
-			<param name="jar.artifactId" value="fess-script-groovy" />
-			<param name="jar.version" value="14.17.0" />
-			<param name="file.version" value="14.17.0" />
-		</antcall>
+		<delete>
+			<fileset dir="${webinf.dir}/plugin">
+				<include name="**/*.jar" />
+			</fileset>
+		</delete>
 	</target>

 	<target name="install.env.jar">
@ -64,12 +59,4 @@
 		<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.17.0" />
+	<property name="opensearch.version" value="2.18.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.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.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.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.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.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.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.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>

 		<antcall target="remove.jars" />
--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>fess</artifactId>
-	<version>14.18.0-SNAPSHOT</version>
+	<version>15.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>Fess</name>
 	<description>Fess is Full tExt Search System.</description>
@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.codelibs.fess</groupId>
 		<artifactId>fess-parent</artifactId>
-		<version>14.18.0-SNAPSHOT</version>
+		<version>15.0.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<properties>
@ -109,6 +109,7 @@
 							<directory>${project.build.directory}/${project.build.finalName}-compress</directory>
 						</resource>
 					</webResources>
+					<packagingExcludes>**/*.min.map,**/*.min.css.map,**/*.min.js.map</packagingExcludes>
 				</configuration>
 			</plugin>
 			<plugin>
@ -944,16 +945,31 @@

 		<!-- J2EE -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>${jstl.version}</version>
-			<!-- contains taglibs.standard -->
+			<groupId>jakarta.servlet.jsp.jstl</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+			<version>${jakarta.jstl.api.version}</version>
 			<!-- <scope>provided</scope> -->
+			<exclusions>
+				<exclusion>
+					<groupId>jakarta.el</groupId>
+					<artifactId>jakarta.el-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>jakarta.servlet</groupId>
+					<artifactId>jakarta.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>javax.transaction-api</artifactId>
-			<version>${javax.transaction.api.version}</version>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl</artifactId>
+			<!-- contains taglibs.standard -->
+			<version>${jakarta.jstl.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.transaction</groupId>
+			<artifactId>jakarta.transaction-api</artifactId>
+			<version>${jakarta.transaction.api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
@ -1319,7 +1335,7 @@
 			<version>${okhttp.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.onelogin</groupId>
+			<groupId>org.codelibs</groupId>
 			<artifactId>java-saml</artifactId>
 			<version>${java.saml.version}</version>
 			<exclusions>
@ -1339,6 +1355,11 @@
 			<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>
@ -1349,8 +1370,8 @@

 		<!-- fileupload -->
 		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
 			<version>${commons.fileupload.version}</version>
 		</dependency>

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

+		<!-- groovy -->
+		<dependency>
+			<groupId>org.apache.groovy</groupId>
+			<artifactId>groovy</artifactId>
+			<version>${groovy.version}</version>
+		</dependency>
+
 		<!-- test -->
 		<dependency>
 			<groupId>junit</groupId>
@ -1545,23 +1573,7 @@
 		<dependency>
 			<groupId>io.rest-assured</groupId>
 			<artifactId>rest-assured</artifactId>
-			<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>
+			<version>5.5.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
--- a/src/main/java/org/codelibs/fess/FessBoot.java
+++ b/src/main/java/org/codelibs/fess/FessBoot.java
@ -30,6 +30,7 @@ import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.http.CookieProcessorBase;
 import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
 import org.apache.tomcat.util.net.SSLHostConfig;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.tomcat.valve.SuppressErrorReportValve;
 import org.codelibs.fess.tomcat.webresources.FessWebResourceRoot;
@ -171,12 +172,16 @@ public class FessBoot extends TomcatBoot {
                    connector.setProperty("SSLEnabled", "true");
                    final SSLHostConfig sslHostConfig = new SSLHostConfig();
                    sslHostConfig.setHostName("_default_");
-                    doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> sslHostConfig.setCertificateKeystoreFile(v));
-                    doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> sslHostConfig.setCertificateKeystorePassword(v));
-                    doSetupServerConfig(logger, props, "certificateKeyAlias", v -> sslHostConfig.setCertificateKeyAlias(v));
+                    final SSLHostConfigCertificate certificate =
+                            new SSLHostConfigCertificate(sslHostConfig, SSLHostConfigCertificate.Type.UNDEFINED);
+                    doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> certificate.setCertificateKeystoreFile(v));
+                    doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> certificate.setCertificateKeystorePassword(v));
+                    doSetupServerConfig(logger, props, "certificateKeyAlias", v -> certificate.setCertificateKeyAlias(v));
                    doSetupServerConfig(logger, props, "sslProtocol", v -> sslHostConfig.setSslProtocol(v));
                    doSetupServerConfig(logger, props, "enabledProtocols", v -> sslHostConfig.setEnabledProtocols(v.trim().split(",")));
+                    sslHostConfig.addCertificate(certificate);
                    connector.addSslHostConfig(sslHostConfig);
+
                }
            });
            doSetupServerConfig(logger, props, "sameSiteCookies", value -> {
--- a/src/main/java/org/codelibs/fess/api/BaseApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/BaseApiManager.java
@ -20,14 +20,14 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.Locale;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.fess.Constants;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;

+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public abstract class BaseApiManager implements WebApiManager {

    private static final String API_FORMAT_TYPE = "apiFormatType";
--- a/src/main/java/org/codelibs/fess/api/WebApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/WebApiManager.java
@ -17,10 +17,10 @@ package org.codelibs.fess.api;

 import java.io.IOException;

-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 public interface WebApiManager {

--- a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java
+++ b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java
@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;

 public class WebApiManagerFactory {

--- a/src/main/java/org/codelibs/fess/api/WebApiRequest.java
+++ b/src/main/java/org/codelibs/fess/api/WebApiRequest.java
@ -15,8 +15,8 @@
 */
 package org.codelibs.fess.api;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;

 public class WebApiRequest extends HttpServletRequestWrapper {
    protected String servletPath;
--- a/src/main/java/org/codelibs/fess/api/WebApiResponse.java
+++ b/src/main/java/org/codelibs/fess/api/WebApiResponse.java
@ -18,11 +18,11 @@ package org.codelibs.fess.api;
 import java.io.IOException;
 import java.io.PrintWriter;

-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
 import org.apache.commons.io.output.ByteArrayOutputStream;

+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+
 public class WebApiResponse extends HttpServletResponseWrapper {

    public WebApiResponse(final HttpServletResponse response) {
--- a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java
@ -23,14 +23,6 @@ import java.nio.file.Path;
 import java.util.Locale;
 import java.util.UUID;

-import javax.annotation.PostConstruct;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.catalina.connector.ClientAbortException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@ -49,6 +41,14 @@ import org.codelibs.fess.util.ResourceUtil;
 import org.lastaflute.web.servlet.request.RequestManager;
 import org.lastaflute.web.servlet.session.SessionManager;

+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SearchEngineApiManager extends BaseApiManager {
    private static final String ADMIN_SERVER = "/admin/server_";

--- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
@ -32,12 +32,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.function.Supplier;

-import javax.annotation.PostConstruct;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
@ -56,7 +50,6 @@ 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;
@ -71,6 +64,7 @@ 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;
@ -83,6 +77,12 @@ import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.opensearch.script.Script;

+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SearchApiManager extends BaseApiManager {

    private static final Logger logger = LogManager.getLogger(SearchApiManager.class);
--- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
+++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
@ -15,8 +15,6 @@
 */
 package org.codelibs.fess.app.job;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
@ -24,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;
@ -36,6 +34,8 @@ import org.lastaflute.job.LaJob;
 import org.lastaflute.job.LaJobRunner;
 import org.lastaflute.job.LaJobScheduler;

+import jakarta.annotation.Resource;
+
 public class AllJobScheduler implements LaJobScheduler {

    private static final Logger logger = LogManager.getLogger(AllJobScheduler.class);
--- 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/logic/AccessContextLogic.java
+++ b/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java
@ -15,14 +15,14 @@
 */
 package org.codelibs.fess.app.logic;

-import javax.annotation.Resource;
-
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.dbflute.hook.AccessContext;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.core.time.TimeManager;
 import org.lastaflute.db.dbflute.accesscontext.AccessContextResource;

+import jakarta.annotation.Resource;
+
 public class AccessContextLogic {

    // ===================================================================================
--- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
+++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
@ -21,23 +21,23 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 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;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+
 public class AccessTokenService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java
@ -21,19 +21,17 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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;
@ -43,6 +41,8 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;

+import jakarta.annotation.Resource;
+
 public class BadWordService {

    private static final String DELETE_PREFIX = "--";
--- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class BoostDocumentRuleService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/CharMappingService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CharMappingService.java
@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.CharMappingPager;
@ -30,6 +28,8 @@ import org.codelibs.fess.dict.mapping.CharMappingItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class CharMappingService {
    @Resource
    protected DictionaryManager dictionaryManager;
--- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
@ -28,8 +28,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.CoreLibConstants;
@ -37,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;
@ -54,6 +52,8 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;

+import jakarta.annotation.Resource;
+
 public class CrawlingInfoService {

    private static final Logger logger = LogManager.getLogger(CrawlingInfoService.class);
--- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
@ -17,21 +17,21 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class DataConfigService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class DuplicateHostService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
@ -25,24 +25,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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;
@ -52,6 +50,8 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;

+import jakarta.annotation.Resource;
+
 public class ElevateWordService {

    private static final Logger logger = LogManager.getLogger(ElevateWordService.class);
--- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
@ -20,25 +20,25 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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;

+import jakarta.annotation.Resource;
+
 public class FailureUrlService {

    private static final Logger logger = LogManager.getLogger(FailureUrlService.class);
--- a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
@ -20,17 +20,17 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;

-import javax.annotation.Resource;
-
-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;

+import jakarta.annotation.Resource;
+
 public class FavoriteLogService {
    @Resource
    protected SystemHelper systemHelper;
--- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class FileAuthenticationService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
@ -17,22 +17,22 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class FileConfigService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/GroupService.java
+++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java
@ -19,20 +19,20 @@ import static org.codelibs.core.stream.StreamUtil.stream;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class GroupService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/JobLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/JobLogService.java
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class JobLogService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
+++ b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class KeyMatchService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/KuromojiService.java
+++ b/src/main/java/org/codelibs/fess/app/service/KuromojiService.java
@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.KuromojiPager;
@ -30,6 +28,8 @@ import org.codelibs.fess.dict.kuromoji.KuromojiItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class KuromojiService {
    @Resource
    protected DictionaryManager dictionaryManager;
--- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
@ -17,21 +17,21 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class LabelTypeService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
+++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
@ -18,20 +18,20 @@ package org.codelibs.fess.app.service;
 import java.util.Collection;
 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class PathMappingService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java
@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ProtwordsPager;
@ -30,6 +28,8 @@ import org.codelibs.fess.dict.protwords.ProtwordsItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class ProtwordsService {
    @Resource
    protected DictionaryManager dictionaryManager;
--- a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
@ -17,20 +17,20 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class RelatedContentService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
@ -17,20 +17,20 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class RelatedQueryService extends FessAppService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
@ -17,18 +17,18 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class RequestHeaderService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/RoleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java
@ -19,20 +19,20 @@ import static org.codelibs.core.stream.StreamUtil.stream;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class RoleService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
@ -17,18 +17,18 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class RoleTypeService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
@ -17,22 +17,22 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 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;
 import org.lastaflute.job.LaCron;

+import jakarta.annotation.Resource;
+
 public class ScheduledJobService {

    private static final Logger logger = LogManager.getLogger(ScheduledJobService.class);
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@ -27,30 +27,28 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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;
@ -61,6 +59,8 @@ import org.opensearch.search.aggregations.bucket.terms.Terms;
 import org.opensearch.search.aggregations.metrics.Avg;
 import org.opensearch.search.aggregations.metrics.Cardinality;

+import jakarta.annotation.Resource;
+
 public class SearchLogService {

    private static final String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
--- a/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java
+++ b/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java
@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.StemmerOverridePager;
@ -30,6 +28,8 @@ import org.codelibs.fess.dict.stemmeroverride.StemmerOverrideItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class StemmerOverrideService {
    @Resource
    protected DictionaryManager dictionaryManager;
--- a/src/main/java/org/codelibs/fess/app/service/StopwordsService.java
+++ b/src/main/java/org/codelibs/fess/app/service/StopwordsService.java
@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.StopwordsPager;
@ -30,6 +28,8 @@ import org.codelibs.fess.dict.stopwords.StopwordsItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class StopwordsService {
    @Resource
    protected DictionaryManager dictionaryManager;
--- a/src/main/java/org/codelibs/fess/app/service/SynonymService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SynonymService.java
@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SynonymPager;
@ -30,6 +28,8 @@ import org.codelibs.fess.dict.synonym.SynonymItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class SynonymService {
    @Resource
    protected DictionaryManager dictionaryManager;
--- a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java
@ -15,10 +15,10 @@
 */
 package org.codelibs.fess.app.service;

-import javax.annotation.Resource;
-
-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;

 public class UserInfoService {

--- a/src/main/java/org/codelibs/fess/app/service/UserService.java
+++ b/src/main/java/org/codelibs/fess/app/service/UserService.java
@ -17,22 +17,22 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 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;

+import jakarta.annotation.Resource;
+
 public class UserService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
@ -17,19 +17,19 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;

+import jakarta.annotation.Resource;
+
 public class WebAuthenticationService {

    @Resource
--- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
@ -17,23 +17,23 @@ package org.codelibs.fess.app.service;

 import java.util.List;

-import javax.annotation.Resource;
-
 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;
 import org.dbflute.optional.OptionalEntity;

+import jakarta.annotation.Resource;
+
 public class WebConfigService extends FessAppService {

    @Resource
--- 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,7 +27,6 @@ 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;
@ -46,6 +45,7 @@ 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, //
-            AdminEsreqAction.ROLE, //
-            AdminEsreqAction.ROLE + VIEW, //
+            AdminSereqAction.ROLE, //
+            AdminSereqAction.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, //
-            AdminEsreqAction.ROLE, //
-            AdminEsreqAction.ROLE + VIEW, //
+            AdminSereqAction.ROLE, //
+            AdminSereqAction.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, //
-            AdminEsreqAction.ROLE, //
-            AdminEsreqAction.ROLE + VIEW,//
+            AdminSereqAction.ROLE, //
+            AdminSereqAction.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(AdminEsreqAction.ROLE))) {
-            return AdminEsreqAction.class;
+        if (user.hasRoles(getActionRoles(AdminSereqAction.ROLE))) {
+            return AdminSereqAction.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
@ -20,8 +20,6 @@ import static org.codelibs.core.stream.StreamUtil.stream;

 import java.util.stream.Collectors;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -32,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;
@ -44,6 +42,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java
@ -15,15 +15,15 @@
 */
 package org.codelibs.fess.app.web.admin.accesstoken;

-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.CustomSize;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 public class CreateForm {

    @ValidateTypeFailure
--- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.accesstoken;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 * @author jflute
--- 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
@ -43,8 +43,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;

-import javax.annotation.Resource;
-
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@ -56,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;
@ -86,6 +84,8 @@ import org.xml.sax.InputSource;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 */
--- 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
@ -25,8 +25,6 @@ import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -37,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;
@ -51,6 +49,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author Keiichi Watanabe
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java
@ -15,13 +15,13 @@
 */
 package org.codelibs.fess.app.web.admin.badword;

-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.badword;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author Keiichi Watanabe
 */
--- 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
@ -15,8 +15,6 @@
 */
 package org.codelibs.fess.app.web.admin.boostdoc;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -26,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;
@ -37,6 +35,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java
@ -15,15 +15,15 @@
 */
 package org.codelibs.fess.app.web.admin.boostdoc;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 public class CreateForm {

    @ValidateTypeFailure
--- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.boostdoc;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 * @author jflute
--- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
@ -15,8 +15,6 @@
 */
 package org.codelibs.fess.app.web.admin.crawlinginfo;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.Constants;
@ -32,6 +30,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Shunji Makino
--- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.crawlinginfo;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 * @author Shunji Makino
--- a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java
@ -15,8 +15,6 @@
 */
 package org.codelibs.fess.app.web.admin.dashboard;

-import javax.annotation.Resource;
-
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.api.engine.SearchEngineApiManager;
 import org.codelibs.fess.app.web.base.FessAdminAction;
@ -25,6 +23,8 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- 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
@ -25,8 +25,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
@ -38,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;
@ -51,6 +49,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
@ -15,16 +15,16 @@
 */
 package org.codelibs.fess.app.web.admin.dataconfig;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.CustomSize;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.dataconfig;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author Keiichi Watanabe
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.design;

-import javax.validation.constraints.Pattern;
-
 import org.lastaflute.web.ruts.multipart.MultipartFormFile;
 import org.lastaflute.web.validation.Required;

+import jakarta.validation.constraints.Pattern;
+
 public class UploadForm {

    @Required
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java
@ -15,8 +15,6 @@
 */
 package org.codelibs.fess.app.web.admin.dict;

-import javax.annotation.Resource;
-
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.dict.DictionaryFile;
@ -27,6 +25,8 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author Keiichi Watanabe
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -46,6 +44,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java
@ -15,12 +15,12 @@
 */
 package org.codelibs.fess.app.web.admin.dict.kuromoji;

-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java
@ -21,8 +21,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -48,6 +46,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;

+import jakarta.annotation.Resource;
+
 /**
 * @author nullpos
 * @author ma2tani
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java
@ -15,12 +15,12 @@
 */
 package org.codelibs.fess.app.web.admin.dict.mapping;

-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author nullpos
 * @author ma2tani
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java
@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -46,6 +44,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;

+import jakarta.annotation.Resource;
+
 /**
 * @author ma2tani
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java
@ -15,12 +15,12 @@
 */
 package org.codelibs.fess.app.web.admin.dict.protwords;

-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author ma2tani
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java
@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -46,6 +44,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java
@ -15,12 +15,12 @@
 */
 package org.codelibs.fess.app.web.admin.dict.stemmeroverride;

-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java
@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -44,6 +42,8 @@ import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;

+import jakarta.annotation.Resource;
+
 /**
 * @author ma2tani
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java
@ -15,12 +15,12 @@
 */
 package org.codelibs.fess.app.web.admin.dict.stopwords;

-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author ma2tani
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
@ -21,8 +21,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -48,6 +46,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java
@ -15,12 +15,12 @@
 */
 package org.codelibs.fess.app.web.admin.dict.synonym;

-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- 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
@ -15,8 +15,6 @@
 */
 package org.codelibs.fess.app.web.admin.duplicatehost;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.Constants;
@ -25,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;
@ -36,6 +34,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java
@ -15,15 +15,15 @@
 */
 package org.codelibs.fess.app.web.admin.duplicatehost;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.duplicatehost;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author Keiichi Watanabe
 */
--- 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
@ -30,8 +30,6 @@ import java.nio.file.Path;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -44,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;
@ -59,6 +57,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author Keiichi Watanabe
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java
@ -15,13 +15,13 @@
 */
 package org.codelibs.fess.app.web.admin.elevateword;

-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.CustomSize;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.elevateword;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author Keiichi Watanabe
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
@ -15,8 +15,6 @@
 */
 package org.codelibs.fess.app.web.admin.failureurl;

-import javax.annotation.Resource;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.pager.FailureUrlPager;
@ -29,6 +27,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.failureurl;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- 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
@ -21,8 +21,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.Constants;
@ -32,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;
@ -44,6 +42,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java
@ -15,15 +15,15 @@
 */
 package org.codelibs.fess.app.web.admin.fileauth;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.fileauth;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author Keiichi Watanabe
 */
--- 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
@ -21,8 +21,6 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
@ -34,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;
@ -47,6 +45,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
@ -15,10 +15,6 @@
 */
 package org.codelibs.fess.app.web.admin.fileconfig;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.mylasta.direction.FessConfig;
@ -29,6 +25,10 @@ import org.codelibs.fess.validation.UriTypeValidator.ProtocolType;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
 * @author codelibs
 * @author Keiichi Watanabe
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java
@ -15,11 +15,11 @@
 */
 package org.codelibs.fess.app.web.admin.fileconfig;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author Keiichi Watanabe
 */
--- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
@ -22,8 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@ -41,6 +39,8 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;

+import jakarta.annotation.Resource;
+
 /**
 * @author shinsuke
 * @author Shunji Makino
--- a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java
@ -15,13 +15,13 @@
 */
 package org.codelibs.fess.app.web.admin.general;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;

+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 * @author Shunji Makino
--- a/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java
@ -15,10 +15,10 @@
 */
 package org.codelibs.fess.app.web.admin.general;

-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;

+import jakarta.validation.constraints.Size;
+
 /**
 * @author shinsuke
 */
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Shinsuke Sugaya	726f6f989c	#2867 Organized and updated referenced JavaScript files in JSP views for consistency and functionality.	2025-01-18 21:09:07 +09:00
Shinsuke Sugaya	e7779ba08e	fix #2545 add userMenu to id attribute	2025-01-18 20:58:45 +09:00
Shinsuke Sugaya	568d15a741	fix #2544 Add lang attribute.	2025-01-18 20:38:54 +09:00
Shinsuke Sugaya	1b5e44f87b	fix #2546 Update for attributes in JSP files.	2025-01-18 14:47:48 +09:00
Shinsuke Sugaya	1bbf6aaa93	fix #2868 Exclude unnecessary items from print view on the search result screen using d-print-none.	2025-01-18 14:32:37 +09:00
Shinsuke Sugaya	cd478515f4	fix #2867 Upgrade to Bootstrap 5.3: Adjust classes and attributes in JSP files for compatibility.	2025-01-12 15:14:02 +09:00
Shinsuke Sugaya	162081c2e2	fix #2866 Prevent URL decoding of filenames for specific schemes.	2025-01-09 18:02:12 +09:00
Shinsuke Sugaya	541319b7ca	fix #2865 Refactor Ingester to enhance testability by adding getIngestFactory method.	2024-12-29 22:05:18 +09:00
Shinsuke Sugaya	4726b59f04	fix #2864 Refactored ResultData to use rawData with a dedicated serializer.	2024-12-29 20:24:40 +09:00
Shinsuke Sugaya	e739c8c33f	fix #2863 Add upper limits to search and click log queue sizes	2024-12-28 15:20:02 +09:00
Shinsuke Sugaya	07bd6aa6a5	#2862 Add comprehensive Javadoc comments and refine SearchLogHelper structure	2024-12-28 12:00:35 +09:00
Shinsuke Sugaya	cfa492eb8e	fix #2862 Optimize SearchLogHelper for direct queue handling and streamlined batch processing.	2024-12-27 22:58:21 +09:00
Shinsuke Sugaya	80e9cb0ddf	fix #2861 Add Kryo support for temporary data serialization in the crawler	2024-12-20 22:14:54 +09:00
Shinsuke Sugaya	c3514c5b3a	fix #2860 Refactor URL handling logic.	2024-12-19 17:05:54 +09:00
Shinsuke Sugaya	69f21a80f1	#2859 remove old versions	2024-11-28 15:24:56 +09:00
Shinsuke Sugaya	c34f716b4e	update doc	2024-11-22 21:28:34 +09:00
Shinsuke Sugaya	4aea9e1c1f	opensearch 2.18.0	2024-11-10 21:03:52 +09:00
Shinsuke Sugaya	9d3f26ac6a	#2857 replace with fess-crawler-opensearch	2024-11-07 15:19:20 +09:00
Shinsuke Sugaya	8ca11382a2	fix #2857 Refactored package from org.codelibs.fess.es to org.codelibs.fess.opensearch	2024-11-06 22:45:02 +09:00
Shinsuke Sugaya	68ca7e101c	#2856 Refactor FessUrlQueueService to use superclass fetchUrlQueueList method	2024-11-04 16:52:07 +09:00
Shinsuke Sugaya	036ebd6c3c	fix #2856 Add crawl order configuration to control URL processing order	2024-11-03 14:09:36 +09:00
Shinsuke Sugaya	70ef1c5194	fix #2855 Exclude .map files from build output	2024-10-26 11:16:03 +09:00
Shinsuke Sugaya	5b5fd1635f	fix #2853 bump up to adminlte 3.2	2024-10-26 10:49:09 +09:00
Shinsuke Sugaya	d3cd1579ff	fix #2854 bump up to jquery 3.7.1	2024-10-26 10:07:52 +09:00
Shinsuke Sugaya	f4dc8c3f7c	opensearch 2.17.1	2024-10-26 08:33:43 +09:00
Shinsuke Sugaya	053c6909fd	opensearch 2.17.1	2024-10-25 21:43:59 +09:00
Shinsuke Sugaya	6ca8f890fe	fix #2852 Add support for specifying HTML child link extraction tags via html.child.url.rules in crawl settings.	2024-10-24 22:01:38 +09:00
Shinsuke Sugaya	706d952ad1	clean up code formating	2024-10-24 17:52:32 +09:00
Shinsuke Sugaya	5fdafb769c	#2851 Remove plugin directory handling and cleanup plugin-related tasks in build and resource utility files.	2024-10-24 13:37:19 +09:00
Shinsuke Sugaya	160dd6ed81	fix #2851 Ensure only JAR files are recognized as plugins in the plugin directory.	2024-10-24 10:47:10 +09:00
Shinsuke Sugaya	0d30f4d17b	improve getRepositoryPath	2024-10-23 22:27:21 +09:00
Shinsuke Sugaya	e8ae04073a	replace with jakarta	2024-10-22 22:46:06 +09:00
Shinsuke Sugaya	6e98cd861a	rest-assured 5.5.0	2024-10-21 22:56:43 +09:00
Shinsuke Sugaya	a6f7abf4ec	fix #2850 Enable batch mode in shard allocator to suppress WARN log for single shard assignment fallback	2024-10-21 21:20:52 +09:00
Shinsuke Sugaya	d9ef5f7655	add fess_se++.xml	2024-10-21 21:16:01 +09:00
Shinsuke Sugaya	c24fc41cc5	fix #2849 Added exception details to warning logs for better error debugging.	2024-10-20 11:08:03 +09:00
Shinsuke Sugaya	e8944daf68	fess-parent 15.0.0-SNAPSHOT	2024-10-17 21:10:08 +09:00
Shinsuke Sugaya	9f56ad5ccf	update docs	2024-10-12 16:22:40 +09:00
Shinsuke Sugaya	265bbda820	#2848 Refactor code: reverted to an if statement.	2024-10-12 10:54:46 +09:00
Shinsuke Sugaya	62d89fbf25	fix #2848 Refactor code: Replace redundant conditions and enhance readability across several classes.	2024-10-12 06:20:39 +09:00
hi-yamap	f9b16cfc34	bugfix OpenIdConnectAuthenticator (#2847 ) Fixed an issue where the type of `attributes["groups"]` had changed from `String[]` to `List<Object>`. Add unittest.	2024-10-12 06:14:07 +09:00
hi-yamap	54e7cdf9e5	bugfix OpenIdConnectAuthenticator (#2845 )	2024-10-04 08:13:00 +09:00
Shinsuke Sugaya	3cdc706dcb	fix #2846 Set query.orsearch.min.hit.count to -1 to disable automatic OR-based re-search.	2024-10-01 23:14:03 +09:00
Shinsuke Sugaya	b5b6e45200	update doc	2024-09-30 22:08:50 +09:00
Shinsuke Sugaya	3726fbec40	fix #2844 Ignore case sensitivity in canonical URL comparison to prevent unnecessary redirects	2024-09-26 10:32:19 +09:00
Shinsuke Sugaya	6134353600	fix #2842 Add http.fileupload.max.file.count property and refactor file upload handling logic	2024-09-08 15:18:15 +09:00
Shinsuke Sugaya	dd4af0dcf6	#2841 Fix fess_basic_config alias handling for Fess multi-instance support.	2024-08-24 11:22:35 +09:00
Shinsuke Sugaya	e84219b0e3	fix #2841 Enabled support for multiple Fess web applications on a single OpenSearch instance.	2024-08-22 21:44:40 +09:00
Shinsuke Sugaya	17213f370a	fix #2839 Adjust API response to conditionally include exception messages based on configuration.	2024-08-15 17:29:24 +09:00
Shinsuke Sugaya	0df246ea53	update comment	2024-08-02 10:05:20 +09:00
Shinsuke Sugaya	ecba9f365c	#2788 Update dependencies and configurations to latest versions	2024-07-29 11:54:01 +09:00
Shinsuke Sugaya	e55ecd72fe	fix #2837 Removed scriptlet usage in Admin Design page for better code maintainability.	2024-07-28 18:04:24 +09:00
Shinsuke Sugaya	8c48ac1f8a	fix #2835 Add interface for rewriting search request parameters before processing	2024-07-26 14:41:07 +09:00
Shinsuke Sugaya	09fb29ef57	fix #2834 Added language detection and default value settings to bulk document indexing in Admin API.	2024-07-25 10:48:41 +09:00
Shinsuke Sugaya	6885cbdc91	fix #2833 Add bulk document indexing API to Admin API	2024-07-24 18:03:45 +09:00
Shinsuke Sugaya	aff1dd0fcd	#2831 Ensure score is finite before adding to API response in SearchHelper and DefaultSearcher.	2024-07-22 15:56:39 +09:00
Shinsuke Sugaya	9de34ffd1a	fix #2832 Auto-switch search operator to OR when hit count is below threshold	2024-07-22 15:10:26 +09:00
Shinsuke Sugaya	e0f2314c75	fix #2831 Include score in the search API response fields.	2024-07-22 13:30:56 +09:00
Shinsuke Sugaya	a7d00092fb	fix #2830 Add batch_size parameter to search log and click log processing.	2024-07-22 11:07:37 +09:00
Shinsuke Sugaya	9e78a39cc1	fix #2829 Enable specifying RankFusionSearcher via system properties configuration.	2024-07-15 16:36:07 +09:00
Shinsuke Sugaya	7ee6b77a60	fix #2828 Add configurable DisMax query support for default field searches	2024-07-11 17:27:08 +09:00
Shinsuke Sugaya	a21cea6ffe	fix #2827 Add CPU load calibration during search log download to prevent high CPU usage.	2024-07-05 12:33:39 +09:00
Shinsuke Sugaya	d0929b5994	fix #2826 Added support for defining field configurations via field.config.fieldname in crawl settings.	2024-07-04 15:21:35 +09:00
Shinsuke Sugaya	b419ee3f96	fix #2824 Convert role names to lowercase for SMB crawling when ldap.lowercase.permission.name=true	2024-06-27 19:58:21 +09:00
Shinsuke Sugaya	a26cf43943	fix #2823 Log Failure URL ID in CrawlingAccessException in fess.log	2024-06-24 10:20:42 +09:00
Shinsuke Sugaya	a26e133b55	fix #2822 Added configuration option to filter and pass system properties to jobs based on a regex pattern.	2024-06-23 13:13:47 +09:00
Shinsuke Sugaya	ec33a25495	fix #2821 Exclude X-FESS metadata from indexing and add transformation process for metadata inclusion.	2024-06-20 21:02:02 +09:00
Shinsuke Sugaya	4afbb344c7	#2820 Fix package name retrieval from Jar files	2024-06-19 10:34:15 +09:00
Shinsuke Sugaya	3551d13562	fix #2820 Add dynamic protocol registration based on PROTOCOL_TYPE in Handler class	2024-06-18 09:44:35 +09:00
Shinsuke Sugaya	af31322593	#2819 fix imports	2024-06-18 08:09:13 +09:00
Shinsuke Sugaya	10c84ab75f	fix #2819 add ProtocolHelper for URL protocol management and update related classes	2024-06-17 22:37:12 +09:00
Shinsuke Sugaya	8b2adce4eb	#2818 add test resources	2024-06-17 22:37:04 +09:00
Shinsuke Sugaya	95354c5400	fix #2818 Enable fess-crawler plugin in Fess plugin system	2024-06-17 21:39:16 +09:00
Shinsuke Sugaya	146f52e299	fix #2817 Update site_path abbreviation logic based on configuration settings.	2024-05-30 15:59:10 +09:00
Shinsuke Sugaya	f3e1e563dc	fix #2814 Refactor authentication property key to AUTHENTICATIONS_PROPERTY in DataConfig and WebConfig	2024-05-09 18:49:30 +09:00
Shinsuke Sugaya	128bd4f3a9	fix #2813 Fix typo in operationId from listLPopularWords to listPopularWords	2024-05-09 15:32:10 +09:00
Shinsuke Sugaya	054c7a0b81	fix #2812 Refactor content type setting in API response headers for enhanced accuracy and coverage	2024-05-09 15:32:03 +09:00
Shinsuke Sugaya	95277d5861	fix #2810 Removed sessionId from crawl job configuration scripts	2024-04-11 11:35:33 +09:00
Shinsuke Sugaya	4524243a62	fix #2809 Update copyright year to 2024 in footer copyright notices	2024-03-22 20:59:11 +09:00
Shinsuke Sugaya	1409cc1018	fix #2807 Add record_count to /api/v1/popular-words API response	2024-02-22 11:19:50 +09:00
Shinsuke Sugaya	76352cf8dc	Update copyright headers to 2024	2024-02-22 10:53:18 +09:00
Shinsuke Sugaya	b774b68242	opensearch 2.12.0	2024-02-22 10:52:50 +09:00
Shinsuke Sugaya	106900ae91	Update Test Environment to macOS-14 and Enhance Logging During Test Execution (#2806 ) * add log4j2.xml * replace with macos-14	2024-02-10 20:19:11 +09:00
Shinsuke Sugaya	8e215f4cbd	Refactor GitHub Actions for Improved Efficiency and Maintenance (#2805 )	2024-02-10 12:19:37 +09:00
Shinsuke Sugaya	03f32cb3c3	#2789 fess-script-groovy 15.0.0-SNAPSHOT	2024-02-08 22:36:12 +09:00
Shinsuke Sugaya	f8eda0df53	#2804 add osdd.xml for testingl	2024-02-08 14:20:36 +09:00
Shinsuke Sugaya	f1894f70e1	fix #2804 Disable OSDD processing when SSO is active to enhance usability	2024-02-08 14:03:55 +09:00
Shinsuke Sugaya	479eeab409	fix #2803 Include aside tag in HTML crawler's pruned tags to enhance content relevance.	2024-02-05 22:21:25 +09:00
Shinsuke Sugaya	0686a8b613	fix #2802 Prevent NullPointerException in FessMultipartRequestHandler by adding null check and fallback for tempDirFile	2024-01-30 22:15:04 +09:00
Shinsuke Sugaya	b50b0b93f2	fix #2801 Updated AccessTokenHelper to throw exception when only 'Bearer' is specified in Authorization header	2024-01-28 22:54:52 +09:00
Shinsuke Sugaya	08efca08a0	#2792 improve log messages	2024-01-27 11:13:15 +09:00
Shinsuke Sugaya	38108ad810	fix #2800 Handle Exceptions in Suggester Instance Initialization	2024-01-25 15:37:15 +09:00
Shinsuke Sugaya	0c07a74b92	fix #2799 Refactor to centralize current time retrieval using systemHelper.getCurrentTimeAsLong()	2024-01-21 14:21:35 +09:00
Shinsuke Sugaya	dfb42791dc	#2796 Added JUnit tests	2024-01-20 20:12:39 +09:00
Shinsuke Sugaya	bf848c608e	fix #2798 Enhance IndexingHelper with additional JUnit tests	2024-01-15 22:25:50 +09:00
Shinsuke Sugaya	296368a9fc	fix #2797 Enhanced CrawlingConfigHelper with improved parameter naming and added extensive JUnit tests for robust testing	2024-01-11 11:40:16 +09:00
Shinsuke Sugaya	ed73caf359	fix #2796 Added JUnit tests for SystemHelper methods, ensuring enhanced reliability and coverage	2024-01-09 22:21:50 +09:00
Shinsuke Sugaya	491e5a02c1	fix #2795 Updated user-agent version handling in crawler to use dynamic versioning based on Fess version	2024-01-07 22:53:47 +09:00
Shinsuke Sugaya	ab89d042f7	fix #2794 Updated exception handling to catch generic exceptions, improving stability when crawl settings are deleted	2024-01-06 21:16:20 +09:00
Shinsuke Sugaya	7129edae93	#2793 add test.command.args	2024-01-01 18:01:58 +09:00
Shinsuke Sugaya	dedcfbff25	fix #2793 Integrated Jacoco for improved test coverage analysis	2024-01-01 12:36:43 +09:00
Shinsuke Sugaya	becc83e9f2	fix #2792 Enhanced CPU load management and thread waiting logic for better system stability	2023-12-29 15:49:58 +09:00
Shinsuke Sugaya	129418d44c	fix #2791 Updated byte display in log messages for detailed size representation with decimal precision	2023-12-29 14:43:51 +09:00
Shinsuke Sugaya	c1f8467d66	fix #2790 Enhanced exception logging to warning level in action classes	2023-12-24 14:37:36 +09:00
Shinsuke Sugaya	bedf2934b1	fix #2789 bump up to java 21	2023-12-23 19:43:27 +09:00
Shinsuke Sugaya	90d6af1385	fix #2788 bump up to tomcat 10.1	2023-12-23 15:18:48 +09:00