0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2317 replace with log4j2

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-11-28 18:18:22 +09:00
parent 4b9b89d970
commit f9dac9a544
144 changed files with 427 additions and 428 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/codelibs/fess/api/es/EsApiManager.java
View file

@ -32,6 +32,8 @@ 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;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.curl.Curl.Method;
@ -46,13 +48,11 @@ import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.ResourceUtil;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.servlet.session.SessionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class EsApiManager extends BaseApiManager {
private static final String ADMIN_SERVER = "/admin/server_";
private static final Logger logger = LoggerFactory.getLogger(EsApiManager.class);
private static final Logger logger = LogManager.getLogger(EsApiManager.class);
protected String[] acceptedRoles = new String[] { "admin" };

6
src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java
View file

@ -40,6 +40,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.CoreLibConstants;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
@ -57,11 +59,9 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
import org.dbflute.optional.OptionalThing;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class GsaApiManager extends BaseApiManager implements WebApiManager {
private static final Logger logger = LoggerFactory.getLogger(GsaApiManager.class);
private static final Logger logger = LogManager.getLogger(GsaApiManager.class);
private static final String OUTPUT_XML = "xml"; // or xml_no_dtd
// http://www.google.com/google.dtd.

6
src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
View file

@ -30,6 +30,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.exception.IORuntimeException;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
@ -58,12 +60,10 @@ import org.codelibs.fess.util.FacetResponse;
import org.codelibs.fess.util.FacetResponse.Field;
import org.dbflute.optional.OptionalThing;
import org.elasticsearch.script.Script;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JsonApiManager extends BaseJsonApiManager {
private static final Logger logger = LoggerFactory.getLogger(JsonApiManager.class);
private static final Logger logger = LogManager.getLogger(JsonApiManager.class);
public JsonApiManager() {
setPathPrefix("/json");

6
src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
View file

@ -30,6 +30,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.api.BaseJsonApiManager;
import org.codelibs.fess.entity.FacetInfo;
@ -46,11 +48,9 @@ import org.codelibs.fess.suggest.entity.SuggestItem;
import org.codelibs.fess.suggest.request.suggest.SuggestRequestBuilder;
import org.codelibs.fess.suggest.request.suggest.SuggestResponse;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SuggestApiManager extends BaseJsonApiManager {
private static final Logger logger = LoggerFactory.getLogger(SuggestApiManager.class);
private static final Logger logger = LogManager.getLogger(SuggestApiManager.class);
public SuggestApiManager() {
setPathPrefix("/suggest");

6
src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
View file

@ -17,6 +17,8 @@ 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;
import org.codelibs.core.timer.TimeoutManager;
import org.codelibs.fess.Constants;
@ -33,12 +35,10 @@ import org.lastaflute.job.LaCron;
import org.lastaflute.job.LaJob;
import org.lastaflute.job.LaJobRunner;
import org.lastaflute.job.LaJobScheduler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AllJobScheduler implements LaJobScheduler {
private static final Logger logger = LoggerFactory.getLogger(AllJobScheduler.class);
private static final Logger logger = LogManager.getLogger(AllJobScheduler.class);
protected static final String APP_TYPE = "JOB";

6
src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
View file

@ -15,6 +15,8 @@
*/
package org.codelibs.fess.app.job;
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;
@ -28,11 +30,9 @@ import org.lastaflute.job.JobManager;
import org.lastaflute.job.LaJob;
import org.lastaflute.job.LaJobRuntime;
import org.lastaflute.job.key.LaJobUnique;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ScriptExecutorJob implements LaJob {
private static final Logger logger = LoggerFactory.getLogger(ScriptExecutorJob.class);
private static final Logger logger = LogManager.getLogger(ScriptExecutorJob.class);
@Override
public void run(final LaJobRuntime runtime) {

6
src/main/java/org/codelibs/fess/app/service/BadWordService.java
View file

@ -23,6 +23,8 @@ 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;
@ -36,8 +38,6 @@ import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.bhv.readable.EntityRowHandler;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.optional.OptionalEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.orangesignal.csv.CsvConfig;
import com.orangesignal.csv.CsvReader;
@ -47,7 +47,7 @@ public class BadWordService {
private static final String DELETE_PREFIX = "--";
private static final Logger logger = LoggerFactory.getLogger(BadWordService.class);
private static final Logger logger = LogManager.getLogger(BadWordService.class);
@Resource
protected BadWordBhv badWordBhv;

6
src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
View file

@ -30,6 +30,8 @@ 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;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.core.lang.StringUtil;
@ -47,8 +49,6 @@ import org.dbflute.bhv.readable.EntityRowHandler;
import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.optional.OptionalEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.orangesignal.csv.CsvConfig;
import com.orangesignal.csv.CsvReader;
@ -56,7 +56,7 @@ import com.orangesignal.csv.CsvWriter;
public class CrawlingInfoService {
private static final Logger logger = LoggerFactory.getLogger(CrawlingInfoService.class);
private static final Logger logger = LogManager.getLogger(CrawlingInfoService.class);
@Resource
protected CrawlingInfoParamBhv crawlingInfoParamBhv;

6
src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
View file

@ -27,6 +27,8 @@ 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;
@ -44,8 +46,6 @@ import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.bhv.readable.EntityRowHandler;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.optional.OptionalEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.orangesignal.csv.CsvConfig;
import com.orangesignal.csv.CsvReader;
@ -53,7 +53,7 @@ import com.orangesignal.csv.CsvWriter;
public class ElevateWordService {
private static final Logger logger = LoggerFactory.getLogger(ElevateWordService.class);
private static final Logger logger = LogManager.getLogger(ElevateWordService.class);
@Resource
protected ElevateWordToLabelBhv elevateWordToLabelBhv;

6
src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
View file

@ -19,6 +19,8 @@ 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;
@ -30,12 +32,10 @@ import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.optional.OptionalEntity;
import org.lastaflute.job.LaCron;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ScheduledJobService {
private static final Logger logger = LoggerFactory.getLogger(ScheduledJobService.class);
private static final Logger logger = LogManager.getLogger(ScheduledJobService.class);
@Resource
protected ScheduledJobBhv scheduledJobBhv;

6
src/main/java/org/codelibs/fess/app/service/SearchLogService.java
View file

@ -29,6 +29,8 @@ 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;
@ -58,8 +60,6 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
import org.elasticsearch.search.aggregations.metrics.Avg;
import org.elasticsearch.search.aggregations.metrics.Cardinality;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SearchLogService {
@ -75,7 +75,7 @@ public class SearchLogService {
private static final String QUERY_TIME = "queryTime";
private static final Logger logger = LoggerFactory.getLogger(SearchLogService.class);
private static final Logger logger = LogManager.getLogger(SearchLogService.class);
@Resource
private SearchLogBhv searchLogBhv;

6
src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
View file

@ -45,6 +45,8 @@ 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;
import org.codelibs.core.exception.IORuntimeException;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.lang.StringUtil;
@ -70,8 +72,6 @@ import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.StreamResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import com.fasterxml.jackson.core.type.TypeReference;
@ -82,7 +82,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*/
public class AdminBackupAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminBackupAction.class);
private static final Logger logger = LogManager.getLogger(AdminBackupAction.class);
public static final String NDJSON_EXTENTION = ".ndjson";

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

@ -17,6 +17,8 @@ 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;
import org.codelibs.fess.app.pager.CrawlingInfoPager;
import org.codelibs.fess.app.service.CrawlingInfoService;
@ -28,8 +30,6 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*/
public class AdminCrawlinginfoAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminCrawlinginfoAction.class);
private static final Logger logger = LogManager.getLogger(AdminCrawlinginfoAction.class);
// ===================================================================================
// Attribute

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

@ -24,6 +24,8 @@ import java.util.List;
import java.util.Locale;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.FileUtil;
import org.codelibs.core.io.ResourceUtil;
import org.codelibs.core.lang.StringUtil;
@ -38,8 +40,6 @@ import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.StreamResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author codelibs
@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
*/
public class AdminDesignAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminDesignAction.class);
private static final Logger logger = LogManager.getLogger(AdminDesignAction.class);
// ===================================================================================
// Attribute

6
src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java
View file

@ -22,6 +22,8 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Locale;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.io.ReaderUtil;
import org.codelibs.core.lang.StringUtil;
@ -35,15 +37,13 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
*/
public class AdminEsreqAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminEsreqAction.class);
private static final Logger logger = LogManager.getLogger(AdminEsreqAction.class);
@Override
protected void setupHtmlData(final ActionRuntime runtime) {

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

@ -24,6 +24,8 @@ 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;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
@ -37,8 +39,6 @@ import org.lastaflute.core.mail.Postbox;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -48,7 +48,7 @@ public class AdminGeneralAction extends FessAdminAction {
private static final String DUMMY_PASSWORD = "**********";
private static final Logger logger = LoggerFactory.getLogger(AdminGeneralAction.class);
private static final Logger logger = LogManager.getLogger(AdminGeneralAction.class);
// ===================================================================================
// Attribute

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

@ -19,6 +19,8 @@ import java.util.Base64;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.GroupPager;
import org.codelibs.fess.app.service.GroupService;
@ -33,8 +35,6 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*/
public class AdminGroupAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminGroupAction.class);
private static final Logger logger = LogManager.getLogger(AdminGroupAction.class);
// ===================================================================================
// Attribute

6
src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
View file

@ -30,6 +30,8 @@ import java.util.zip.ZipOutputStream;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.curl.CurlResponse;
@ -43,15 +45,13 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AdminMaintenanceAction extends FessAdminAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(AdminMaintenanceAction.class);
private static final Logger logger = LogManager.getLogger(AdminMaintenanceAction.class);
private static final String[] ES_CAT_NAMES = new String[] { "aliases", "allocation", "count", "fielddata", "health", "indices",
"master", "nodeattrs", "nodes", "pending_tasks", "plugins", "recovery", "repositories", "thread_pool", "shards", "segments",

6
src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java
View file

@ -26,6 +26,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.PluginHelper;
@ -36,12 +38,10 @@ import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AdminPluginAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminPluginAction.class);
private static final Logger logger = LogManager.getLogger(AdminPluginAction.class);
private static final String UPLOAD = "upload";

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

@ -19,6 +19,8 @@ import java.util.Base64;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.RolePager;
import org.codelibs.fess.app.service.RoleService;
@ -33,8 +35,6 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*/
public class AdminRoleAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminRoleAction.class);
private static final Logger logger = LogManager.getLogger(AdminRoleAction.class);
// ===================================================================================
// Attribute

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

@ -23,6 +23,8 @@ import java.util.function.Consumer;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.net.URLUtil;
import org.codelibs.fess.Constants;
@ -47,8 +49,6 @@ import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.validation.VaMessenger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -59,7 +59,7 @@ public class AdminSearchlistAction extends FessAdminAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(AdminSearchlistAction.class);
private static final Logger logger = LogManager.getLogger(AdminSearchlistAction.class);
// ===================================================================================
// Attribute

6
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file

@ -17,6 +17,8 @@ package org.codelibs.fess.app.web.admin.upgrade;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.service.ScheduledJobService;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.client.FessEsClient;
@ -33,15 +35,13 @@ import org.elasticsearch.client.IndicesAdminClient;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AdminUpgradeAction extends FessAdminAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(AdminUpgradeAction.class);
private static final Logger logger = LogManager.getLogger(AdminUpgradeAction.class);
private static final String VERSION_12_0 = "12.0";

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

@ -22,6 +22,8 @@ import java.util.Map;
import javax.annotation.Resource;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.UserPager;
@ -41,8 +43,6 @@ import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.validation.VaErrorHook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
*/
public class AdminUserAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(AdminUserAction.class);
private static final Logger logger = LogManager.getLogger(AdminUserAction.class);
// ===================================================================================
// Attribute

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

@ -22,6 +22,8 @@ import java.util.List;
import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
@ -40,15 +42,13 @@ import org.lastaflute.job.key.LaJobUnique;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AdminWizardAction extends FessAdminAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(AdminWizardAction.class);
private static final Logger logger = LogManager.getLogger(AdminWizardAction.class);
// ===================================================================================
// Attribute

6
src/main/java/org/codelibs/fess/app/web/api/admin/FessApiAdminAction.java
View file

@ -15,14 +15,14 @@
*/
package org.codelibs.fess.app.web.api.admin;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.web.api.FessApiAction;
import org.codelibs.fess.exception.InvalidAccessTokenException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class FessApiAdminAction extends FessApiAction {
private static final Logger logger = LoggerFactory.getLogger(FessApiAdminAction.class);
private static final Logger logger = LogManager.getLogger(FessApiAdminAction.class);
@Override
protected boolean isAccessAllowed() {

6
src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
View file

@ -22,6 +22,8 @@ import java.util.Map;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.CrudMode;
@ -43,8 +45,6 @@ import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.JsonResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -54,7 +54,7 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(ApiAdminSearchlistAction.class);
private static final Logger logger = LogManager.getLogger(ApiAdminSearchlistAction.class);
// ===================================================================================
// Attribute

6
src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java
View file

@ -20,6 +20,8 @@ import java.util.function.Consumer;
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.beans.util.CopyOptions;
import org.codelibs.fess.Constants;
@ -46,8 +48,6 @@ import org.lastaflute.web.servlet.session.SessionManager;
import org.lastaflute.web.validation.ActionValidator;
import org.lastaflute.web.validation.LaValidatable;
import org.lastaflute.web.validation.VaMessenger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author jflute
@ -58,7 +58,7 @@ public abstract class FessBaseAction extends TypicalAction // has several interf
// ===================================================================================
// Definition
// ==========
private static final Logger logger = LoggerFactory.getLogger(FessBaseAction.class);
private static final Logger logger = LogManager.getLogger(FessBaseAction.class);
/** The application type for FESs, e.g. used by access context. */
protected static final String APP_TYPE = "FES"; // #change_it_first

6
src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java vendored
View file

@ -17,6 +17,8 @@ package org.codelibs.fess.app.web.cache;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.base.FessSearchAction;
import org.codelibs.fess.app.web.error.ErrorAction;
@ -24,15 +26,13 @@ import org.codelibs.fess.util.DocumentUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.StreamResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CacheAction extends FessSearchAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(CacheAction.class);
private static final Logger logger = LogManager.getLogger(CacheAction.class);
// ===================================================================================
// Attribute

6
src/main/java/org/codelibs/fess/app/web/go/GoAction.java
View file

@ -22,6 +22,8 @@ import java.util.Map;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.net.URLUtil;
import org.codelibs.fess.Constants;
@ -39,15 +41,13 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.StreamResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class GoAction extends FessSearchAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(GoAction.class);
private static final Logger logger = LogManager.getLogger(GoAction.class);
@Resource
protected PathMappingHelper pathMappingHelper;

6
src/main/java/org/codelibs/fess/app/web/profile/ProfileAction.java
View file

@ -21,6 +21,8 @@ package org.codelibs.fess.app.web.profile;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.service.UserService;
import org.codelibs.fess.app.web.base.FessSearchAction;
import org.codelibs.fess.app.web.base.login.LocalUserCredential;
@ -28,12 +30,10 @@ import org.codelibs.fess.app.web.login.LoginAction;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.validation.VaErrorHook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ProfileAction extends FessSearchAction {
private static final Logger logger = LoggerFactory.getLogger(ProfileAction.class);
private static final Logger logger = LogManager.getLogger(ProfileAction.class);
// ===================================================================================
// Constant

6
src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
View file

@ -26,6 +26,8 @@ import java.util.Set;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.base.FessSearchAction;
@ -42,15 +44,13 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SearchAction extends FessSearchAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(SearchAction.class);
private static final Logger logger = LogManager.getLogger(SearchAction.class);
// ===================================================================================
// Attribute

6
src/main/java/org/codelibs/fess/app/web/sso/SsoAction.java
View file

@ -15,6 +15,8 @@
*/
package org.codelibs.fess.app.web.sso;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.web.RootAction;
import org.codelibs.fess.app.web.base.FessLoginAction;
import org.codelibs.fess.app.web.base.login.ActionResponseCredential;
@ -26,14 +28,12 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.login.credential.LoginCredential;
import org.lastaflute.web.login.exception.LoginFailureException;
import org.lastaflute.web.response.ActionResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SsoAction extends FessLoginAction {
// ===================================================================================
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(SsoAction.class);
private static final Logger logger = LogManager.getLogger(SsoAction.class);
// ===================================================================================
// Login Execute

6
src/main/java/org/codelibs/fess/auth/chain/CommandChain.java
View file

@ -26,18 +26,18 @@ import java.io.UnsupportedEncodingException;
import java.util.LinkedList;
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.fess.crawler.Constants;
import org.codelibs.fess.crawler.exception.CrawlerSystemException;
import org.codelibs.fess.es.user.exentity.User;
import org.codelibs.fess.exception.CommandExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CommandChain implements AuthenticationChain {
private static final Logger logger = LoggerFactory.getLogger(CommandChain.class);
private static final Logger logger = LogManager.getLogger(CommandChain.class);
protected File workingDirectory = null;

6
src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
View file

@ -27,6 +27,8 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.app.service.FailureUrlService;
@ -48,11 +50,9 @@ import org.codelibs.fess.helper.PermissionHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FessCrawlerThread extends CrawlerThread {
private static final Logger logger = LoggerFactory.getLogger(FessCrawlerThread.class);
private static final Logger logger = LogManager.getLogger(FessCrawlerThread.class);
@Override
protected boolean isContentUpdated(final CrawlerClient client, final UrlQueue<?> urlQueue) {

6
src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
View file

@ -27,6 +27,8 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tika.metadata.HttpHeaders;
import org.apache.tika.metadata.TikaMetadataKeys;
import org.codelibs.core.io.SerializeUtil;
@ -58,12 +60,10 @@ import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.taglib.FessFunctions;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractFessFileTransformer extends AbstractTransformer implements FessTransformer {
private static final Logger logger = LoggerFactory.getLogger(AbstractFessFileTransformer.class);
private static final Logger logger = LogManager.getLogger(AbstractFessFileTransformer.class);
protected Map<String, String> metaContentMapping;

6
src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java
View file

@ -17,17 +17,17 @@ package org.codelibs.fess.crawler.transformer;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.crawler.entity.ResponseData;
import org.codelibs.fess.crawler.extractor.Extractor;
import org.codelibs.fess.crawler.extractor.ExtractorFactory;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FessFileTransformer extends AbstractFessFileTransformer {
private static final Logger logger = LoggerFactory.getLogger(FessFileTransformer.class);
private static final Logger logger = LogManager.getLogger(FessFileTransformer.class);
@PostConstruct
public void init() {

6
src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java
View file

@ -17,17 +17,17 @@ package org.codelibs.fess.crawler.transformer;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.crawler.entity.ResponseData;
import org.codelibs.fess.crawler.extractor.Extractor;
import org.codelibs.fess.crawler.extractor.ExtractorFactory;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FessStandardTransformer extends AbstractFessFileTransformer {
private static final Logger logger = LoggerFactory.getLogger(FessStandardTransformer.class);
private static final Logger logger = LogManager.getLogger(FessStandardTransformer.class);
@PostConstruct
public void init() {

2
src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java
View file

@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.collection.LruHashMap;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
@ -33,7 +34,6 @@ import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.GroovyUtil;
import org.slf4j.Logger;
public interface FessTransformer {

6
src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
View file

@ -35,6 +35,8 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.xml.transform.TransformerException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.xpath.objects.XObject;
import org.codelibs.core.io.InputStreamUtil;
import org.codelibs.core.io.SerializeUtil;
@ -68,8 +70,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.PrunedTag;
import org.codelibs.nekohtml.parsers.DOMParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@ -78,7 +78,7 @@ import org.xml.sax.InputSource;
public class FessXpathTransformer extends XpathTransformer implements FessTransformer {
private static final Logger logger = LoggerFactory.getLogger(FessXpathTransformer.class);
private static final Logger logger = LogManager.getLogger(FessXpathTransformer.class);
private static final String X_ROBOTS_TAG = "X-Robots-Tag";

6
src/main/java/org/codelibs/fess/dict/DictionaryManager.java
View file

@ -25,17 +25,17 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.FileUtil;
import org.codelibs.curl.CurlResponse;
import org.codelibs.elasticsearch.runner.net.EcrCurl;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DictionaryManager {
private static final Logger logger = LoggerFactory.getLogger(DictionaryManager.class);
private static final Logger logger = LogManager.getLogger(DictionaryManager.class);
protected List<DictionaryCreator> creatorList = new ArrayList<>();

6
src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java
View file

@ -19,14 +19,14 @@ import java.util.Date;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.dict.DictionaryCreator;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.dict.DictionaryItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class KuromojiCreator extends DictionaryCreator {
private static final Logger logger = LoggerFactory.getLogger(KuromojiCreator.class);
private static final Logger logger = LogManager.getLogger(KuromojiCreator.class);
public KuromojiCreator() {
super("kuromoji.*\\.txt");

6
src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java
View file

@ -19,14 +19,14 @@ import java.util.Date;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.dict.DictionaryCreator;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.dict.DictionaryItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CharMappingCreator extends DictionaryCreator {
private static final Logger logger = LoggerFactory.getLogger(CharMappingCreator.class);
private static final Logger logger = LogManager.getLogger(CharMappingCreator.class);
public CharMappingCreator() {
super("mapping.*\\.txt");

6
src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java
View file

@ -32,6 +32,8 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.curl.CurlResponse;
@ -40,11 +42,9 @@ import org.codelibs.fess.dict.DictionaryException;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CharMappingFile extends DictionaryFile<CharMappingItem> {
private static final Logger logger = LoggerFactory.getLogger(CharMappingFile.class);
private static final Logger logger = LogManager.getLogger(CharMappingFile.class);
private static final String MAPPING = "mapping";

6
src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java
View file

@ -19,14 +19,14 @@ import java.util.Date;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.dict.DictionaryCreator;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.dict.DictionaryItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ProtwordsCreator extends DictionaryCreator {
private static final Logger logger = LoggerFactory.getLogger(ProtwordsCreator.class);
private static final Logger logger = LogManager.getLogger(ProtwordsCreator.class);
public ProtwordsCreator() {
super("protwords.*\\.txt");

6
src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java
View file

@ -19,14 +19,14 @@ import java.util.Date;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.dict.DictionaryCreator;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.dict.DictionaryItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class StemmerOverrideCreator extends DictionaryCreator {
private static final Logger logger = LoggerFactory.getLogger(StemmerOverrideCreator.class);
private static final Logger logger = LogManager.getLogger(StemmerOverrideCreator.class);
public StemmerOverrideCreator() {
super("stemmer_override.*\\.txt");

6
src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java
View file

@ -32,6 +32,8 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.curl.CurlResponse;
@ -40,11 +42,9 @@ import org.codelibs.fess.dict.DictionaryException;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class StemmerOverrideFile extends DictionaryFile<StemmerOverrideItem> {
private static final Logger logger = LoggerFactory.getLogger(StemmerOverrideFile.class);
private static final Logger logger = LogManager.getLogger(StemmerOverrideFile.class);
private static final String STEMMER_OVERRIDE = "stemmeroverride";

6
src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java
View file

@ -19,14 +19,14 @@ import java.util.Date;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.dict.DictionaryCreator;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.dict.DictionaryItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class StopwordsCreator extends DictionaryCreator {
private static final Logger logger = LoggerFactory.getLogger(StopwordsCreator.class);
private static final Logger logger = LogManager.getLogger(StopwordsCreator.class);
public StopwordsCreator() {
super("stopwords.*\\.txt");

6
src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java
View file

@ -19,14 +19,14 @@ import java.util.Date;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.dict.DictionaryCreator;
import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.dict.DictionaryItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SynonymCreator extends DictionaryCreator {
private static final Logger logger = LoggerFactory.getLogger(SynonymCreator.class);
private static final Logger logger = LogManager.getLogger(SynonymCreator.class);
public SynonymCreator() {
super("synonym.*\\.txt");

6
src/main/java/org/codelibs/fess/ds/AbstractDataStore.java
View file

@ -24,6 +24,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.fess.Constants;
@ -34,12 +36,10 @@ import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.GroovyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractDataStore implements DataStore {
private static final Logger logger = LoggerFactory.getLogger(AbstractDataStore.class);
private static final Logger logger = LogManager.getLogger(AbstractDataStore.class);
public String mimeType = "application/datastore";

6
src/main/java/org/codelibs/fess/ds/DataStoreFactory.java
View file

@ -33,18 +33,18 @@ import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.helper.PluginHelper;
import org.codelibs.fess.util.ResourceUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
public class DataStoreFactory {
private static final Logger logger = LoggerFactory.getLogger(DataStoreFactory.class);
private static final Logger logger = LogManager.getLogger(DataStoreFactory.class);
protected Map<String, DataStore> dataStoreMap = new LinkedHashMap<>();

6
src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
View file

@ -26,6 +26,8 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.SerializeUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.builder.RequestDataBuilder;
@ -46,11 +48,9 @@ import org.codelibs.fess.helper.IndexingHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.di.core.SingletonLaContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
private static final Logger logger = LoggerFactory.getLogger(FileListIndexUpdateCallbackImpl.class);
private static final Logger logger = LogManager.getLogger(FileListIndexUpdateCallbackImpl.class);
protected IndexUpdateCallback indexUpdateCallback;

6
src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java
View file

@ -22,6 +22,8 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.stream.StreamUtil;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.exception.DataStoreException;
@ -33,11 +35,9 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocList;
import org.codelibs.fess.util.DocumentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class IndexUpdateCallbackImpl implements IndexUpdateCallback {
private static final Logger logger = LoggerFactory.getLogger(IndexUpdateCallbackImpl.class);
private static final Logger logger = LogManager.getLogger(IndexUpdateCallbackImpl.class);
protected AtomicLong documentSize = new AtomicLong(0);

6
src/main/java/org/codelibs/fess/entity/FacetInfo.java
View file

@ -19,16 +19,16 @@ import java.util.Arrays;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.stream.StreamUtil;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.elasticsearch.search.aggregations.BucketOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FacetInfo {
private static final Logger logger = LoggerFactory.getLogger(FacetInfo.class);
private static final Logger logger = LogManager.getLogger(FacetInfo.class);
public String[] field;

6
src/main/java/org/codelibs/fess/entity/FacetQueryView.java
View file

@ -23,12 +23,12 @@ import java.util.ResourceBundle;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FacetQueryView {
private static final Logger logger = LoggerFactory.getLogger(FacetQueryView.class);
private static final Logger logger = LogManager.getLogger(FacetQueryView.class);
protected String title;

6
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -40,6 +40,8 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.core.exception.ResourceNotFoundRuntimeException;
import org.codelibs.core.io.FileUtil;
@ -153,15 +155,13 @@ import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
import org.elasticsearch.threadpool.ThreadPool;
import org.lastaflute.core.message.UserMessages;
import org.lastaflute.di.exception.ContainerInitFailureException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.io.BaseEncoding;
public class FessEsClient implements Client {
private static final Logger logger = LoggerFactory.getLogger(FessEsClient.class);
private static final Logger logger = LogManager.getLogger(FessEsClient.class);
protected ElasticsearchClusterRunner runner;

6
src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java
View file

@ -18,20 +18,20 @@ package org.codelibs.fess.es.config.exbhv;
import java.util.regex.Pattern;
import org.apache.commons.lang3.RandomUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.fess.es.config.bsbhv.BsScheduledJobBhv;
import org.codelibs.fess.es.config.exentity.ScheduledJob;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
*/
public class ScheduledJobBhv extends BsScheduledJobBhv {
private static final Logger logger = LoggerFactory.getLogger(ScheduledJobBhv.class);
private static final Logger logger = LogManager.getLogger(ScheduledJobBhv.class);
private String indexName = null;

6
src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
View file

@ -34,6 +34,8 @@ import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.auth.DigestScheme;
import org.apache.http.impl.auth.NTLMScheme;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.client.CrawlerClientFactory;
@ -49,8 +51,6 @@ import org.codelibs.fess.crawler.client.smb.SmbClient;
import org.codelibs.fess.crawler.exception.CrawlerSystemException;
import org.codelibs.fess.es.config.bsentity.BsDataConfig;
import org.codelibs.fess.util.ParameterUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
@ -59,7 +59,7 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(DataConfig.class);
private static final Logger logger = LogManager.getLogger(DataConfig.class);
private static final String CRAWLER_WEB_PREFIX = "crawler.web.";

6
src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java
View file

@ -15,11 +15,11 @@
*/
package org.codelibs.fess.es.config.exentity;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.service.FileConfigService;
import org.codelibs.fess.es.config.bsentity.BsFileAuthentication;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
@ -28,7 +28,7 @@ public class FileAuthentication extends BsFileAuthentication {
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(FileAuthentication.class);
private static final Logger logger = LogManager.getLogger(FileAuthentication.class);
private FileConfig fileConfig;

6
src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java
View file

@ -19,18 +19,18 @@ import java.util.function.BiFunction;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.es.config.bsentity.BsPathMapping;
import org.codelibs.fess.helper.PathMappingHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
*/
public class PathMapping extends BsPathMapping {
private static final Logger logger = LoggerFactory.getLogger(PathMapping.class);
private static final Logger logger = LogManager.getLogger(PathMapping.class);
private static final long serialVersionUID = 1L;

6
src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java
View file

@ -15,11 +15,11 @@
*/
package org.codelibs.fess.es.config.exentity;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.service.WebConfigService;
import org.codelibs.fess.es.config.bsentity.BsRequestHeader;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
@ -28,7 +28,7 @@ public class RequestHeader extends BsRequestHeader {
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(RequestHeader.class);
private static final Logger logger = LogManager.getLogger(RequestHeader.class);
private WebConfig webConfig;

6
src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
View file

@ -26,6 +26,8 @@ import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.auth.DigestScheme;
import org.apache.http.impl.auth.NTLMScheme;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.WebConfigService;
@ -39,8 +41,6 @@ import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.ParameterUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
@ -49,7 +49,7 @@ public class WebAuthentication extends BsWebAuthentication {
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(WebAuthentication.class);
private static final Logger logger = LogManager.getLogger(WebAuthentication.class);
private WebConfig webConfig;

6
src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java
View file

@ -22,17 +22,17 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.es.log.bsbhv.BsClickLogBhv;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.util.DfTypeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
*/
public class ClickLogBhv extends BsClickLogBhv {
private static final Logger logger = LoggerFactory.getLogger(ClickLogBhv.class);
private static final Logger logger = LogManager.getLogger(ClickLogBhv.class);
private String indexName = null;

6
src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java
View file

@ -22,17 +22,17 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.es.log.bsbhv.BsFavoriteLogBhv;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.util.DfTypeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
*/
public class FavoriteLogBhv extends BsFavoriteLogBhv {
private static final Logger logger = LoggerFactory.getLogger(FavoriteLogBhv.class);
private static final Logger logger = LogManager.getLogger(FavoriteLogBhv.class);
private String indexName = null;

6
src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java
View file

@ -24,20 +24,20 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.misc.Pair;
import org.codelibs.fess.es.log.bsbhv.BsSearchLogBhv;
import org.codelibs.fess.es.log.exentity.SearchLog;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
*/
public class SearchLogBhv extends BsSearchLogBhv {
private static final Logger logger = LoggerFactory.getLogger(SearchLogBhv.class);
private static final Logger logger = LogManager.getLogger(SearchLogBhv.class);
private String indexName = null;

6
src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java
View file

@ -22,17 +22,17 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.regex.Pattern;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.es.log.bsbhv.BsUserInfoBhv;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.util.DfTypeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author FreeGen
*/
public class UserInfoBhv extends BsUserInfoBhv {
private static final Logger logger = LoggerFactory.getLogger(UserInfoBhv.class);
private static final Logger logger = LogManager.getLogger(UserInfoBhv.class);
private String indexName = null;

6
src/main/java/org/codelibs/fess/exec/Crawler.java
View file

@ -35,6 +35,8 @@ 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;
import org.codelibs.core.exception.InterruptedRuntimeException;
import org.codelibs.core.lang.StringUtil;
@ -68,12 +70,10 @@ import org.lastaflute.core.mail.Postbox;
import org.lastaflute.di.core.external.GenericExternalContext;
import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Crawler {
private static final Logger logger = LoggerFactory.getLogger(Crawler.class);
private static final Logger logger = LogManager.getLogger(Crawler.class);
private static final String WEB_FS_CRAWLING_PROCESS = "WebFsCrawler";

6
src/main/java/org/codelibs/fess/exec/SuggestCreator.java
View file

@ -23,6 +23,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.core.timer.TimeoutManager;
@ -43,12 +45,10 @@ import org.kohsuke.args4j.Option;
import org.lastaflute.di.core.external.GenericExternalContext;
import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SuggestCreator {
private static final Logger logger = LoggerFactory.getLogger(SuggestCreator.class);
private static final Logger logger = LogManager.getLogger(SuggestCreator.class);
@Resource
public FessEsClient fessEsClient;

6
src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
View file

@ -23,6 +23,8 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.core.timer.TimeoutManager;
@ -42,12 +44,10 @@ import org.kohsuke.args4j.Option;
import org.lastaflute.di.core.external.GenericExternalContext;
import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ThumbnailGenerator {
private static final Logger logger = LoggerFactory.getLogger(ThumbnailGenerator.class);
private static final Logger logger = LogManager.getLogger(ThumbnailGenerator.class);
@Resource
public FessEsClient fessEsClient;

6
src/main/java/org/codelibs/fess/filter/CorsFilter.java
View file

@ -25,15 +25,15 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CorsFilter implements Filter {
private static final Logger logger = LoggerFactory.getLogger(CorsFilter.class);
private static final Logger logger = LogManager.getLogger(CorsFilter.class);
protected static final String OPTIONS = "OPTIONS";

6
src/main/java/org/codelibs/fess/helper/ActivityHelper.java
View file

@ -23,6 +23,8 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.app.web.base.login.FessCredential;
import org.codelibs.fess.mylasta.action.FessUserBean;
@ -30,8 +32,6 @@ import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.login.credential.LoginCredential;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author shinsuke
@ -46,7 +46,7 @@ public class ActivityHelper {
@PostConstruct
public void init() {
logger = LoggerFactory.getLogger(loggerName);
logger = LogManager.getLogger(loggerName);
}
public void login(final OptionalThing<FessUserBean> user) {

6
src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
View file

@ -15,6 +15,8 @@
*/
package org.codelibs.fess.helper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.service.FailureUrlService;
import org.codelibs.fess.crawler.CrawlerContext;
import org.codelibs.fess.crawler.entity.UrlQueue;
@ -24,11 +26,9 @@ import org.codelibs.fess.crawler.log.LogType;
import org.codelibs.fess.es.config.exentity.CrawlingConfig;
import org.codelibs.fess.exception.ContainerNotAvailableException;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CrawlerLogHelper extends LogHelperImpl {
private static final Logger logger = LoggerFactory.getLogger(CrawlerLogHelper.class);
private static final Logger logger = LogManager.getLogger(CrawlerLogHelper.class);
@Override
public void log(final LogType key, final Object... objs) {

6
src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java
View file

@ -26,6 +26,8 @@ import java.util.regex.Pattern;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.DataConfigService;
@ -47,15 +49,13 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.optional.OptionalThing;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
public class CrawlingConfigHelper {
private static final Logger logger = LoggerFactory.getLogger(CrawlingConfigHelper.class);
private static final Logger logger = LogManager.getLogger(CrawlingConfigHelper.class);
protected final Map<String, CrawlingConfig> crawlingConfigMap = new ConcurrentHashMap<>();

6
src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
View file

@ -27,6 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.security.MessageDigestUtil;
import org.codelibs.fess.Constants;
@ -44,11 +46,9 @@ import org.elasticsearch.search.aggregations.BucketOrder;
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CrawlingInfoHelper {
private static final Logger logger = LoggerFactory.getLogger(CrawlingInfoHelper.class);
private static final Logger logger = LogManager.getLogger(CrawlingInfoHelper.class);
public static final String FACET_COUNT_KEY = "count";

6
src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
View file

@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.fess.Constants;
@ -34,12 +36,10 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DataIndexHelper {
private static final Logger logger = LoggerFactory.getLogger(DataIndexHelper.class);
private static final Logger logger = LogManager.getLogger(DataIndexHelper.class);
private static final String DELETE_OLD_DOCS = "delete_old_docs";

6
src/main/java/org/codelibs/fess/helper/DocumentHelper.java
View file

@ -32,6 +32,8 @@ import java.util.zip.GZIPOutputStream;
import javax.annotation.PostConstruct;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.ReaderUtil;
import org.codelibs.core.io.SerializeUtil;
import org.codelibs.core.lang.StringUtil;
@ -60,11 +62,9 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.di.core.SingletonLaContainer;
import org.lastaflute.di.core.exception.ComponentNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DocumentHelper {
private static final Logger logger = LoggerFactory.getLogger(DocumentHelper.class);
private static final Logger logger = LogManager.getLogger(DocumentHelper.class);
protected static final String SIMILAR_DOC_HASH_PREFIX = "$";

6
src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java
View file

@ -20,14 +20,14 @@ import java.util.List;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.app.service.DuplicateHostService;
import org.codelibs.fess.es.config.exentity.DuplicateHost;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DuplicateHostHelper {
private static final Logger logger = LoggerFactory.getLogger(DuplicateHostHelper.class);
private static final Logger logger = LogManager.getLogger(DuplicateHostHelper.class);
protected List<DuplicateHost> duplicateHostList;

6
src/main/java/org/codelibs/fess/helper/FileTypeHelper.java
View file

@ -21,14 +21,14 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.stream.StreamUtil;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FileTypeHelper {
private static final Logger logger = LoggerFactory.getLogger(FileTypeHelper.class);
private static final Logger logger = LogManager.getLogger(FileTypeHelper.class);
protected String defaultValue = "others";

6
src/main/java/org/codelibs/fess/helper/IndexingHelper.java
View file

@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.thumbnail.ThumbnailManager;
@ -28,11 +30,9 @@ import org.codelibs.fess.util.MemoryUtil;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class IndexingHelper {
private static final Logger logger = LoggerFactory.getLogger(IndexingHelper.class);
private static final Logger logger = LogManager.getLogger(IndexingHelper.class);
protected int maxRetryCount = 5;

6
src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java
View file

@ -19,13 +19,13 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.fess.exception.FessSystemException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class IntervalControlHelper {
private static final Logger logger = LoggerFactory.getLogger(IntervalControlHelper.class);
private static final Logger logger = LogManager.getLogger(IntervalControlHelper.class);
protected volatile boolean crawlerRunning = true;

6
src/main/java/org/codelibs/fess/helper/JobHelper.java
View file

@ -18,6 +18,8 @@ package org.codelibs.fess.helper;
import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.timer.TimeoutManager;
import org.codelibs.core.timer.TimeoutTarget;
@ -36,11 +38,9 @@ import org.lastaflute.job.LaCron;
import org.lastaflute.job.LaScheduledJob;
import org.lastaflute.job.key.LaJobUnique;
import org.lastaflute.job.subsidiary.CronParamsSupplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JobHelper {
private static final Logger logger = LoggerFactory.getLogger(JobHelper.class);
private static final Logger logger = LogManager.getLogger(JobHelper.class);
protected int monitorInterval = 60 * 60;// 1hour

6
src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
View file

@ -23,6 +23,8 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.concurrent.CommonPoolUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
@ -42,11 +44,9 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class KeyMatchHelper {
private static final Logger logger = LoggerFactory.getLogger(KeyMatchHelper.class);
private static final Logger logger = LogManager.getLogger(KeyMatchHelper.class);
protected volatile Map<String, Map<String, Pair<QueryBuilder, ScoreFunctionBuilder<?>>>> keyMatchQueryMap = Collections.emptyMap();

6
src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java
View file

@ -29,17 +29,17 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.LabelTypeService;
import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
import org.codelibs.fess.es.config.exentity.LabelType;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class LabelTypeHelper {
private static final Logger logger = LoggerFactory.getLogger(LabelTypeHelper.class);
private static final Logger logger = LogManager.getLogger(LabelTypeHelper.class);
protected volatile List<LabelTypeItem> labelTypeItemList;

6
src/main/java/org/codelibs/fess/helper/LanguageHelper.java
View file

@ -19,17 +19,17 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.language.detect.LanguageResult;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class LanguageHelper {
private static final Logger logger = LoggerFactory.getLogger(LanguageHelper.class);
private static final Logger logger = LogManager.getLogger(LanguageHelper.class);
protected String[] langFields;

6
src/main/java/org/codelibs/fess/helper/OpenSearchHelper.java
View file

@ -21,13 +21,13 @@ import java.io.InputStream;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.web.response.StreamResponse;
import org.lastaflute.web.util.LaServletContextUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Helper class for Open Search Description Document.
@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class OpenSearchHelper {
private static final Logger logger = LoggerFactory.getLogger(OpenSearchHelper.class);
private static final Logger logger = LogManager.getLogger(OpenSearchHelper.class);
protected String osddPath;

6
src/main/java/org/codelibs/fess/helper/PathMappingHelper.java
View file

@ -24,6 +24,8 @@ import java.util.regex.Matcher;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.es.config.exbhv.PathMappingBhv;
@ -34,12 +36,10 @@ import org.codelibs.fess.util.GroovyUtil;
import org.lastaflute.di.core.exception.ComponentNotFoundException;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PathMappingHelper {
private static final Logger logger = LoggerFactory.getLogger(PathMappingHelper.class);
private static final Logger logger = LogManager.getLogger(PathMappingHelper.class);
protected static final String FUNCTION_ENCODEURL_MATCHER = "function:encodeUrl";

6
src/main/java/org/codelibs/fess/helper/PermissionHelper.java
View file

@ -25,6 +25,8 @@ 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.lang.StringUtil;
import org.codelibs.fess.crawler.client.fs.FileSystemClient;
import org.codelibs.fess.crawler.client.ftp.FtpClient;
@ -32,13 +34,11 @@ import org.codelibs.fess.crawler.client.smb.SmbClient;
import org.codelibs.fess.crawler.entity.ResponseData;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jcifs.SID;
public class PermissionHelper {
private static final Logger logger = LoggerFactory.getLogger(PermissionHelper.class);
private static final Logger logger = LogManager.getLogger(PermissionHelper.class);
protected String rolePrefix = "{role}";

6
src/main/java/org/codelibs/fess/helper/PluginHelper.java
View file

@ -39,6 +39,8 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.curl.Curl;
@ -48,8 +50,6 @@ import org.codelibs.fess.exception.PluginException;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.ResourceUtil;
import org.lastaflute.di.exception.IORuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@ -62,7 +62,7 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
public class PluginHelper {
private static final Logger logger = LoggerFactory.getLogger(PluginHelper.class);
private static final Logger logger = LogManager.getLogger(PluginHelper.class);
protected LoadingCache<ArtifactType, Artifact[]> availableArtifacts = CacheBuilder.newBuilder().maximumSize(10)
.expireAfterWrite(5, TimeUnit.MINUTES).build(new CacheLoader<ArtifactType, Artifact[]>() {

6
src/main/java/org/codelibs/fess/helper/PopularWordHelper.java
View file

@ -25,20 +25,20 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.suggest.exception.SuggesterException;
import org.codelibs.fess.suggest.request.popularwords.PopularWordsRequestBuilder;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
public class PopularWordHelper {
private static final Logger logger = LoggerFactory.getLogger(PopularWordHelper.class);
private static final Logger logger = LogManager.getLogger(PopularWordHelper.class);
protected static final char CACHE_KEY_SPLITTER = '\n';

6
src/main/java/org/codelibs/fess/helper/ProcessHelper.java
View file

@ -27,17 +27,17 @@ import java.util.function.Consumer;
import javax.annotation.PreDestroy;
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.exception.JobNotFoundException;
import org.codelibs.fess.exception.JobProcessingException;
import org.codelibs.fess.util.InputStreamThread;
import org.codelibs.fess.util.JobProcess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ProcessHelper {
private static final Logger logger = LoggerFactory.getLogger(ProcessHelper.class);
private static final Logger logger = LogManager.getLogger(ProcessHelper.class);
protected final ConcurrentHashMap<String, JobProcess> runningProcessMap = new ConcurrentHashMap<>();

6
src/main/java/org/codelibs/fess/helper/QueryHelper.java
View file

@ -34,6 +34,8 @@ import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
@ -77,11 +79,9 @@ import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.lastaflute.core.message.UserMessages;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class QueryHelper {
private static final Logger logger = LoggerFactory.getLogger(QueryHelper.class);
private static final Logger logger = LogManager.getLogger(QueryHelper.class);
protected static final String PREFERENCE_QUERY = "_query";

6
src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java
View file

@ -25,17 +25,17 @@ import java.util.regex.Pattern;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Pair;
import org.codelibs.fess.es.config.exbhv.RelatedContentBhv;
import org.codelibs.fess.es.config.exentity.RelatedContent;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RelatedContentHelper {
private static final Logger logger = LoggerFactory.getLogger(RelatedContentHelper.class);
private static final Logger logger = LogManager.getLogger(RelatedContentHelper.class);
protected volatile Map<String, Pair<Map<String, String>, List<Pair<Pattern, String>>>> relatedContentMap = Collections.emptyMap();

6
src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java
View file

@ -23,15 +23,15 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.es.config.exbhv.RelatedQueryBhv;
import org.codelibs.fess.es.config.exentity.RelatedQuery;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RelatedQueryHelper {
private static final Logger logger = LoggerFactory.getLogger(RelatedQueryHelper.class);
private static final Logger logger = LogManager.getLogger(RelatedQueryHelper.class);
protected volatile Map<String, Map<String, String[]>> relatedQueryMap = Collections.emptyMap();

6
src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java
View file

@ -28,6 +28,8 @@ import javax.annotation.PostConstruct;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.crypto.CachedCipher;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.app.service.AccessTokenService;
@ -38,8 +40,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* This class returns a list of a role from a request parameter,
@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*/
public class RoleQueryHelper {
private static final Logger logger = LoggerFactory.getLogger(RoleQueryHelper.class);
private static final Logger logger = LogManager.getLogger(RoleQueryHelper.class);
protected static final String USER_ROLES = "userRoles";

6
src/main/java/org/codelibs/fess/helper/SambaHelper.java
View file

@ -17,16 +17,16 @@ package org.codelibs.fess.helper;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jcifs.SID;
public class SambaHelper {
private static final Logger logger = LoggerFactory.getLogger(SambaHelper.class);
private static final Logger logger = LogManager.getLogger(SambaHelper.class);
public static final int SID_TYPE_ALIAS = 4;

6
src/main/java/org/codelibs/fess/helper/SearchHelper.java
View file

@ -30,6 +30,8 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.QueryContext;
@ -56,8 +58,6 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.taglib.function.LaFunctions;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SearchHelper {
@ -65,7 +65,7 @@ public class SearchHelper {
// Constant
//
private static final Logger logger = LoggerFactory.getLogger(SearchHelper.class);
private static final Logger logger = LogManager.getLogger(SearchHelper.class);
// ===================================================================================
// Method

6
src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
View file

@ -32,6 +32,8 @@ import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.concurrent.CommonPoolUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
@ -54,15 +56,13 @@ import org.dbflute.optional.OptionalThing;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.script.Script;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
public class SearchLogHelper {
private static final Logger logger = LoggerFactory.getLogger(SearchLogHelper.class);
private static final Logger logger = LogManager.getLogger(SearchLogHelper.class);
protected long userCheckInterval = 10 * 60 * 1000L;// 10 min

6
src/main/java/org/codelibs/fess/helper/SuggestHelper.java
View file

@ -32,6 +32,8 @@ import java.util.function.Consumer;
import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Pair;
import org.codelibs.fess.Constants;
@ -59,11 +61,9 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
import org.elasticsearch.search.sort.SortBuilders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SuggestHelper {
private static final Logger logger = LoggerFactory.getLogger(SuggestHelper.class);
private static final Logger logger = LogManager.getLogger(SuggestHelper.class);
protected static final String TEXT_SEP = " ";

6
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -49,6 +49,8 @@ import javax.servlet.ServletContext;
import org.apache.commons.lang3.LocaleUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.codelibs.core.exception.IORuntimeException;
import org.codelibs.core.lang.StringUtil;
@ -72,8 +74,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.util.LaServletContextUtil;
import org.lastaflute.web.validation.ActionValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
@ -82,7 +82,7 @@ import com.ibm.icu.util.ULocale;
public class SystemHelper {
private static final Logger logger = LoggerFactory.getLogger(SystemHelper.class);
private static final Logger logger = LogManager.getLogger(SystemHelper.class);
protected final Map<String, String> designJspFileNameMap = new LinkedHashMap<>();

6
src/main/java/org/codelibs/fess/helper/ThemeHelper.java
View file

@ -25,16 +25,16 @@ import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.exception.ThemeException;
import org.codelibs.fess.helper.PluginHelper.Artifact;
import org.codelibs.fess.helper.PluginHelper.ArtifactType;
import org.codelibs.fess.util.ResourceUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ThemeHelper {
private static final Logger logger = LoggerFactory.getLogger(ThemeHelper.class);
private static final Logger logger = LogManager.getLogger(ThemeHelper.class);
public void install(final Artifact artifact) {
final Path jarPath = getJarFile(artifact);

6
src/main/java/org/codelibs/fess/helper/ViewHelper.java
View file

@ -50,6 +50,8 @@ import javax.servlet.http.HttpSession;
import org.apache.catalina.connector.ClientAbortException;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.CoreLibConstants;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
@ -83,8 +85,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.util.LaResponseUtil;
import org.lastaflute.web.util.LaServletContextUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.github.jknack.handlebars.Context;
import com.github.jknack.handlebars.Handlebars;
@ -96,7 +96,7 @@ import com.ibm.icu.text.SimpleDateFormat;
public class ViewHelper {
private static final Logger logger = LoggerFactory.getLogger(ViewHelper.class);
private static final Logger logger = LogManager.getLogger(ViewHelper.class);
protected static final String SCREEN_WIDTH = "screen_width";

Some files were not shown because too many files have changed in this diff Show more