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

#1560 remove userAgentName

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-03-17 12:49:13 +09:00
parent 0ea9b16f3d
commit b62b5f7ee7
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@ public class AdminWizardAction extends FessAdminAction {
wConfig.setUpdatedBy(username);
wConfig.setUpdatedTime(now);
wConfig.setUrls(configPath);
wConfig.setUserAgent(getDefaultString("default.config.web.userAgent", ComponentUtil.getUserAgentName()));
wConfig.setUserAgent(getDefaultString("default.config.web.userAgent", fessConfig.getUserAgentName()));
wConfig.setPermissions(ComponentUtil.getFessConfig().getSearchDefaultDisplayEncodedPermissions());
webConfigService.store(wConfig);

6
src/main/java/org/codelibs/fess/util/ComponentUtil.java
View file

@ -117,8 +117,6 @@ public final class ComponentUtil {
private static final String MESSAGE_MANAGER = "messageManager";
private static final String USER_AGENT_NAME = "userAgentName";
private static final String INDEX_UPDATER = "indexUpdater";
private static final String FILE_TYPE_HELPER = "fileTypeHelper";
@ -308,10 +306,6 @@ public final class ComponentUtil {
return getComponent(INDEX_UPDATER);
}
public static String getUserAgentName() {
return getComponent(USER_AGENT_NAME);
}
public static KeyMatchHelper getKeyMatchHelper() {
return getComponent(KEY_MATCH_HELPER);
}