From 9d3f26ac6a9de4769d9df2f43598becf1f161f35 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 7 Nov 2024 15:19:20 +0900 Subject: [PATCH] #2857 replace with fess-crawler-opensearch --- pom.xml | 2 +- .../fess/app/web/admin/AdminAction.java | 20 ++++----- .../AdminSereqAction.java} | 14 +++---- .../admin/{esreq => sereq}/UploadForm.java | 2 +- .../crawler/service/FessUrlQueueService.java | 14 +++---- .../fess/crawler/util/FessCrawlerConfig.java | 2 +- .../codelibs/fess/helper/PluginHelper.java | 1 + .../fess/helper/WebFsIndexHelper.java | 16 +++---- .../codelibs/fess/indexer/IndexUpdater.java | 42 +++++++++---------- .../fess/mylasta/action/FessHtmlPath.java | 6 +-- .../fess/mylasta/action/FessLabels.java | 6 +-- .../fess/mylasta/direction/FessConfig.java | 16 +++---- .../org/codelibs/fess/util/ComponentUtil.java | 4 +- src/main/resources/fess_config.properties | 2 +- .../scheduled_job.bulk | 2 +- src/main/resources/fess_job.xml | 2 +- src/main/resources/fess_label.properties | 6 +-- src/main/resources/fess_label_de.properties | 6 +-- src/main/resources/fess_label_en.properties | 6 +-- src/main/resources/fess_label_fr.properties | 6 +-- src/main/resources/fess_label_ja.properties | 6 +-- src/main/resources/fess_label_ko.properties | 6 +-- src/main/resources/fess_label_ru.properties | 6 +-- .../WEB-INF/env/crawler/resources/app.xml | 2 +- .../WEB-INF/env/thumbnail/resources/app.xml | 2 +- .../admin_esreq.jsp => sereq/admin_sereq.jsp} | 14 +++---- 26 files changed, 106 insertions(+), 105 deletions(-) rename src/main/java/org/codelibs/fess/app/web/admin/{esreq/AdminEsreqAction.java => sereq/AdminSereqAction.java} (94%) rename src/main/java/org/codelibs/fess/app/web/admin/{esreq => sereq}/UploadForm.java (94%) rename src/main/webapp/WEB-INF/view/admin/{esreq/admin_esreq.jsp => sereq/admin_sereq.jsp} (84%) diff --git a/pom.xml b/pom.xml index efc37f7d7b..187a0351f2 100644 --- a/pom.xml +++ b/pom.xml @@ -1441,7 +1441,7 @@ org.codelibs.fess - fess-crawler-es + fess-crawler-opensearch ${crawler.version} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java index 46be6a5660..f7521274be 100644 --- 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.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.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 @@ protected String getActionRole() { 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 @@ protected String getActionRole() { 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 @@ protected String getActionRole() { 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 static Class getAdminActionClass(final FessUse 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 @@ private static String[] getActionRoles(final String role) { return new String[] { role, role + VIEW }; } -} \ No newline at end of file +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java b/src/main/java/org/codelibs/fess/app/web/admin/sereq/AdminSereqAction.java similarity index 94% rename from src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java rename to src/main/java/org/codelibs/fess/app/web/admin/sereq/AdminSereqAction.java index a9d607a6d4..7c0c8af4d1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/sereq/AdminSereqAction.java @@ -13,7 +13,7 @@ * either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.codelibs.fess.app.web.admin.esreq; +package org.codelibs.fess.app.web.admin.sereq; import java.io.BufferedReader; import java.io.File; @@ -42,16 +42,16 @@ /** * @author shinsuke */ -public class AdminEsreqAction extends FessAdminAction { +public class AdminSereqAction extends FessAdminAction { - public static final String ROLE = "admin-esreq"; + public static final String ROLE = "admin-sereq"; - private static final Logger logger = LogManager.getLogger(AdminEsreqAction.class); + private static final Logger logger = LogManager.getLogger(AdminSereqAction.class); @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameEsreq())); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameSereq())); } @Override @@ -95,7 +95,7 @@ public ActionResponse upload(final UploadForm form) { throwValidationError(messages -> messages.addErrorsInvalidHeaderForRequestFile(GLOBAL, msg), () -> asListHtml(this::saveToken)); } else { try (final CurlResponse response = curlRequest.body(buf.toString()).execute()) { - final File tempFile = ComponentUtil.getSystemHelper().createTempFile("esreq_", ".json"); + final File tempFile = ComponentUtil.getSystemHelper().createTempFile("sereq_", ".json"); try (final InputStream in = response.getContentAsStream()) { CopyUtil.copy(in, tempFile); } catch (final Exception e1) { @@ -160,7 +160,7 @@ private HtmlResponse asListHtml(final Runnable runnable) { if (runnable != null) { runnable.run(); } - return asHtml(path_AdminEsreq_AdminEsreqJsp).useForm(UploadForm.class); + return asHtml(path_AdminSereq_AdminSereqJsp).useForm(UploadForm.class); } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/sereq/UploadForm.java similarity index 94% rename from src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/sereq/UploadForm.java index d767249703..4049e617f6 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/sereq/UploadForm.java @@ -13,7 +13,7 @@ * either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.codelibs.fess.app.web.admin.esreq; +package org.codelibs.fess.app.web.admin.sereq; import org.lastaflute.web.ruts.multipart.MultipartFormFile; import org.lastaflute.web.validation.Required; diff --git a/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java b/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java index fb53939c20..5553cbfb76 100644 --- a/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java +++ b/src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java @@ -20,9 +20,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.codelibs.fess.crawler.entity.EsUrlQueue; -import org.codelibs.fess.crawler.service.impl.EsUrlQueueService; -import org.codelibs.fess.crawler.util.EsCrawlerConfig; +import org.codelibs.fess.crawler.entity.OpenSearchUrlQueue; +import org.codelibs.fess.crawler.service.impl.OpenSearchUrlQueueService; +import org.codelibs.fess.crawler.util.OpenSearchCrawlerConfig; import org.codelibs.fess.helper.CrawlingConfigHelper; import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig; import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName; @@ -33,21 +33,21 @@ import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortOrder; -public class FessUrlQueueService extends EsUrlQueueService { +public class FessUrlQueueService extends OpenSearchUrlQueueService { private static final Logger logger = LogManager.getLogger(FessUrlQueueService.class); - public FessUrlQueueService(final EsCrawlerConfig crawlerConfig) { + public FessUrlQueueService(final OpenSearchCrawlerConfig crawlerConfig) { super(crawlerConfig); } @Override - protected List fetchUrlQueueList(final String sessionId) { + protected List fetchUrlQueueList(final String sessionId) { final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper(); final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(sessionId); final Map configParams = crawlingConfig.getConfigParameterMap(ConfigName.CONFIG); final String crawlOrder = configParams.getOrDefault(CrawlingConfig.Param.Config.CRAWL_ORDER, "sequential"); if ("random".equals(crawlOrder)) { - return getList(EsUrlQueue.class, sessionId, + return getList(OpenSearchUrlQueue.class, sessionId, QueryBuilders.functionScoreQuery(QueryBuilders.matchAllQuery(), new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { new FunctionScoreQueryBuilder.FilterFunctionBuilder( new RandomScoreFunctionBuilder().seed(sessionId.hashCode())) }), diff --git a/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java b/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java index 6fcd223b41..21e42a81e1 100644 --- a/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java +++ b/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java @@ -17,7 +17,7 @@ import org.codelibs.fess.util.ComponentUtil; -public class FessCrawlerConfig extends EsCrawlerConfig { +public class FessCrawlerConfig extends OpenSearchCrawlerConfig { @Override public String getQueueIndex() { diff --git a/src/main/java/org/codelibs/fess/helper/PluginHelper.java b/src/main/java/org/codelibs/fess/helper/PluginHelper.java index 599c1589b8..34b4870c6b 100644 --- a/src/main/java/org/codelibs/fess/helper/PluginHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PluginHelper.java @@ -173,6 +173,7 @@ protected boolean isExcludedName(final ArtifactType artifactType, final String n || "fess-crawler-db-h2".equals(name)// || "fess-crawler-db-mysql".equals(name)// || "fess-crawler-es".equals(name)// + || "fess-crawler-opensearch".equals(name)// || "fess-crawler-lasta".equals(name)// || "fess-crawler-parent".equals(name)// || "fess-crawler-playwright".equals(name)// diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index b9e80b41a2..3f19310293 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -33,9 +33,9 @@ import org.codelibs.fess.crawler.CrawlerContext; import org.codelibs.fess.crawler.CrawlerStatus; import org.codelibs.fess.crawler.interval.FessIntervalController; -import org.codelibs.fess.crawler.service.impl.EsDataService; -import org.codelibs.fess.crawler.service.impl.EsUrlFilterService; -import org.codelibs.fess.crawler.service.impl.EsUrlQueueService; +import org.codelibs.fess.crawler.service.impl.OpenSearchDataService; +import org.codelibs.fess.crawler.service.impl.OpenSearchUrlFilterService; +import org.codelibs.fess.crawler.service.impl.OpenSearchUrlQueueService; import org.codelibs.fess.indexer.IndexUpdater; import org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv; import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule; @@ -142,7 +142,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi if (Constants.TRUE.equalsIgnoreCase(configParamMap.get(Config.CLEANUP_ALL))) { deleteCrawlData(sid); } else if (Constants.TRUE.equalsIgnoreCase(configParamMap.get(Config.CLEANUP_URL_FILTERS))) { - final EsUrlFilterService urlFilterService = ComponentUtil.getComponent(EsUrlFilterService.class); + final OpenSearchUrlFilterService urlFilterService = ComponentUtil.getComponent(OpenSearchUrlFilterService.class); try { urlFilterService.delete(sid); } catch (final Exception e) { @@ -268,7 +268,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi if (Constants.TRUE.equalsIgnoreCase(configParamMap.get(Config.CLEANUP_ALL))) { deleteCrawlData(sid); } else if (Constants.TRUE.equalsIgnoreCase(configParamMap.get(Config.CLEANUP_URL_FILTERS))) { - final EsUrlFilterService urlFilterService = ComponentUtil.getComponent(EsUrlFilterService.class); + final OpenSearchUrlFilterService urlFilterService = ComponentUtil.getComponent(OpenSearchUrlFilterService.class); try { urlFilterService.delete(sid); } catch (final Exception e) { @@ -479,9 +479,9 @@ protected List getAvailableBoostDocumentRuleList() { } protected void deleteCrawlData(final String sid) { - final EsUrlFilterService urlFilterService = ComponentUtil.getComponent(EsUrlFilterService.class); - final EsUrlQueueService urlQueueService = ComponentUtil.getComponent(EsUrlQueueService.class); - final EsDataService dataService = ComponentUtil.getComponent(EsDataService.class); + final OpenSearchUrlFilterService urlFilterService = ComponentUtil.getComponent(OpenSearchUrlFilterService.class); + final OpenSearchUrlQueueService urlQueueService = ComponentUtil.getComponent(OpenSearchUrlQueueService.class); + final OpenSearchDataService dataService = ComponentUtil.getComponent(OpenSearchDataService.class); try { // clear url filter diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index 1e8cc8049c..5dc7143516 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -28,14 +28,14 @@ import org.codelibs.fess.crawler.Crawler; import org.codelibs.fess.crawler.entity.AccessResult; import org.codelibs.fess.crawler.entity.AccessResultData; -import org.codelibs.fess.crawler.entity.EsAccessResult; -import org.codelibs.fess.crawler.entity.EsUrlQueue; +import org.codelibs.fess.crawler.entity.OpenSearchAccessResult; +import org.codelibs.fess.crawler.entity.OpenSearchUrlQueue; import org.codelibs.fess.crawler.service.DataService; import org.codelibs.fess.crawler.service.UrlFilterService; import org.codelibs.fess.crawler.service.UrlQueueService; -import org.codelibs.fess.crawler.service.impl.EsDataService; +import org.codelibs.fess.crawler.service.impl.OpenSearchDataService; import org.codelibs.fess.crawler.transformer.Transformer; -import org.codelibs.fess.crawler.util.EsResultList; +import org.codelibs.fess.crawler.util.OpenSearchResultList; import org.codelibs.fess.exception.ContainerNotAvailableException; import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.helper.IndexingHelper; @@ -70,10 +70,10 @@ public class IndexUpdater extends Thread { protected SearchEngineClient searchEngineClient; @Resource - protected DataService dataService; + protected DataService dataService; @Resource - protected UrlQueueService urlQueueService; + protected UrlQueueService urlQueueService; @Resource protected UrlFilterService urlFilterService; @@ -176,17 +176,17 @@ public void run() { try { final Consumer cb = builder -> { final QueryBuilder queryBuilder = - QueryBuilders.boolQuery().filter(QueryBuilders.termsQuery(EsAccessResult.SESSION_ID, sessionIdList)) - .filter(QueryBuilders.termQuery(EsAccessResult.STATUS, org.codelibs.fess.crawler.Constants.OK_STATUS)); + QueryBuilders.boolQuery().filter(QueryBuilders.termsQuery(OpenSearchAccessResult.SESSION_ID, sessionIdList)).filter( + QueryBuilders.termQuery(OpenSearchAccessResult.STATUS, org.codelibs.fess.crawler.Constants.OK_STATUS)); builder.setQuery(queryBuilder); builder.setFrom(0); final int maxDocumentCacheSize = fessConfig.getIndexerWebfsMaxDocumentCacheSizeAsInteger(); builder.setSize(maxDocumentCacheSize <= 0 ? 1 : maxDocumentCacheSize); - builder.addSort(EsAccessResult.CREATE_TIME, SortOrder.ASC); + builder.addSort(OpenSearchAccessResult.CREATE_TIME, SortOrder.ASC); }; final DocList docList = new DocList(); - final List accessResultList = new ArrayList<>(); + final List accessResultList = new ArrayList<>(); long updateTime = systemHelper.getCurrentTimeAsLong(); int errorCount = 0; @@ -219,13 +219,13 @@ public void run() { updateTime = systemHelper.getCurrentTimeAsLong(); - List arList = getAccessResultList(cb, cleanupTime); + List arList = getAccessResultList(cb, cleanupTime); if (arList.isEmpty()) { emptyListCount++; } else { emptyListCount = 0; // reset } - long hitCount = ((EsResultList) arList).getTotalHits(); + long hitCount = ((OpenSearchResultList) arList).getTotalHits(); while (hitCount > 0) { if (arList.isEmpty()) { ThreadUtil.sleep(fessConfig.getIndexerWebfsCommitMarginTimeAsInteger().longValue()); @@ -235,7 +235,7 @@ public void run() { cleanupTime = cleanupAccessResults(accessResultList); } arList = getAccessResultList(cb, cleanupTime); - hitCount = ((EsResultList) arList).getTotalHits(); + hitCount = ((OpenSearchResultList) arList).getTotalHits(); } if (!docList.isEmpty()) { indexingHelper.sendDocuments(searchEngineClient, docList); @@ -320,11 +320,11 @@ public void run() { } - private void processAccessResults(final DocList docList, final List accessResultList, - final List arList) { + private void processAccessResults(final DocList docList, final List accessResultList, + final List arList) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final long maxDocumentRequestSize = Long.parseLong(fessConfig.getIndexerWebfsMaxDocumentRequestSize()); - for (final EsAccessResult accessResult : arList) { + for (final OpenSearchAccessResult accessResult : arList) { if (logger.isDebugEnabled()) { logger.debug("Indexing {}", accessResult.getUrl()); } @@ -395,7 +395,7 @@ private void processAccessResults(final DocList docList, final List getAccessResultData(final EsAccessResult accessResult) { + private AccessResultData getAccessResultData(final OpenSearchAccessResult accessResult) { try { return accessResult.getAccessResultData(); } catch (final Exception e) { @@ -483,7 +483,7 @@ protected void addFavoriteCountField(final Map map) { } } - private long cleanupAccessResults(final List accessResultList) { + private long cleanupAccessResults(final List accessResultList) { if (!accessResultList.isEmpty()) { final long execTime = systemHelper.getCurrentTimeAsLong(); final int size = accessResultList.size(); @@ -498,12 +498,12 @@ private long cleanupAccessResults(final List accessResultList) { return -1; } - private List getAccessResultList(final Consumer cb, final long cleanupTime) { + private List getAccessResultList(final Consumer cb, final long cleanupTime) { if (logger.isDebugEnabled()) { logger.debug("Getting documents in IndexUpdater queue."); } final long execTime = systemHelper.getCurrentTimeAsLong(); - final List arList = ((EsDataService) dataService).getAccessResultList(cb); + final List arList = ((OpenSearchDataService) dataService).getAccessResultList(cb); final FessConfig fessConfig = ComponentUtil.getFessConfig(); if (!arList.isEmpty()) { final long commitMarginTime = fessConfig.getIndexerWebfsCommitMarginTimeAsInteger().longValue(); @@ -513,7 +513,7 @@ private List getAccessResultList(final Consumer) arList).getTotalHits(); + final long totalHits = ((OpenSearchResultList) arList).getTotalHits(); if (logger.isInfoEnabled()) { final StringBuilder buf = new StringBuilder(100); buf.append("Processing "); diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java index 2042a4ff8f..131794163d 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java @@ -210,9 +210,6 @@ public interface FessHtmlPath { /** The path of the HTML: /admin/error/admin_error.jsp */ HtmlNext path_AdminError_AdminErrorJsp = new HtmlNext("/admin/error/admin_error.jsp"); - /** The path of the HTML: /admin/esreq/admin_esreq.jsp */ - HtmlNext path_AdminEsreq_AdminEsreqJsp = new HtmlNext("/admin/esreq/admin_esreq.jsp"); - /** The path of the HTML: /admin/failureurl/admin_failureurl.jsp */ HtmlNext path_AdminFailureurl_AdminFailureurlJsp = new HtmlNext("/admin/failureurl/admin_failureurl.jsp"); @@ -352,6 +349,9 @@ public interface FessHtmlPath { /** The path of the HTML: /admin/searchlog/admin_searchlog_details.jsp */ HtmlNext path_AdminSearchlog_AdminSearchlogDetailsJsp = new HtmlNext("/admin/searchlog/admin_searchlog_details.jsp"); + /** The path of the HTML: /admin/sereq/admin_sereq.jsp */ + HtmlNext path_AdminSereq_AdminSereqJsp = new HtmlNext("/admin/sereq/admin_sereq.jsp"); + /** The path of the HTML: /admin/storage/admin_storage.jsp */ HtmlNext path_AdminStorage_AdminStorageJsp = new HtmlNext("/admin/storage/admin_storage.jsp"); diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index a1b5a7bf18..343cdf041e 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -2866,16 +2866,16 @@ public class FessLabels extends UserMessages { public static final String LABELS_target_version = "{labels.target_version}"; /** The key of the message: Request to OpenSearch */ - public static final String LABELS_esreq_configuration = "{labels.esreq_configuration}"; + public static final String LABELS_sereq_configuration = "{labels.sereq_configuration}"; /** The key of the message: Request File */ - public static final String LABELS_esreq_request_file = "{labels.esreq_request_file}"; + public static final String LABELS_sereq_request_file = "{labels.sereq_request_file}"; /** The key of the message: Request File */ public static final String LABELS_REQUEST_FILE = "{labels.requestFile}"; /** The key of the message: Send */ - public static final String LABELS_esreq_button_upload = "{labels.esreq_button_upload}"; + public static final String LABELS_sereq_button_upload = "{labels.sereq_button_upload}"; /** The key of the message: No match */ public static final String LABELS_facet_is_not_found = "{labels.facet_is_not_found}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java index 3db7e1d811..d98adb21d8 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -1569,8 +1569,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. upgrade */ String ONLINE_HELP_NAME_UPGRADE = "online.help.name.upgrade"; - /** The key of the configuration. e.g. esreq */ - String ONLINE_HELP_NAME_ESREQ = "online.help.name.esreq"; + /** The key of the configuration. e.g. sereq */ + String ONLINE_HELP_NAME_SEREQ = "online.help.name.sereq"; /** The key of the configuration. e.g. accesstoken */ String ONLINE_HELP_NAME_ACCESSTOKEN = "online.help.name.accesstoken"; @@ -6993,11 +6993,11 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction String getOnlineHelpNameUpgrade(); /** - * Get the value for the key 'online.help.name.esreq'.
- * The value is, e.g. esreq
+ * Get the value for the key 'online.help.name.sereq'.
+ * The value is, e.g. sereq
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ - String getOnlineHelpNameEsreq(); + String getOnlineHelpNameSereq(); /** * Get the value for the key 'online.help.name.accesstoken'.
@@ -10539,8 +10539,8 @@ public String getOnlineHelpNameUpgrade() { return get(FessConfig.ONLINE_HELP_NAME_UPGRADE); } - public String getOnlineHelpNameEsreq() { - return get(FessConfig.ONLINE_HELP_NAME_ESREQ); + public String getOnlineHelpNameSereq() { + return get(FessConfig.ONLINE_HELP_NAME_SEREQ); } public String getOnlineHelpNameAccesstoken() { @@ -11483,7 +11483,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.ONLINE_HELP_NAME_CRAWLINGINFO, "crawlinginfo"); defaultMap.put(FessConfig.ONLINE_HELP_NAME_BACKUP, "backup"); defaultMap.put(FessConfig.ONLINE_HELP_NAME_UPGRADE, "upgrade"); - defaultMap.put(FessConfig.ONLINE_HELP_NAME_ESREQ, "esreq"); + defaultMap.put(FessConfig.ONLINE_HELP_NAME_SEREQ, "sereq"); defaultMap.put(FessConfig.ONLINE_HELP_NAME_ACCESSTOKEN, "accesstoken"); defaultMap.put(FessConfig.ONLINE_HELP_NAME_SUGGEST, "suggest"); defaultMap.put(FessConfig.ONLINE_HELP_NAME_SEARCHLOG, "searchlog"); diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index 04e7f21b53..25ab689e76 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -30,7 +30,7 @@ import org.codelibs.fess.cors.CorsHandlerFactory; import org.codelibs.fess.crawler.client.CrawlerClientCreator; import org.codelibs.fess.crawler.client.CrawlerClientFactory; -import org.codelibs.fess.crawler.entity.EsAccessResult; +import org.codelibs.fess.crawler.entity.OpenSearchAccessResult; import org.codelibs.fess.crawler.extractor.ExtractorFactory; import org.codelibs.fess.crawler.service.DataService; import org.codelibs.fess.dict.DictionaryManager; @@ -380,7 +380,7 @@ public static DictionaryManager getDictionaryManager() { return getComponent(DICTIONARY_MANAGER); } - public static DataService getDataService() { + public static DataService getDataService() { return getComponent(DATA_SERVICE); } diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index ab1cd5b4ea..21830806f5 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -804,7 +804,7 @@ online.help.name.scheduler=scheduler online.help.name.crawlinginfo=crawlinginfo online.help.name.backup=backup online.help.name.upgrade=upgrade -online.help.name.esreq=esreq +online.help.name.sereq=sereq online.help.name.accesstoken=accesstoken online.help.name.suggest=suggest online.help.name.searchlog=searchlog diff --git a/src/main/resources/fess_indices/fess_config.scheduled_job/scheduled_job.bulk b/src/main/resources/fess_indices/fess_config.scheduled_job/scheduled_job.bulk index 2fd96e3209..997834ce96 100644 --- a/src/main/resources/fess_indices/fess_config.scheduled_job/scheduled_job.bulk +++ b/src/main/resources/fess_indices/fess_config.scheduled_job/scheduled_job.bulk @@ -15,7 +15,7 @@ {"index":{"_index":"fess_config.scheduled_job","_id":"reload_config"}} {"name":"Config Reloader","target":"all","cronExpression":"*/10 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"systemHelper\").updateConfiguration();","jobLogging":false,"crawler":false,"available":true,"sortOrder":8,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0} {"index":{"_index":"fess_config.scheduled_job","_id":"ping_es"}} -{"name":"Search Engine Monitor","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"pingEsJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":9,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0} +{"name":"Search Engine Monitor","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"pingJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":9,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0} {"index":{"_index":"fess_config.scheduled_job","_id":"score_booster"}} {"name":"Score Updater","target":"all","cronExpression":"0 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"scoreUpdater\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":10,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0} {"index":{"_index":"fess_config.scheduled_job","_id":"label_updater"}} diff --git a/src/main/resources/fess_job.xml b/src/main/resources/fess_job.xml index 921c4cffe9..5cc01cbe4d 100644 --- a/src/main/resources/fess_job.xml +++ b/src/main/resources/fess_job.xml @@ -22,7 +22,7 @@ - + diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index c247cb5548..c8c18bf294 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -946,10 +946,10 @@ labels.reset_dictionaries=Reset Dictionaries labels.reindex_start_button=Start labels.targetVersion=Version labels.target_version=Version From -labels.esreq_configuration=Request to OpenSearch -labels.esreq_request_file=Request File +labels.sereq_configuration=Request to OpenSearch +labels.sereq_request_file=Request File labels.requestFile=Request File -labels.esreq_button_upload=Send +labels.sereq_button_upload=Send labels.facet_is_not_found=No match labels.doc_score=Score: labels.development_mode_warning=Running as Development mode. For production use, please install a standalone OpenSearch server. diff --git a/src/main/resources/fess_label_de.properties b/src/main/resources/fess_label_de.properties index 91f36c5dc7..af9de529c7 100644 --- a/src/main/resources/fess_label_de.properties +++ b/src/main/resources/fess_label_de.properties @@ -878,10 +878,10 @@ labels.replace_aliases=Aliase aktualisieren labels.reindex_start_button=Start labels.targetVersion=Version labels.target_version=Version ab -labels.esreq_configuration=Anfrage an OpenSearch -labels.esreq_request_file=Anfrage-Datei +labels.sereq_configuration=Anfrage an OpenSearch +labels.sereq_request_file=Anfrage-Datei labels.requestFile=Datei anfragen -labels.esreq_button_upload=Senden +labels.sereq_button_upload=Senden labels.facet_is_not_found=Kein Treffer. labels.doc_score=Bewertung: labels.development_mode_warning=Läuft im Entwicklermodus. Bitte installieren Sie einen Standalone-OpenSearch-Server für produktiven Einsatz. diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties index 3af81a210b..4cabe63b07 100644 --- a/src/main/resources/fess_label_en.properties +++ b/src/main/resources/fess_label_en.properties @@ -945,10 +945,10 @@ labels.reset_dictionaries=Reset Dictionaries labels.reindex_start_button=Start labels.targetVersion=Version labels.target_version=Version From -labels.esreq_configuration=Request to OpenSearch -labels.esreq_request_file=Request File +labels.sereq_configuration=Request to OpenSearch +labels.sereq_request_file=Request File labels.requestFile=Request File -labels.esreq_button_upload=Send +labels.sereq_button_upload=Send labels.facet_is_not_found=No match labels.doc_score=Score: labels.development_mode_warning=Running as Development mode. For production use, please install a standalone OpenSearch server. diff --git a/src/main/resources/fess_label_fr.properties b/src/main/resources/fess_label_fr.properties index d23bca440f..7f945e1f5b 100644 --- a/src/main/resources/fess_label_fr.properties +++ b/src/main/resources/fess_label_fr.properties @@ -945,10 +945,10 @@ labels.reset_dictionaries = Réinitialiser les dictionnaires labels.reindex_start_button = Commencer labels.targetVersion = Version labels.target_version = Version de -labels.esreq_configuration = Demande à OpenSearch -labels.esreq_request_file = Demander un fichier +labels.sereq_configuration = Demande à OpenSearch +labels.sereq_request_file = Demander un fichier labels.requestFile = Demander un fichier -labels.esreq_button_upload = Envoyer +labels.sereq_button_upload = Envoyer labels.facet_is_not_found = Aucune concordance labels.doc_score = Score: labels.development_mode_warning = Exécution en mode Développement. Pour une utilisation en production, veuillez installer un serveur OpenSearch autonome. diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties index ccd55e2483..3b88d2c6ff 100644 --- a/src/main/resources/fess_label_ja.properties +++ b/src/main/resources/fess_label_ja.properties @@ -946,10 +946,10 @@ labels.reset_dictionaries=辞書の初期化 labels.reindex_start_button=開始 labels.targetVersion=対象バージョン labels.target_version=対象バージョン -labels.esreq_configuration=OpenSearchへのリクエスト -labels.esreq_request_file=リクエストファイル +labels.sereq_configuration=OpenSearchへのリクエスト +labels.sereq_request_file=リクエストファイル labels.requestFile=リクエストファイル -labels.esreq_button_upload=送信 +labels.sereq_button_upload=送信 labels.facet_is_not_found=該当なし labels.doc_score=スコア: labels.development_mode_warning=開発モードで起動しています。本運用環境ではOpenSearchを別途インストールしてください。 diff --git a/src/main/resources/fess_label_ko.properties b/src/main/resources/fess_label_ko.properties index b8349bacd3..f8a944003d 100644 --- a/src/main/resources/fess_label_ko.properties +++ b/src/main/resources/fess_label_ko.properties @@ -854,10 +854,10 @@ labels.upgrade_data_migration = 데이터 마이그레이션 labels.upgrade_start_button = 시작 labels.targetVersion = 대상 버전 labels.target_version = 대상 버전 -labels.esreq_configuration = OpenSearch에 요청 -labels.esreq_request_file = 요청 파일 +labels.sereq_configuration = OpenSearch에 요청 +labels.sereq_request_file = 요청 파일 labels.requestFile = 요청 파일 -labels.esreq_button_upload = 전송 +labels.sereq_button_upload = 전송 labels.facet_is_not_found = 해당 없음 labels.logLevel=Log Level labels.allLanguages=All Languages diff --git a/src/main/resources/fess_label_ru.properties b/src/main/resources/fess_label_ru.properties index 397e0cc6ac..bb58486790 100644 --- a/src/main/resources/fess_label_ru.properties +++ b/src/main/resources/fess_label_ru.properties @@ -832,10 +832,10 @@ labels.upgrade_data_migration=Перенос данных labels.upgrade_start_button=Старт labels.targetVersion=Version labels.target_version=Version From -labels.esreq_configuration=Запрос к OpenSearch -labels.esreq_request_file=Request File +labels.sereq_configuration=Запрос к OpenSearch +labels.sereq_request_file=Request File labels.requestFile=Request File -labels.esreq_button_upload=Send +labels.sereq_button_upload=Send labels.facet_is_not_found=Нет совпадений. labels.expires=Expired labels.logLevel=Log Level diff --git a/src/main/webapp/WEB-INF/env/crawler/resources/app.xml b/src/main/webapp/WEB-INF/env/crawler/resources/app.xml index 2e5fa9073d..f201aa3540 100644 --- a/src/main/webapp/WEB-INF/env/crawler/resources/app.xml +++ b/src/main/webapp/WEB-INF/env/crawler/resources/app.xml @@ -6,7 +6,7 @@ - + diff --git a/src/main/webapp/WEB-INF/env/thumbnail/resources/app.xml b/src/main/webapp/WEB-INF/env/thumbnail/resources/app.xml index 2ea553f4cd..40e608bb18 100644 --- a/src/main/webapp/WEB-INF/env/thumbnail/resources/app.xml +++ b/src/main/webapp/WEB-INF/env/thumbnail/resources/app.xml @@ -6,7 +6,7 @@ - + diff --git a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp b/src/main/webapp/WEB-INF/view/admin/sereq/admin_sereq.jsp similarity index 84% rename from src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp rename to src/main/webapp/WEB-INF/view/admin/sereq/admin_sereq.jsp index fe63854a7f..0055c90f1b 100644 --- a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp +++ b/src/main/webapp/WEB-INF/view/admin/sereq/admin_sereq.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.esreq_configuration" /> + key="labels.sereq_configuration" /> @@ -11,7 +11,7 @@ - +
@@ -19,14 +19,14 @@

- +

- +
${msg}
@@ -37,13 +37,13 @@

- +

@@ -54,7 +54,7 @@