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

Merge pull request #408 from tonkatu05/10.0.x

Browse source 
modify AdminGeneralAction
This commit is contained in:
Shinsuke Sugaya 2016-03-05 07:26:35 +09:00
commit a632d20a9a
2 changed files with 232 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,34 +117,34 @@ public class AdminGeneralAction extends FessAdminAction {
});
fessConfig.setLoginRequired(Constants.ON.equalsIgnoreCase(form.loginRequired));
updateProperty(Constants.INCREMENTAL_CRAWLING_PROPERTY, getCheckboxValue(form.incrementalCrawling));
updateProperty(Constants.DAY_FOR_CLEANUP_PROPERTY, form.dayForCleanup.toString());
updateProperty(Constants.CRAWLING_THREAD_COUNT_PROPERTY, form.crawlingThreadCount.toString());
updateProperty(Constants.SEARCH_LOG_PROPERTY, getCheckboxValue(form.searchLog));
updateProperty(Constants.USER_INFO_PROPERTY, getCheckboxValue(form.userInfo));
updateProperty(Constants.USER_FAVORITE_PROPERTY, getCheckboxValue(form.userFavorite));
updateProperty(Constants.WEB_API_JSON_PROPERTY, getCheckboxValue(form.webApiJson));
fessConfig.setIncrementalCrawling(Constants.ON.equalsIgnoreCase(form.incrementalCrawling));
fessConfig.setDayForCleanup(form.dayForCleanup);
fessConfig.setCrawlingThreadCount(form.crawlingThreadCount);
fessConfig.setSearchLog(Constants.ON.equalsIgnoreCase(form.searchLog));
fessConfig.setUserInfo(Constants.ON.equalsIgnoreCase(form.userInfo));
fessConfig.setUserFavorite(Constants.ON.equalsIgnoreCase(form.userFavorite));
fessConfig.setWebApiJson(Constants.ON.equalsIgnoreCase(form.webApiJson));
fessConfig.setDefaultLabelValue(form.defaultLabelValue);
fessConfig.setDefaultSortValue(form.defaultSortValue);
updateProperty(Constants.APPEND_QUERY_PARAMETER_PROPERTY, getCheckboxValue(form.appendQueryParameter));
updateProperty(Constants.IGNORE_FAILURE_TYPE_PROPERTY, form.ignoreFailureType);
updateProperty(Constants.FAILURE_COUNT_THRESHOLD_PROPERTY, form.failureCountThreshold.toString());
fessConfig.setAppendQueryParameter(Constants.ON.equalsIgnoreCase(form.appendQueryParameter));
fessConfig.setIgnoreFailureType(form.ignoreFailureType);
fessConfig.setFailureCountThreshold(form.failureCountThreshold);
fessConfig.setWebApiPopularWord(Constants.ON.equalsIgnoreCase(form.popularWord));
updateProperty(Constants.CSV_FILE_ENCODING_PROPERTY, form.csvFileEncoding);
updateProperty(Constants.PURGE_SEARCH_LOG_DAY_PROPERTY, form.purgeSearchLogDay.toString());
updateProperty(Constants.PURGE_JOB_LOG_DAY_PROPERTY, form.purgeJobLogDay.toString());
updateProperty(Constants.PURGE_USER_INFO_DAY_PROPERTY, form.purgeUserInfoDay.toString());
updateProperty(Constants.PURGE_BY_BOTS_PROPERTY, form.purgeByBots);
updateProperty(Constants.NOTIFICATION_TO_PROPERTY, form.notificationTo);
updateProperty(Constants.SUGGEST_SEARCH_LOG_PROPERTY, getCheckboxValue(form.suggestSearchLog));
updateProperty(Constants.SUGGEST_DOCUMENTS_PROPERTY, getCheckboxValue(form.suggestDocuments));
updateProperty(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY, form.purgeSuggestSearchLogDay.toString());
updateProperty(Constants.LDAP_PROVIDER_URL, form.ldapProviderUrl);
updateProperty(Constants.LDAP_SECURITY_PRINCIPAL, form.ldapSecurityPrincipal);
updateProperty(Constants.LDAP_BASE_DN, form.ldapBaseDn);
updateProperty(Constants.LDAP_ACCOUNT_FILTER, form.ldapAccountFilter);
updateProperty(Constants.NOTIFICATION_LOGIN, form.notificationLogin);
updateProperty(Constants.NOTIFICATION_SEARCH_TOP, form.notificationSearchTop);
fessConfig.setCsvFileEncoding(form.csvFileEncoding);
fessConfig.setPurgeSearchLogDay(form.purgeSearchLogDay);
fessConfig.setPurgeJobLogDay(form.purgeJobLogDay);
fessConfig.setPurgeUserInfoDay(form.purgeUserInfoDay);
fessConfig.setPurgeByBots(form.purgeByBots);
fessConfig.setNotificationTo(form.notificationTo);
fessConfig.setSuggestSearchLog(Constants.ON.equalsIgnoreCase(form.suggestSearchLog));
fessConfig.setSuggestDocuments(Constants.ON.equalsIgnoreCase(form.suggestDocuments));
fessConfig.setPurgeSuggestSearchLogDay(form.purgeSuggestSearchLogDay);
fessConfig.setLdapProviderUrl(form.ldapProviderUrl);
fessConfig.setLdapSecurityPrincipal(form.ldapSecurityPrincipal);
fessConfig.setLdapBaseDn(form.ldapBaseDn);
fessConfig.setLdapAccountFilter(form.ldapAccountFilter);
fessConfig.setNotificationLogin(form.notificationLogin);
fessConfig.setNotificationSearchTop(form.notificationSearchTop);
fessConfig.storeSystemProperties();
saveInfo(messages -> messages.addSuccessUpdateCrawlerParams(GLOBAL));
@ -157,40 +157,34 @@ public class AdminGeneralAction extends FessAdminAction {
protected void updateForm(final EditForm form) {
form.loginRequired = fessConfig.isLoginRequired() ? Constants.TRUE : Constants.FALSE;
form.incrementalCrawling = systemProperties.getProperty(Constants.INCREMENTAL_CRAWLING_PROPERTY, Constants.TRUE);
form.dayForCleanup = getPropertyAsInteger(Constants.DAY_FOR_CLEANUP_PROPERTY, Constants.DEFAULT_DAY_FOR_CLEANUP);
form.crawlingThreadCount = getPropertyAsInteger(Constants.CRAWLING_THREAD_COUNT_PROPERTY, 5);
form.searchLog = systemProperties.getProperty(Constants.SEARCH_LOG_PROPERTY, Constants.TRUE);
form.userInfo = systemProperties.getProperty(Constants.USER_INFO_PROPERTY, Constants.TRUE);
form.userFavorite = systemProperties.getProperty(Constants.USER_FAVORITE_PROPERTY, Constants.FALSE);
form.webApiJson = systemProperties.getProperty(Constants.WEB_API_JSON_PROPERTY, Constants.TRUE);
form.incrementalCrawling = fessConfig.isIncrementalCrawling() ? Constants.TRUE : Constants.FALSE;
form.dayForCleanup = fessConfig.getDayForCleanup();
form.crawlingThreadCount = fessConfig.getCrawlingThreadCount();
form.searchLog = fessConfig.isSearchLog() ? Constants.TRUE : Constants.FALSE;
form.userInfo = fessConfig.isUserInfo() ? Constants.TRUE : Constants.FALSE;
form.userFavorite = fessConfig.isUserFavorite() ? Constants.TRUE : Constants.FALSE;
form.webApiJson = fessConfig.isWebApiJson() ? Constants.TRUE : Constants.FALSE;
form.defaultLabelValue = fessConfig.getDefaultLabelValue();
form.defaultSortValue = fessConfig.getDefaultSortValue();
form.appendQueryParameter = systemProperties.getProperty(Constants.APPEND_QUERY_PARAMETER_PROPERTY, Constants.FALSE);
form.ignoreFailureType =
systemProperties.getProperty(Constants.IGNORE_FAILURE_TYPE_PROPERTY, Constants.DEFAULT_IGNORE_FAILURE_TYPE);
form.failureCountThreshold = getPropertyAsInteger(Constants.FAILURE_COUNT_THRESHOLD_PROPERTY, Constants.DEFAULT_FAILURE_COUNT);
form.appendQueryParameter = fessConfig.isAppendQueryParameter() ? Constants.TRUE : Constants.FALSE;
form.ignoreFailureType = fessConfig.getIgnoreFailureType();
form.failureCountThreshold = fessConfig.getFailureCountThreshold();
form.popularWord = fessConfig.isWebApiPopularWord() ? Constants.TRUE : Constants.FALSE;
form.csvFileEncoding = systemProperties.getProperty(Constants.CSV_FILE_ENCODING_PROPERTY, Constants.UTF_8);
form.purgeSearchLogDay =
Integer.parseInt(systemProperties.getProperty(Constants.PURGE_SEARCH_LOG_DAY_PROPERTY, Constants.DEFAULT_PURGE_DAY));
form.purgeJobLogDay =
Integer.parseInt(systemProperties.getProperty(Constants.PURGE_JOB_LOG_DAY_PROPERTY, Constants.DEFAULT_PURGE_DAY));
form.purgeUserInfoDay =
Integer.parseInt(systemProperties.getProperty(Constants.PURGE_USER_INFO_DAY_PROPERTY, Constants.DEFAULT_PURGE_DAY));
form.purgeByBots = systemProperties.getProperty(Constants.PURGE_BY_BOTS_PROPERTY, Constants.DEFAULT_PURGE_BY_BOTS);
form.notificationTo = systemProperties.getProperty(Constants.NOTIFICATION_TO_PROPERTY, StringUtil.EMPTY);
form.suggestSearchLog = systemProperties.getProperty(Constants.SUGGEST_SEARCH_LOG_PROPERTY, Constants.TRUE);
form.suggestDocuments = systemProperties.getProperty(Constants.SUGGEST_DOCUMENTS_PROPERTY, Constants.TRUE);
form.purgeSuggestSearchLogDay =
Integer.parseInt(systemProperties.getProperty(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY,
Constants.DEFAULT_SUGGEST_PURGE_DAY));
form.ldapProviderUrl = systemProperties.getProperty(Constants.LDAP_PROVIDER_URL, StringUtil.EMPTY);
form.ldapSecurityPrincipal = systemProperties.getProperty(Constants.LDAP_SECURITY_PRINCIPAL, StringUtil.EMPTY);
form.ldapBaseDn = systemProperties.getProperty(Constants.LDAP_BASE_DN, StringUtil.EMPTY);
form.ldapAccountFilter = systemProperties.getProperty(Constants.LDAP_ACCOUNT_FILTER, StringUtil.EMPTY);
form.notificationLogin = systemProperties.getProperty(Constants.NOTIFICATION_LOGIN, StringUtil.EMPTY);
form.notificationSearchTop = systemProperties.getProperty(Constants.NOTIFICATION_SEARCH_TOP, StringUtil.EMPTY);
form.csvFileEncoding = fessConfig.getCsvFileEncoding();
form.purgeSearchLogDay = fessConfig.getPurgeSearchLogDay();
form.purgeJobLogDay = fessConfig.getPurgeJobLogDay();
form.purgeUserInfoDay = fessConfig.getPurgeUserInfoDay();
form.purgeByBots = fessConfig.getPurgeByBots();
form.notificationTo = fessConfig.getNotificationTo();
form.suggestSearchLog = fessConfig.isSuggestSearchLog() ? Constants.TRUE : Constants.FALSE;
form.suggestDocuments = fessConfig.isSuggestDocuments() ? Constants.TRUE : Constants.FALSE;
form.purgeSuggestSearchLogDay = fessConfig.getPurgeSuggestSearchLogDay();
form.ldapProviderUrl = fessConfig.getLdapProviderUrl();
form.ldapSecurityPrincipal = fessConfig.getLdapSecurityPrincipal();
form.ldapBaseDn = fessConfig.getLdapBaseDn();
form.ldapAccountFilter = fessConfig.getLdapAccountFilter();
form.notificationLogin = fessConfig.getNotificationLogin();
form.notificationSearchTop = fessConfig.getNotificationSearchTop();
}
private void updateProperty(final String key, final String value) {

195
src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
View file

@ -204,38 +204,195 @@ public interface FessProp {
return getSystemPropertyAsBoolean(Constants.LOGIN_REQUIRED_PROPERTY, false);
}
public default void setIncrementalCrawling(final boolean value) {
setSystemPropertyAsBoolean(Constants.INCREMENTAL_CRAWLING_PROPERTY, value);
}
public default boolean isIncrementalCrawling() {
return getSystemPropertyAsBoolean(Constants.INCREMENTAL_CRAWLING_PROPERTY, true);
}
public default void setDayForCleanup(final int value) {
setSystemPropertyAsInt(Constants.DAY_FOR_CLEANUP_PROPERTY, value);
}
public default int getDayForCleanup() {
return getSystemPropertyAsInt(Constants.DAY_FOR_CLEANUP_PROPERTY, Constants.DEFAULT_DAY_FOR_CLEANUP);
}
public default void setCrawlingThreadCount(final int value) {
setSystemPropertyAsInt(Constants.CRAWLING_THREAD_COUNT_PROPERTY, value);
}
public default int getCrawlingThreadCount() {
return getSystemPropertyAsInt(Constants.CRAWLING_THREAD_COUNT_PROPERTY, 5);
}
public default void setSearchLog(final boolean value) {
setSystemPropertyAsBoolean(Constants.SEARCH_LOG_PROPERTY, value);
}
public default boolean isSearchLog() {
return getSystemPropertyAsBoolean(Constants.SEARCH_LOG_PROPERTY, false);
}
public default void setUserInfo(final boolean value) {
setSystemPropertyAsBoolean(Constants.USER_INFO_PROPERTY, value);
}
public default boolean isUserInfo() {
return getSystemPropertyAsBoolean(Constants.USER_INFO_PROPERTY, false);
}
public default void setUserFavorite(final boolean value) {
setSystemPropertyAsBoolean(Constants.USER_FAVORITE_PROPERTY, value);
}
public default boolean isUserFavorite() {
return getSystemPropertyAsBoolean(Constants.USER_FAVORITE_PROPERTY, false);
}
public default void setWebApiJson(final boolean value) {
setSystemPropertyAsBoolean(Constants.WEB_API_JSON_PROPERTY, value);
}
public default boolean isWebApiJson() {
return getSystemPropertyAsBoolean(Constants.WEB_API_JSON_PROPERTY, false);
}
public default void setAppendQueryParameter(final boolean value) {
setSystemPropertyAsBoolean(Constants.APPEND_QUERY_PARAMETER_PROPERTY, value);
}
public default boolean isAppendQueryParameter() {
return getSystemPropertyAsBoolean(Constants.APPEND_QUERY_PARAMETER_PROPERTY, false);
}
public default void setIgnoreFailureType(final String value) {
setSystemProperty(Constants.IGNORE_FAILURE_TYPE_PROPERTY, value);
}
public default String getIgnoreFailureType() {
return getSystemProperty(Constants.IGNORE_FAILURE_TYPE_PROPERTY, Constants.DEFAULT_IGNORE_FAILURE_TYPE);
}
public default void setFailureCountThreshold(final int value) {
setSystemPropertyAsInt(Constants.FAILURE_COUNT_THRESHOLD_PROPERTY, value);
}
public default int getFailureCountThreshold() {
return getSystemPropertyAsInt(Constants.FAILURE_COUNT_THRESHOLD_PROPERTY, Constants.DEFAULT_FAILURE_COUNT);
}
public default void setWebApiPopularWord(final boolean value) {
setSystemPropertyAsBoolean(Constants.WEB_API_POPULAR_WORD_PROPERTY, value);
}
public default boolean isWebApiPopularWord() {
return getSystemPropertyAsBoolean(Constants.WEB_API_POPULAR_WORD_PROPERTY, true);
}
public default void setCsvFileEncoding(final String value) {
setSystemProperty(Constants.CSV_FILE_ENCODING_PROPERTY, value);
}
public default String getCsvFileEncoding() {
return getSystemProperty(Constants.CSV_FILE_ENCODING_PROPERTY, Constants.UTF_8);
}
public default void setPurgeSearchLogDay(final int value) {
setSystemPropertyAsInt(Constants.PURGE_SEARCH_LOG_DAY_PROPERTY, value);
}
public default int getPurgeSearchLogDay() {
return getSystemPropertyAsInt(Constants.PURGE_SEARCH_LOG_DAY_PROPERTY, Integer.parseInt(Constants.DEFAULT_PURGE_DAY));
}
public default String getLdapInitialContextFactory() {
return getSystemProperty(Constants.LDAP_INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
public default void setPurgeJobLogDay(final int value) {
setSystemPropertyAsInt(Constants.PURGE_JOB_LOG_DAY_PROPERTY, value);
}
public default int getPurgeJobLogDay() {
return getSystemPropertyAsInt(Constants.PURGE_JOB_LOG_DAY_PROPERTY, Integer.parseInt(Constants.DEFAULT_PURGE_DAY));
}
public default void setPurgeUserInfoDay(final int value) {
setSystemPropertyAsInt(Constants.PURGE_USER_INFO_DAY_PROPERTY, value);
}
public default int getPurgeUserInfoDay() {
return getSystemPropertyAsInt(Constants.PURGE_USER_INFO_DAY_PROPERTY, Integer.parseInt(Constants.DEFAULT_PURGE_DAY));
}
public default void setPurgeByBots(final String value) {
setSystemProperty(Constants.PURGE_BY_BOTS_PROPERTY, value);
}
public default String getPurgeByBots() {
return getSystemProperty(Constants.PURGE_BY_BOTS_PROPERTY, Constants.DEFAULT_PURGE_BY_BOTS);
}
public default void setNotificationTo(final String value) {
setSystemProperty(Constants.NOTIFICATION_TO_PROPERTY, value);
}
public default String getNotificationTo() {
return getSystemProperty(Constants.NOTIFICATION_TO_PROPERTY, StringUtil.EMPTY);
}
public default void setSuggestSearchLog(final boolean value) {
setSystemPropertyAsBoolean(Constants.SUGGEST_SEARCH_LOG_PROPERTY, value);
}
public default boolean isSuggestSearchLog() {
return getSystemPropertyAsBoolean(Constants.SUGGEST_SEARCH_LOG_PROPERTY, true);
}
public default void setSuggestDocuments(final boolean value) {
setSystemPropertyAsBoolean(Constants.SUGGEST_DOCUMENTS_PROPERTY, value);
}
public default boolean isSuggestDocuments() {
return getSystemPropertyAsBoolean(Constants.SUGGEST_DOCUMENTS_PROPERTY, true);
}
public default void setPurgeSuggestSearchLogDay(final int value) {
setSystemPropertyAsInt(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY, value);
}
public default int getPurgeSuggestSearchLogDay() {
return getSystemPropertyAsInt(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY, Integer.parseInt(Constants.DEFAULT_SUGGEST_PURGE_DAY));
}
public default void setLdapInitialContextFactory(final String value) {
setSystemProperty(Constants.LDAP_INITIAL_CONTEXT_FACTORY, value);
}
public default String getLdapSecurityAuthentication() {
return getSystemProperty(Constants.LDAP_SECURITY_AUTHENTICATION, "simple");
public default String getLdapInitialContextFactory() {
return getSystemProperty(Constants.LDAP_INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
}
public default void setLdapSecurityAuthentication(final String value) {
setSystemProperty(Constants.LDAP_SECURITY_AUTHENTICATION, value);
}
public default String getLdapProviderUrl() {
return getSystemProperty(Constants.LDAP_PROVIDER_URL);
public default String getLdapSecurityAuthentication() {
return getSystemProperty(Constants.LDAP_SECURITY_AUTHENTICATION, "simple");
}
public default void setLdapProviderUrl(final String value) {
setSystemProperty(Constants.LDAP_PROVIDER_URL, value);
}
public default String getLdapProviderUrl() {
return getSystemProperty(Constants.LDAP_PROVIDER_URL);
}
public default void setLdapSecurityPrincipal(final String value) {
setSystemProperty(Constants.LDAP_SECURITY_PRINCIPAL, value);
}
public default String getLdapSecurityPrincipal(final String username) {
return String.format(getSystemProperty(Constants.LDAP_SECURITY_PRINCIPAL, StringUtil.EMPTY), username);
}
@ -244,24 +401,36 @@ public interface FessProp {
return getSystemProperty(Constants.LDAP_SECURITY_PRINCIPAL);
}
public default void setLdapSecurityPrincipal(final String value) {
setSystemProperty(Constants.LDAP_SECURITY_PRINCIPAL, value);
public default void setLdapBaseDn(final String value) {
setSystemProperty(Constants.LDAP_BASE_DN, value);
}
public default String getLdapBaseDn() {
return getSystemProperty(Constants.LDAP_BASE_DN);
}
public default void setLdapBaseDn(final String value) {
setSystemProperty(Constants.LDAP_BASE_DN, value);
public default void setLdapAccountFilter(final String value) {
setSystemProperty(Constants.LDAP_ACCOUNT_FILTER, value);
}
public default String getLdapAccountFilter() {
return getSystemProperty(Constants.LDAP_ACCOUNT_FILTER);
}
public default void setLdapAccountFilter(final String value) {
setSystemProperty(Constants.LDAP_ACCOUNT_FILTER, value);
public default void setNotificationLogin(final String value) {
setSystemProperty(Constants.NOTIFICATION_LOGIN, value);
}
public default String getNotificationLogin() {
return getSystemProperty(Constants.NOTIFICATION_LOGIN, StringUtil.EMPTY);
}
public default void setNotificationSearchTop(final String value) {
setSystemProperty(Constants.NOTIFICATION_SEARCH_TOP, value);
}
public default String getNotificationSearchTop() {
return getSystemProperty(Constants.NOTIFICATION_SEARCH_TOP, StringUtil.EMPTY);
}
//