Merge pull request #316 from tonkatu05/lastaflute-webauthentication

Lastaflute webauthentication

pom.xml

@@ -105,7 +105,6 @@
 						<exclude>org/codelibs/fess/app/web/admin/DictForm.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/SystemForm.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/SearchListAction.java</exclude>
-						<exclude>org/codelibs/fess/app/web/admin/WebAuthenticationForm.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/SuggestElevateWordForm.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/CrawlAction.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/DocumentForm.java</exclude>
@@ -118,7 +117,6 @@
 						<exclude>org/codelibs/fess/app/web/admin/SuggestElevateWordAction.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/LogForm.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/SystemInfoAction.java</exclude>
-						<exclude>org/codelibs/fess/app/web/admin/WebAuthenticationAction.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/DataAction.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/CrawlingSessionAction.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/SuggestBadWordForm.java</exclude>

src/main/java/org/codelibs/fess/app/service/WebConfigService.java

@@ -278,4 +278,11 @@ public class WebConfigService implements Serializable {
             cb.query().docMeta().setId_Equal(id);
         }).orElse(null);//TODO
     }
+
+    public List<WebConfig> getWebConfigList() {
+        return webConfigBhv.selectList(cb -> {
+            //            cb.query().addOrderBy_SortOrder_Asc();
+            //            cb.query().addOrderBy_Name_Asc();
+            });
+    }
 }

src/main/java/org/codelibs/fess/app/web/admin/WebAuthenticationAction.java

@@ -1,373 +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.apache.lucene.queryparser.flexible.standard.CommonQueryParserConfiguration;
-import org.codelibs.core.beans.util.BeanUtil;
-import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.Constants;
-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.WebAuthentication;
-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.WebAuthenticationPager;
-import org.codelibs.fess.app.service.WebAuthenticationService;
-import org.codelibs.fess.app.service.WebConfigService;
-import org.lastaflute.web.util.LaRequestUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WebAuthenticationAction extends FessAdminAction {
-
-    private static final Logger logger = LoggerFactory.getLogger(WebAuthenticationAction.class);
-
-    // for list
-
-    public List<WebAuthentication> webAuthenticationItems;
-
-    // for edit/confirm/delete
-
-    //@ActionForm
-    @Resource
-    protected WebAuthenticationForm webAuthenticationForm;
-
-    @Resource
-    protected WebAuthenticationService webAuthenticationService;
-
-    @Resource
-    protected WebAuthenticationPager webAuthenticationPager;
-
-    @Resource
-    protected WebConfigService webConfigService;
-
-    @Resource
-    protected SystemHelper systemHelper;
-
-    protected String displayList(final boolean redirect) {
-        // page navi
-        webAuthenticationItems = webAuthenticationService.getWebAuthenticationList(webAuthenticationPager);
-
-        // restore from pager
-        BeanUtil.copyBeanToBean(webAuthenticationPager, webAuthenticationForm.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(webAuthenticationForm.pageNumber)) {
-            try {
-                webAuthenticationPager.setCurrentPageNumber(Integer.parseInt(webAuthenticationForm.pageNumber));
-            } catch (final NumberFormatException e) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Invalid value: " + webAuthenticationForm.pageNumber, e);
-                }
-            }
-        }
-
-        return displayList(false);
-    }
-
-    //@Execute(validator = false, input = "error.jsp")
-    public String search() {
-        BeanUtil.copyBeanToBean(webAuthenticationForm.searchParams, webAuthenticationPager,
-                option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE));
-
-        return displayList(false);
-    }
-
-    //@Execute(validator = false, input = "error.jsp")
-    public String reset() {
-        webAuthenticationPager.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 (webAuthenticationForm.crudMode != CommonConstants.CONFIRM_MODE) {
-            throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.CONFIRM_MODE,
-                    webAuthenticationForm.crudMode });
-        }
-
-        loadWebAuthentication();
-
-        return "confirm.jsp";
-    }
-
-    @Token(save = true, validate = false)
-    //@Execute(validator = false, input = "error.jsp")
-    public String createpage() {
-        // page navi
-        webAuthenticationForm.initialize();
-        webAuthenticationForm.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 (webAuthenticationForm.crudMode != CommonConstants.EDIT_MODE) {
-            throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.EDIT_MODE,
-                    webAuthenticationForm.crudMode });
-        }
-
-        loadWebAuthentication();
-
-        return "edit.jsp";
-    }
-
-    @Token(save = true, validate = false)
-    //@Execute(validator = false, input = "error.jsp")
-    public String editfromconfirm() {
-        webAuthenticationForm.crudMode = CommonConstants.EDIT_MODE;
-
-        loadWebAuthentication();
-
-        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 (webAuthenticationForm.crudMode != CommonConstants.DELETE_MODE) {
-            throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE,
-                    webAuthenticationForm.crudMode });
-        }
-
-        loadWebAuthentication();
-
-        return "confirm.jsp";
-    }
-
-    @Token(save = true, validate = false)
-    //@Execute(validator = false, input = "error.jsp")
-    public String deletefromconfirm() {
-        webAuthenticationForm.crudMode = CommonConstants.DELETE_MODE;
-
-        loadWebAuthentication();
-
-        return "confirm.jsp";
-    }
-
-    @Token(save = false, validate = true)
-    //@Execute(validator = true, input = "edit.jsp")
-    public String create() {
-        try {
-            final WebAuthentication webAuthentication = createWebAuthentication();
-            webAuthenticationService.store(webAuthentication);
-            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 WebAuthentication webAuthentication = createWebAuthentication();
-            webAuthenticationService.store(webAuthentication);
-            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<String, String> createKeyMap() {
-        final Map<String, String> keys = new HashMap<String, String>();
-
-        keys.put("id", webAuthenticationForm.id);
-
-        return keys;
-    }
-
-    public String getHelpLink() {
-        return systemHelper.getHelpLink("webAuthentication");
-    }
-
-    protected void loadWebAuthentication() {
-
-        final WebAuthentication webAuthentication = webAuthenticationService.getWebAuthentication(createKeyMap());
-        if (webAuthentication == null) {
-            // throw an exception
-            throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { webAuthenticationForm.id });
-        }
-
-        BeanUtil.copyBeanToBean(webAuthentication, webAuthenticationForm, option -> option.excludes("searchParams", "mode"));
-        if ("-1".equals(webAuthenticationForm.port)) {
-            webAuthenticationForm.port = StringUtil.EMPTY;
-        }
-    }
-
-    protected WebAuthentication createWebAuthentication() {
-        WebAuthentication webAuthentication;
-        final String username = systemHelper.getUsername();
-        final long currentTime = systemHelper.getCurrentTimeAsLong();
-        if (webAuthenticationForm.crudMode == CommonConstants.EDIT_MODE) {
-            webAuthentication = webAuthenticationService.getWebAuthentication(createKeyMap());
-            if (webAuthentication == null) {
-                // throw an exception
-                throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { webAuthenticationForm.id });
-            }
-        } else {
-            webAuthentication = new WebAuthentication();
-            webAuthentication.setCreatedBy(username);
-            webAuthentication.setCreatedTime(currentTime);
-        }
-        webAuthentication.setUpdatedBy(username);
-        webAuthentication.setUpdatedTime(currentTime);
-        if (StringUtil.isBlank(webAuthenticationForm.port)) {
-            webAuthenticationForm.port = "-1";
-        }
-        BeanUtil.copyBeanToBean(webAuthenticationForm, webAuthentication, option -> option.exclude(CommonConstants.COMMON_CONVERSION_RULE));
-
-        return webAuthentication;
-    }
-
-    @Token(save = false, validate = true)
-    //@Execute(validator = false, input = "error.jsp")
-    public String delete() {
-        if (webAuthenticationForm.crudMode != CommonConstants.DELETE_MODE) {
-            throw new SSCActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE,
-                    webAuthenticationForm.crudMode });
-        }
-
-        try {
-            final WebAuthentication webAuthentication = webAuthenticationService.getWebAuthentication(createKeyMap());
-            if (webAuthentication == null) {
-                // throw an exception
-                throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { webAuthenticationForm.id });
-            }
-
-            webAuthenticationService.delete(webAuthentication);
-            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 boolean isDisplayCreateLink() {
-        return !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty();
-    }
-
-    public List<Map<String, String>> getWebConfigItems() {
-        final List<Map<String, String>> items = new ArrayList<Map<String, String>>();
-        final List<WebConfig> webConfigList = webConfigService.getAllWebConfigList(false, false, false, null);
-        for (final WebConfig webConfig : webConfigList) {
-            items.add(createItem(webConfig.getName(), webConfig.getId().toString()));
-        }
-        return items;
-    }
-
-    public List<Map<String, String>> getProtocolSchemeItems() {
-        final List<Map<String, String>> items = new ArrayList<Map<String, String>>();
-        items.add(createItem(
-                MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "labels.web_authentication_scheme_basic"),
-                Constants.BASIC));
-        items.add(createItem(
-                MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "labels.web_authentication_scheme_digest"),
-                Constants.DIGEST));
-        items.add(createItem(
-                MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "labels.web_authentication_scheme_ntlm"),
-                Constants.NTLM));
-        return items;
-    }
-
-    protected Map<String, String> createItem(final String label, final String value) {
-        final Map<String, String> map = new HashMap<String, String>(2);
-        map.put("label", label);
-        map.put("value", value);
-        return map;
-    }
-}

src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java

@@ -0,0 +1,286 @@
+/*
+ * 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.webauthentication;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.codelibs.fess.annotation.Token;
+import org.codelibs.fess.app.pager.WebAuthenticationPager;
+import org.codelibs.fess.app.service.WebAuthenticationService;
+import org.codelibs.fess.app.service.WebConfigService;
+import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.crud.CommonConstants;
+import org.codelibs.fess.es.exentity.WebAuthentication;
+import org.codelibs.fess.es.exentity.WebConfig;
+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.util.LaRequestUtil;
+import org.lastaflute.web.validation.VaErrorHook;
+
+/**
+ * @author shinsuke
+ */
+public class AdminWebauthenticationAction extends FessAdminAction {
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    @Resource
+    private WebAuthenticationService webAuthenticationService;
+    @Resource
+    private WebAuthenticationPager webAuthenticationPager;
+    @Resource
+    private SystemHelper systemHelper;
+
+    @Resource
+    protected WebConfigService webConfigService;
+
+    // ===================================================================================
+    //                                                                               Hook
+    //                                                                              ======
+    @Override
+    protected void setupHtmlData(final ActionRuntime runtime) {
+        super.setupHtmlData(runtime);
+        runtime.registerData("helpLink", systemHelper.getHelpLink("webAuthentication"));
+    }
+
+    // ===================================================================================
+    //                                                                      Search Execute
+    //                                                                      ==============
+    @Execute
+    public HtmlResponse index(final WebAuthenticationSearchForm form) {
+        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+            searchPaging(data, form);
+        });
+    }
+
+    @Execute
+    public HtmlResponse list(final Integer pageNumber, final WebAuthenticationSearchForm form) {
+        webAuthenticationPager.setCurrentPageNumber(pageNumber);
+        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+            searchPaging(data, form);
+        });
+    }
+
+    @Execute
+    public HtmlResponse search(final WebAuthenticationSearchForm form) {
+        copyBeanToBean(form.searchParams, webAuthenticationPager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
+        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+            searchPaging(data, form);
+        });
+    }
+
+    @Execute
+    public HtmlResponse reset(final WebAuthenticationSearchForm form) {
+        webAuthenticationPager.clear();
+        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+            searchPaging(data, form);
+        });
+    }
+
+    @Execute
+    public HtmlResponse back(final WebAuthenticationSearchForm form) {
+        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
+            searchPaging(data, form);
+        });
+    }
+
+    protected void searchPaging(final RenderData data, final WebAuthenticationSearchForm form) {
+        data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthenticationPager)); // page navi
+        data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
+        // restore from pager
+        copyBeanToBean(webAuthenticationPager, form.searchParams, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
+    }
+
+    // ===================================================================================
+    //                                                                        Edit Execute
+    //                                                                        ============
+    // -----------------------------------------------------
+    //                                            Entry Page
+    //                                            ----------
+    @Token(save = true, validate = false)
+    @Execute
+    public HtmlResponse createpage(final WebAuthenticationEditForm form) {
+        form.initialize();
+        form.crudMode = CommonConstants.CREATE_MODE;
+        return asHtml(path_AdminWebauthentication_EditJsp).renderWith(data -> {
+            // data.register("webConfigItems", webConfigService.getAllWebConfigList());
+        });
+    }
+
+    @Token(save = true, validate = false)
+    @Execute
+    public HtmlResponse editpage(final int crudMode, final String id, final WebAuthenticationEditForm form) {
+        form.crudMode = crudMode;
+        form.id = id;
+        verifyCrudMode(form, CommonConstants.EDIT_MODE);
+        loadWebAuthentication(form);
+        return asHtml(path_AdminWebauthentication_EditJsp).renderWith(data -> {
+            // data.register("webConfigItems", webConfigService.getAllWebConfigList());
+        });
+    }
+
+    @Token(save = true, validate = false)
+    @Execute
+    public HtmlResponse editagain(final WebAuthenticationEditForm form) {
+        return asHtml(path_AdminWebauthentication_EditJsp);
+    }
+
+    @Token(save = true, validate = false)
+    @Execute
+    public HtmlResponse editfromconfirm(final WebAuthenticationEditForm form) {
+        form.crudMode = CommonConstants.EDIT_MODE;
+        loadWebAuthentication(form);
+        return asHtml(path_AdminWebauthentication_EditJsp);
+    }
+
+    @Token(save = true, validate = false)
+    @Execute
+    public HtmlResponse deletepage(final int crudMode, final String id, final WebAuthenticationEditForm form) {
+        form.crudMode = crudMode;
+        form.id = id;
+        verifyCrudMode(form, CommonConstants.DELETE_MODE);
+        loadWebAuthentication(form);
+        return asHtml(path_AdminWebauthentication_ConfirmJsp);
+    }
+
+    @Token(save = true, validate = false)
+    @Execute
+    public HtmlResponse deletefromconfirm(final WebAuthenticationEditForm form) {
+        form.crudMode = CommonConstants.DELETE_MODE;
+        loadWebAuthentication(form);
+        return asHtml(path_AdminWebauthentication_ConfirmJsp);
+    }
+
+    // -----------------------------------------------------
+    //                                               Confirm
+    //                                               -------
+    @Execute
+    public HtmlResponse confirmpage(final int crudMode, final String id, final WebAuthenticationEditForm form) {
+        form.crudMode = crudMode;
+        form.id = id;
+        verifyCrudMode(form, CommonConstants.CONFIRM_MODE);
+        loadWebAuthentication(form);
+        return asHtml(path_AdminWebauthentication_ConfirmJsp);
+    }
+
+    @Token(save = false, validate = true, keep = true)
+    @Execute
+    public HtmlResponse confirmfromcreate(final WebAuthenticationEditForm form) {
+        validate(form, messages -> {}, toEditHtml());
+        return asHtml(path_AdminWebauthentication_ConfirmJsp);
+    }
+
+    @Token(save = false, validate = true, keep = true)
+    @Execute
+    public HtmlResponse confirmfromupdate(final WebAuthenticationEditForm form) {
+        validate(form, messages -> {}, toEditHtml());
+        return asHtml(path_AdminWebauthentication_ConfirmJsp);
+    }
+
+    // -----------------------------------------------------
+    //                                         Actually Crud
+    //                                         -------------
+    @Token(save = false, validate = true)
+    @Execute
+    public HtmlResponse create(final WebAuthenticationEditForm form) {
+        validate(form, messages -> {}, toEditHtml());
+        webAuthenticationService.store(createWebAuthentication(form));
+        saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+        return redirect(getClass());
+    }
+
+    @Token(save = false, validate = true)
+    @Execute
+    public HtmlResponse update(final WebAuthenticationEditForm form) {
+        validate(form, messages -> {}, toEditHtml());
+        webAuthenticationService.store(createWebAuthentication(form));
+        saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+        return redirect(getClass());
+    }
+
+    @Execute
+    public HtmlResponse delete(final WebAuthenticationEditForm form) {
+        verifyCrudMode(form, CommonConstants.DELETE_MODE);
+        webAuthenticationService.delete(getWebAuthentication(form));
+        saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+        return redirect(getClass());
+    }
+
+    //===================================================================================
+    //                                                                        Assist Logic
+    //                                                                        ============
+    protected void loadWebAuthentication(final WebAuthenticationEditForm form) {
+        copyBeanToBean(getWebAuthentication(form), form, op -> op.exclude("crudMode"));
+    }
+
+    protected WebAuthentication getWebAuthentication(final WebAuthenticationEditForm form) {
+        final WebAuthentication webAuthentication = webAuthenticationService.getWebAuthentication(createKeyMap(form));
+        if (webAuthentication == null) {
+            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml());
+        }
+        return webAuthentication;
+    }
+
+    protected WebAuthentication createWebAuthentication(final WebAuthenticationEditForm form) {
+        WebAuthentication webAuthentication;
+        final String username = systemHelper.getUsername();
+        final long currentTime = systemHelper.getCurrentTimeAsLong();
+        if (form.crudMode == CommonConstants.EDIT_MODE) {
+            webAuthentication = getWebAuthentication(form);
+        } else {
+            webAuthentication = new WebAuthentication();
+            webAuthentication.setCreatedBy(username);
+            webAuthentication.setCreatedTime(currentTime);
+        }
+        webAuthentication.setUpdatedBy(username);
+        webAuthentication.setUpdatedTime(currentTime);
+        copyBeanToBean(form, webAuthentication, op -> op.exclude(CommonConstants.COMMON_CONVERSION_RULE));
+        return webAuthentication;
+    }
+
+    protected Map<String, String> createKeyMap(final WebAuthenticationEditForm form) {
+        final Map<String, String> keys = new HashMap<String, String>();
+        keys.put("id", form.id);
+        return keys;
+    }
+
+    // ===================================================================================
+    //                                                                        Small Helper
+    //                                                                        ============
+    protected void verifyCrudMode(final WebAuthenticationEditForm form, final 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_AdminWebauthentication_EditJsp);
+        };
+    }
+}

src/main/java/org/codelibs/fess/app/web/admin/WebAuthenticationForm.java → src/main/java/org/codelibs/fess/app/web/admin/webauthentication/WebAuthenticationEditForm.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.webauthentication;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.codelibs.fess.util.ComponentUtil;
 
-public class WebAuthenticationForm implements Serializable {
+/**
+ * @author codelibs
+ * @author jflute
+ */
+public class WebAuthenticationEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
     //@IntegerType
     public int crudMode;
 
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
     //@Required(target = "confirmfromupdate,update,delete")
     //@Maxbytelength(maxbytelength = 1000)
     public String id;

src/main/java/org/codelibs/fess/app/web/admin/webauthentication/WebAuthenticationSearchForm.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.webauthentication;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author codelibs
+ * @author jflute
+ */
+public class WebAuthenticationSearchForm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+}

src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp

@@ -32,7 +32,7 @@
 				<div class="row">
 					<div class="col-md-12">
 						<c:if test="${!displayCreateLink}">
-							<la:link href="../webConfig/index" styleClass="btn btn-primary">
+							<la:link href="../webconfig/index" styleClass="btn btn-primary">
 								<la:message key="labels.web_authentication_create_web_config" />
 							</la:link>
 						</c:if>

src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp

@@ -104,12 +104,12 @@
 							<span><la:message key="labels.menu.path_mapping" /></span>
 						</la:link></li>
 
-					<li <c:if test="${param.menuType=='webAuthentication'}">class="active"</c:if>><todo:link
-							href="/admin/webAuthentication/index"
+					<li <c:if test="${param.menuType=='webAuthentication'}">class="active"</c:if>><la:link
+							href="/admin/webauthentication/index"
 						>
 							<i class='fa fa-angle-right'></i>
 							<span><la:message key="labels.menu.web_authentication" /></span>
-						</todo:link></li>
+						</la:link></li>
 
 					<li <c:if test="${param.menuType=='fileAuthentication'}">class="active"</c:if>><todo:link
 							href="/admin/fileAuthentication/index"