diff --git a/pom.xml b/pom.xml
index b481e9182..93ec50df3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,6 @@
org/codelibs/fess/app/web/admin/IndexAction.java
org/codelibs/fess/app/web/admin/RoleTypeForm.java
org/codelibs/fess/app/web/admin/LogAction.java
- org/codelibs/fess/app/web/admin/RequestHeaderForm.java
org/codelibs/fess/app/web/admin/FailureUrlAction.java
org/codelibs/fess/app/web/admin/DictAction.java
org/codelibs/fess/app/web/admin/SuggestElevateWordAction.java
@@ -143,7 +142,6 @@
org/codelibs/fess/app/web/admin/WizardForm.java
org/codelibs/fess/app/web/admin/FailureUrlForm.java
org/codelibs/fess/app/web/admin/FileAuthenticationForm.java
- org/codelibs/fess/app/web/admin/RequestHeaderAction.java
org/codelibs/fess/app/web/base/AbstractLoginAction.java
org/codelibs/fess/app/web/ErrorAction.java
org/codelibs/fess/app/web/LoginAction.java
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/RequestHeaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/RequestHeaderAction.java
deleted file mode 100644
index 32e94abff..000000000
--- a/src/main/java/org/codelibs/fess/app/web/admin/RequestHeaderAction.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.app.web.admin;
-
-import java.beans.Beans;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.codelibs.core.beans.util.BeanUtil;
-import org.codelibs.fess.annotation.Token;
-import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.beans.FessBeans;
-import org.codelibs.fess.crud.CommonConstants;
-import org.codelibs.fess.crud.CrudMessageException;
-import org.codelibs.fess.crud.util.SAStrutsUtil;
-import org.codelibs.fess.es.exentity.RequestHeader;
-import org.codelibs.fess.es.exentity.WebConfig;
-import org.codelibs.fess.exception.SSCActionMessagesException;
-import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.app.pager.RequestHeaderPager;
-import org.codelibs.fess.app.service.RequestHeaderService;
-import org.codelibs.fess.app.service.WebConfigService;
-import org.lastaflute.web.util.LaRequestUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class RequestHeaderAction extends FessAdminAction {
-
- private static final Logger logger = LoggerFactory.getLogger(RequestHeaderAction.class);
-
- // for list
-
- public List requestHeaderItems;
-
- // for edit/confirm/delete
-
- //@ActionForm
- @Resource
- protected RequestHeaderForm requestHeaderForm;
-
- @Resource
- protected RequestHeaderService requestHeaderService;
-
- @Resource
- protected RequestHeaderPager requestHeaderPager;
-
- @Resource
- protected WebConfigService webConfigService;
-
- @Resource
- protected SystemHelper systemHelper;
-
- public String getHelpLink() {
- return systemHelper.getHelpLink("requestHeader");
- }
-
- protected String displayList(final boolean redirect) {
- // page navi
- requestHeaderItems = requestHeaderService.getRequestHeaderList(requestHeaderPager);
-
- // restore from pager
- BeanUtil.copyBeanToBean(requestHeaderPager, requestHeaderForm.searchParams,
- option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE));
-
- if (redirect) {
- return "index?redirect=true";
- } else {
- return "index.jsp";
- }
- }
-
- //@Execute(validator = false, input = "error.jsp")
- public String index() {
- return displayList(false);
- }
-
- //@Execute(validator = false, input = "error.jsp", urlPattern = "list/{pageNumber}")
- public String list() {
- // page navi
- if (StringUtil.isNotBlank(requestHeaderForm.pageNumber)) {
- try {
- requestHeaderPager.setCurrentPageNumber(Integer.parseInt(requestHeaderForm.pageNumber));
- } catch (final NumberFormatException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Invalid value: " + requestHeaderForm.pageNumber, e);
- }
- }
- }
-
- return displayList(false);
- }
-
- //@Execute(validator = false, input = "error.jsp")
- public String search() {
- BeanUtil.copyBeanToBean(requestHeaderForm.searchParams, requestHeaderPager,
- option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE));
-
- return displayList(false);
- }
-
- //@Execute(validator = false, input = "error.jsp")
- public String reset() {
- requestHeaderPager.clear();
-
- return displayList(false);
- }
-
- //@Execute(validator = false, input = "error.jsp")
- public String back() {
- return displayList(false);
- }
-
- @Token(save = true, validate = false)
- //@Execute(validator = false, input = "error.jsp")
- public String editagain() {
- return "edit.jsp";
- }
-
- //@Execute(validator = false, input = "error.jsp", urlPattern = "confirmpage/{crudMode}/{id}")
- public String confirmpage() {
- if (requestHeaderForm.crudMode != CommonConstants.CONFIRM_MODE) {
- throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.CONFIRM_MODE,
- requestHeaderForm.crudMode });
- }
-
- loadRequestHeader();
-
- return "confirm.jsp";
- }
-
- @Token(save = true, validate = false)
- //@Execute(validator = false, input = "error.jsp")
- public String createpage() {
- // page navi
- requestHeaderForm.initialize();
- requestHeaderForm.crudMode = CommonConstants.CREATE_MODE;
-
- return "edit.jsp";
- }
-
- @Token(save = true, validate = false)
- //@Execute(validator = false, input = "error.jsp", urlPattern = "editpage/{crudMode}/{id}")
- public String editpage() {
- if (requestHeaderForm.crudMode != CommonConstants.EDIT_MODE) {
- throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.EDIT_MODE,
- requestHeaderForm.crudMode });
- }
-
- loadRequestHeader();
-
- return "edit.jsp";
- }
-
- @Token(save = true, validate = false)
- //@Execute(validator = false, input = "error.jsp")
- public String editfromconfirm() {
- requestHeaderForm.crudMode = CommonConstants.EDIT_MODE;
-
- loadRequestHeader();
-
- return "edit.jsp";
- }
-
- @Token(save = false, validate = true, keep = true)
- //@Execute(validator = true, input = "edit.jsp")
- public String confirmfromcreate() {
- return "confirm.jsp";
- }
-
- @Token(save = false, validate = true, keep = true)
- //@Execute(validator = true, input = "edit.jsp")
- public String confirmfromupdate() {
- return "confirm.jsp";
- }
-
- @Token(save = true, validate = false)
- //@Execute(validator = false, input = "error.jsp", urlPattern = "deletepage/{crudMode}/{id}")
- public String deletepage() {
- if (requestHeaderForm.crudMode != CommonConstants.DELETE_MODE) {
- throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE,
- requestHeaderForm.crudMode });
- }
-
- loadRequestHeader();
-
- return "confirm.jsp";
- }
-
- @Token(save = true, validate = false)
- //@Execute(validator = false, input = "error.jsp")
- public String deletefromconfirm() {
- requestHeaderForm.crudMode = CommonConstants.DELETE_MODE;
-
- loadRequestHeader();
-
- return "confirm.jsp";
- }
-
- @Token(save = false, validate = true)
- //@Execute(validator = true, input = "edit.jsp")
- public String create() {
- try {
- final RequestHeader requestHeader = createRequestHeader();
- requestHeaderService.store(requestHeader);
- SAStrutsUtil.addSessionMessage("success.crud_create_crud_table");
-
- return displayList(true);
- } catch (final ActionMessagesException e) {
- logger.error(e.getMessage(), e);
- throw e;
- } catch (final CrudMessageException e) {
- logger.error(e.getMessage(), e);
- throw new ActionMessagesException(e.getMessageId(), e.getArgs());
- } catch (final Exception e) {
- logger.error(e.getMessage(), e);
- throw new ActionMessagesException("errors.crud_failed_to_create_crud_table");
- }
- }
-
- @Token(save = false, validate = true)
- //@Execute(validator = true, input = "edit.jsp")
- public String update() {
- try {
- final RequestHeader requestHeader = createRequestHeader();
- requestHeaderService.store(requestHeader);
- SAStrutsUtil.addSessionMessage("success.crud_update_crud_table");
-
- return displayList(true);
- } catch (final ActionMessagesException e) {
- logger.error(e.getMessage(), e);
- throw e;
- } catch (final CrudMessageException e) {
- logger.error(e.getMessage(), e);
- throw new ActionMessagesException(e.getMessageId(), e.getArgs());
- } catch (final Exception e) {
- logger.error(e.getMessage(), e);
- throw new ActionMessagesException("errors.crud_failed_to_update_crud_table");
- }
- }
-
- protected Map createKeyMap() {
- final Map keys = new HashMap();
-
- keys.put("id", requestHeaderForm.id);
-
- return keys;
- }
-
- protected void loadRequestHeader() {
-
- final RequestHeader requestHeader = requestHeaderService.getRequestHeader(createKeyMap());
- if (requestHeader == null) {
- // throw an exception
- throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { requestHeaderForm.id });
- }
-
- BeanUtil.copyBeanToBean(requestHeader, requestHeaderForm, option -> option.excludes("searchParams", "mode"));
- }
-
- protected RequestHeader createRequestHeader() {
- RequestHeader requestHeader;
- final String username = systemHelper.getUsername();
- final long currentTime = systemHelper.getCurrentTimeAsLong();
- if (requestHeaderForm.crudMode == CommonConstants.EDIT_MODE) {
- requestHeader = requestHeaderService.getRequestHeader(createKeyMap());
- if (requestHeader == null) {
- // throw an exception
- throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { requestHeaderForm.id });
- }
- } else {
- requestHeader = new RequestHeader();
- requestHeader.setCreatedBy(username);
- requestHeader.setCreatedTime(currentTime);
- }
- requestHeader.setUpdatedBy(username);
- requestHeader.setUpdatedTime(currentTime);
- BeanUtil.copyBeanToBean(requestHeaderForm, requestHeader, option -> option.exclude(CommonConstants.COMMON_CONVERSION_RULE));
-
- return requestHeader;
- }
-
- //@Execute(validator = false, input = "error.jsp")
- public String delete() {
- if (requestHeaderForm.crudMode != CommonConstants.DELETE_MODE) {
- throw new SSCActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE,
- requestHeaderForm.crudMode });
- }
-
- try {
- final RequestHeader requestHeader = requestHeaderService.getRequestHeader(createKeyMap());
- if (requestHeader == null) {
- // throw an exception
- throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { requestHeaderForm.id });
- }
-
- requestHeaderService.delete(requestHeader);
- SAStrutsUtil.addSessionMessage("success.crud_delete_crud_table");
-
- return displayList(true);
- } catch (final ActionMessagesException e) {
- logger.error(e.getMessage(), e);
- throw e;
- } catch (final CrudMessageException e) {
- logger.error(e.getMessage(), e);
- throw new SSCActionMessagesException(e, e.getMessageId(), e.getArgs());
- } catch (final Exception e) {
- logger.error(e.getMessage(), e);
- throw new SSCActionMessagesException(e, "errors.crud_failed_to_delete_crud_table");
- }
- }
-
- public List> getWebConfigItems() {
- final List> items = new ArrayList>();
- final List webConfigList = webConfigService.getAllWebConfigList(false, false, false, null);
- for (final WebConfig webConfig : webConfigList) {
- items.add(createItem(webConfig.getName(), webConfig.getId().toString()));
- }
- return items;
- }
-
- public List> getProtocolSchemeItems() {
- final List> items = new ArrayList>();
- items.add(createItem(
- MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "labels.web_authentication_scheme_basic"), "BASIC"));
- items.add(createItem(
- MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "labels.web_authentication_scheme_digest"),
- "DIGEST"));
- return items;
- }
-
- protected Map createItem(final String label, final String value) {
- final Map map = new HashMap(2);
- map.put("label", label);
- map.put("value", value);
- return map;
- }
-
- public boolean isDisplayCreateLink() {
- return !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty();
- }
-}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
new file mode 100644
index 000000000..85097d39f
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2009-2015 the CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+package org.codelibs.fess.app.web.admin.requestheader;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.codelibs.fess.annotation.Token;
+import org.codelibs.fess.app.pager.RequestHeaderPager;
+import org.codelibs.fess.app.service.RequestHeaderService;
+import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.crud.CommonConstants;
+import org.codelibs.fess.es.exentity.RequestHeader;
+import org.codelibs.fess.helper.SystemHelper;
+import org.lastaflute.web.Execute;
+import org.lastaflute.web.callback.ActionRuntime;
+import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.render.RenderData;
+import org.lastaflute.web.validation.VaErrorHook;
+
+/**
+ * @author shinsuke
+ */
+public class AdminRequestheaderAction extends FessAdminAction {
+
+ // ===================================================================================
+ // Attribute
+ // =========
+ @Resource
+ private RequestHeaderService requestHeaderService;
+ @Resource
+ private RequestHeaderPager requestHeaderPager;
+ @Resource
+ private SystemHelper systemHelper;
+
+ // ===================================================================================
+ // Hook
+ // ======
+ @Override
+ protected void setupHtmlData(ActionRuntime runtime) {
+ super.setupHtmlData(runtime);
+ runtime.registerData("helpLink", systemHelper.getHelpLink("requestHeader"));
+ }
+
+ // ===================================================================================
+ // Search Execute
+ // ==============
+ @Execute
+ public HtmlResponse index(RequestHeaderSearchForm form) {
+ return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+ searchPaging(data, form);
+ });
+ }
+
+ @Execute
+ public HtmlResponse list(Integer pageNumber, RequestHeaderSearchForm form) {
+ requestHeaderPager.setCurrentPageNumber(pageNumber);
+ return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+ searchPaging(data, form);
+ });
+ }
+
+ @Execute
+ public HtmlResponse search(RequestHeaderSearchForm form) {
+ copyBeanToBean(form.searchParams, requestHeaderPager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
+ return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+ searchPaging(data, form);
+ });
+ }
+
+ @Execute
+ public HtmlResponse reset(RequestHeaderSearchForm form) {
+ requestHeaderPager.clear();
+ return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+ searchPaging(data, form);
+ });
+ }
+
+ @Execute
+ public HtmlResponse back(RequestHeaderSearchForm form) {
+ return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
+ searchPaging(data, form);
+ });
+ }
+
+ protected void searchPaging(RenderData data, RequestHeaderSearchForm form) {
+ data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(requestHeaderPager)); // page navi
+
+ // restore from pager
+ copyBeanToBean(requestHeaderPager, form.searchParams, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
+ }
+
+ // ===================================================================================
+ // Edit Execute
+ // ============
+ // -----------------------------------------------------
+ // Entry Page
+ // ----------
+ @Token(save = true, validate = false)
+ @Execute
+ public HtmlResponse createpage(RequestHeaderEditForm form) {
+ form.crudMode = CommonConstants.CREATE_MODE;
+ return asHtml(path_AdminRequestheader_EditJsp);
+ }
+
+ @Token(save = true, validate = false)
+ @Execute
+ public HtmlResponse editpage(int crudMode, String id, RequestHeaderEditForm form) {
+ form.crudMode = crudMode;
+ form.id = id;
+ verifyCrudMode(form, CommonConstants.EDIT_MODE);
+ loadRequestHeader(form);
+ return asHtml(path_AdminRequestheader_EditJsp);
+ }
+
+ @Token(save = true, validate = false)
+ @Execute
+ public HtmlResponse editagain(RequestHeaderEditForm form) {
+ return asHtml(path_AdminRequestheader_EditJsp);
+ }
+
+ @Token(save = true, validate = false)
+ @Execute
+ public HtmlResponse editfromconfirm(RequestHeaderEditForm form) {
+ form.crudMode = CommonConstants.EDIT_MODE;
+ loadRequestHeader(form);
+ return asHtml(path_AdminRequestheader_EditJsp);
+ }
+
+ @Token(save = true, validate = false)
+ @Execute
+ public HtmlResponse deletepage(int crudMode, String id, RequestHeaderEditForm form) {
+ form.crudMode = crudMode;
+ form.id = id;
+ verifyCrudMode(form, CommonConstants.DELETE_MODE);
+ loadRequestHeader(form);
+ return asHtml(path_AdminRequestheader_ConfirmJsp);
+ }
+
+ @Token(save = true, validate = false)
+ @Execute
+ public HtmlResponse deletefromconfirm(RequestHeaderEditForm form) {
+ form.crudMode = CommonConstants.DELETE_MODE;
+ loadRequestHeader(form);
+ return asHtml(path_AdminRequestheader_ConfirmJsp);
+ }
+
+ // -----------------------------------------------------
+ // Confirm
+ // -------
+ @Execute
+ public HtmlResponse confirmpage(int crudMode, String id, RequestHeaderEditForm form) {
+ form.crudMode = crudMode;
+ form.id = id;
+ verifyCrudMode(form, CommonConstants.CONFIRM_MODE);
+ loadRequestHeader(form);
+ return asHtml(path_AdminRequestheader_ConfirmJsp);
+ }
+
+ @Token(save = false, validate = true, keep = true)
+ @Execute
+ public HtmlResponse confirmfromcreate(RequestHeaderEditForm form) {
+ validate(form, messages -> {}, toEditHtml());
+ return asHtml(path_AdminRequestheader_ConfirmJsp);
+ }
+
+ @Token(save = false, validate = true, keep = true)
+ @Execute
+ public HtmlResponse confirmfromupdate(RequestHeaderEditForm form) {
+ validate(form, messages -> {}, toEditHtml());
+ return asHtml(path_AdminRequestheader_ConfirmJsp);
+ }
+
+ // -----------------------------------------------------
+ // Actually Crud
+ // -------------
+ @Token(save = false, validate = true)
+ @Execute
+ public HtmlResponse create(RequestHeaderEditForm form) {
+ validate(form, messages -> {}, toEditHtml());
+ requestHeaderService.store(createRequestHeader(form));
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ return redirect(getClass());
+ }
+
+ @Token(save = false, validate = true)
+ @Execute
+ public HtmlResponse update(RequestHeaderEditForm form) {
+ validate(form, messages -> {}, toEditHtml());
+ requestHeaderService.store(createRequestHeader(form));
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ return redirect(getClass());
+ }
+
+ @Execute
+ public HtmlResponse delete(RequestHeaderEditForm form) {
+ verifyCrudMode(form, CommonConstants.DELETE_MODE);
+ requestHeaderService.delete(getRequestHeader(form));
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ return redirect(getClass());
+ }
+
+ // ===================================================================================
+ // Assist Logic
+ // ============
+ protected void loadRequestHeader(RequestHeaderEditForm form) {
+ copyBeanToBean(getRequestHeader(form), form, op -> op.exclude("crudMode"));
+ }
+
+ protected RequestHeader getRequestHeader(RequestHeaderEditForm form) {
+ final RequestHeader requestHeader = requestHeaderService.getRequestHeader(createKeyMap(form));
+ if (requestHeader == null) {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml());
+ }
+ return requestHeader;
+ }
+
+ protected RequestHeader createRequestHeader(RequestHeaderEditForm form) {
+ RequestHeader requestHeader;
+ final String username = systemHelper.getUsername();
+ final long currentTime = systemHelper.getCurrentTimeAsLong();
+ if (form.crudMode == CommonConstants.EDIT_MODE) {
+ requestHeader = getRequestHeader(form);
+ } else {
+ requestHeader = new RequestHeader();
+ requestHeader.setCreatedBy(username);
+ requestHeader.setCreatedTime(currentTime);
+ }
+ requestHeader.setUpdatedBy(username);
+ requestHeader.setUpdatedTime(currentTime);
+ copyBeanToBean(form, requestHeader, op -> op.exclude(CommonConstants.COMMON_CONVERSION_RULE));
+ return requestHeader;
+ }
+
+ protected Map createKeyMap(RequestHeaderEditForm form) {
+ final Map keys = new HashMap();
+ keys.put("id", form.id);
+ return keys;
+ }
+
+ // ===================================================================================
+ // Small Helper
+ // ============
+ protected void verifyCrudMode(RequestHeaderEditForm form, int expectedMode) {
+ if (form.crudMode != expectedMode) {
+ throwValidationError(messages -> {
+ messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode));
+ }, toEditHtml());
+ }
+ }
+
+ protected VaErrorHook toEditHtml() {
+ return () -> {
+ return asHtml(path_AdminRequestheader_EditJsp);
+ };
+ }
+}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/RequestHeaderForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderEditForm.java
similarity index 86%
rename from src/main/java/org/codelibs/fess/app/web/admin/RequestHeaderForm.java
rename to src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderEditForm.java
index 02fd45762..30813e7c3 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/RequestHeaderForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderEditForm.java
@@ -14,30 +14,23 @@
* governing permissions and limitations under the License.
*/
-package org.codelibs.fess.app.web.admin;
+package org.codelibs.fess.app.web.admin.requestheader;
import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
import org.codelibs.fess.util.ComponentUtil;
-public class RequestHeaderForm implements Serializable {
+/**
+ * @author codelibs
+ * @author jflute
+ */
+public class RequestHeaderEditForm implements Serializable {
private static final long serialVersionUID = 1L;
- //@IntegerType
- public String pageNumber;
-
- public Map searchParams = new HashMap();
-
//@IntegerType
public int crudMode;
- public String getCurrentPageNumber() {
- return pageNumber;
- }
-
//@Required(target = "confirmfromupdate,update,delete")
//@Maxbytelength(maxbytelength = 1000)
public String id;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderSearchForm.java
new file mode 100644
index 000000000..4fcc2e52c
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderSearchForm.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2009-2015 the CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+package org.codelibs.fess.app.web.admin.requestheader;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author codelibs
+ * @author jflute
+ */
+public class RequestHeaderSearchForm implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public Map searchParams = new HashMap();
+}
diff --git a/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp b/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp
index 884f5c274..7b24e53ff 100644
--- a/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp
@@ -118,12 +118,12 @@
- class="active">class="active">
-
+
class="active">