diff --git a/pom.xml b/pom.xml index 5d6afa593..4b36e8e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,6 @@ UTF-8 - org/codelibs/fess/app/web/admin/ScheduledJobAction.java org/codelibs/fess/app/web/admin/JobLogAction.java org/codelibs/fess/app/web/admin/WizardAction.java org/codelibs/fess/app/web/admin/SearchListForm.java @@ -106,7 +105,6 @@ org/codelibs/fess/app/web/admin/RoleTypeAction.java org/codelibs/fess/app/web/admin/JobLogForm.java org/codelibs/fess/app/web/admin/DataConfigForm.java - org/codelibs/fess/app/web/admin/ScheduledJobForm.java org/codelibs/fess/app/web/admin/SystemAction.java org/codelibs/fess/app/web/admin/DataConfigAction.java org/codelibs/fess/app/web/admin/DictForm.java diff --git a/src/main/java/org/codelibs/fess/app/web/admin/ScheduledJobAction.java b/src/main/java/org/codelibs/fess/app/web/admin/ScheduledJobAction.java deleted file mode 100644 index 19a039bb7..000000000 --- a/src/main/java/org/codelibs/fess/app/web/admin/ScheduledJobAction.java +++ /dev/null @@ -1,375 +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.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.codelibs.core.beans.util.BeanUtil; -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.RoleType; -import org.codelibs.fess.es.exentity.ScheduledJob; -import org.codelibs.fess.exception.SSCActionMessagesException; -import org.codelibs.fess.helper.JobHelper; -import org.codelibs.fess.helper.SystemHelper; -import org.codelibs.fess.job.JobExecutor; -import org.codelibs.fess.app.pager.ScheduledJobPager; -import org.codelibs.fess.app.service.RoleTypeService; -import org.codelibs.fess.app.service.ScheduledJobService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ScheduledJobAction extends FessAdminAction { - - private static final Logger logger = LoggerFactory.getLogger(ScheduledJobAction.class); - - @Resource - protected RoleTypeService roleTypeService; - - @Resource - protected SystemHelper systemHelper; - - @Resource - protected JobHelper jobHelper; - - // for list - - public List scheduledJobItems; - - // for edit/confirm/delete - - //@ActionForm - @Resource - protected ScheduledJobForm scheduledJobForm; - - @Resource - protected ScheduledJobService scheduledJobService; - - @Resource - protected ScheduledJobPager scheduledJobPager; - - public boolean running = false; - - public String getHelpLink() { - return systemHelper.getHelpLink("scheduledJob"); - } - - protected void loadScheduledJob() { - - final ScheduledJob scheduledJob = getScheduledJob(); - - BeanUtil.copyBeanToBean(scheduledJob, scheduledJobForm, option -> option.exclude("searchParams", "mode", "jobLogging")); - scheduledJobForm.jobLogging = scheduledJob.isLoggingEnabled() ? Constants.ON : null; - scheduledJobForm.crawler = scheduledJob.isCrawlerJob() ? Constants.ON : null; - scheduledJobForm.available = scheduledJob.isEnabled() ? Constants.ON : null; - running = scheduledJob.isRunning(); - } - - protected ScheduledJob createScheduledJob() { - ScheduledJob scheduledJob; - final String username = systemHelper.getUsername(); - final long currentTime = systemHelper.getCurrentTimeAsLong(); - if (scheduledJobForm.crudMode == CommonConstants.EDIT_MODE) { - scheduledJob = scheduledJobService.getScheduledJob(createKeyMap()); - if (scheduledJob == null) { - // throw an exception - throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { scheduledJobForm.id }); - } - } else { - scheduledJob = new ScheduledJob(); - scheduledJob.setCreatedBy(username); - scheduledJob.setCreatedTime(currentTime); - } - scheduledJob.setUpdatedBy(username); - scheduledJob.setUpdatedTime(currentTime); - BeanUtil.copyBeanToBean(scheduledJobForm, scheduledJob, option -> option.exclude(CommonConstants.COMMON_CONVERSION_RULE)); - scheduledJob.setJobLogging(Constants.ON.equals(scheduledJobForm.jobLogging) ? Constants.T : Constants.F); - scheduledJob.setCrawler(Constants.ON.equals(scheduledJobForm.crawler) ? Constants.T : Constants.F); - scheduledJob.setAvailable(Constants.ON.equals(scheduledJobForm.available) ? Constants.T : Constants.F); - - return scheduledJob; - } - - //@Execute(validator = false, input = "error.jsp") - public String delete() { - if (scheduledJobForm.crudMode != CommonConstants.DELETE_MODE) { - throw new SSCActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE, - scheduledJobForm.crudMode }); - } - - try { - final ScheduledJob scheduledJob = getScheduledJob(); - - scheduledJobService.delete(scheduledJob); - 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"); - } - } - - //@Execute(validator = false, input = "error.jsp") - public String start() { - final ScheduledJob scheduledJob = getScheduledJob(); - try { - scheduledJob.start(); - SAStrutsUtil.addSessionMessage("success.job_started", scheduledJob.getName()); - return displayList(true); - } catch (final Exception e) { - logger.error(e.getMessage(), e); - throw new SSCActionMessagesException(e, "errors.failed_to_start_job", scheduledJob.getName()); - } - - } - - //@Execute(validator = false, input = "error.jsp") - public String stop() { - final ScheduledJob scheduledJob = getScheduledJob(); - try { - final JobExecutor jobExecutoer = jobHelper.getJobExecutoer(scheduledJob.getId()); - jobExecutoer.shutdown(); - SAStrutsUtil.addSessionMessage("success.job_stopped", scheduledJob.getName()); - return displayList(true); - } catch (final Exception e) { - logger.error(e.getMessage(), e); - throw new SSCActionMessagesException(e, "errors.failed_to_stop_job", scheduledJob.getName()); - } - } - - public List getRoleTypeItems() { - return roleTypeService.getRoleTypeList(); - } - - protected ScheduledJob getScheduledJob() { - final ScheduledJob scheduledJob = scheduledJobService.getScheduledJob(createKeyMap()); - if (scheduledJob == null) { - // throw an exception - throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { scheduledJobForm.id }); - } - return scheduledJob; - } - - protected String displayList(final boolean redirect) { - // page navi - scheduledJobItems = scheduledJobService.getScheduledJobList(scheduledJobPager); - - // restore from pager - BeanUtil.copyBeanToBean(scheduledJobPager, scheduledJobForm.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(scheduledJobForm.pageNumber)) { - try { - scheduledJobPager.setCurrentPageNumber(Integer.parseInt(scheduledJobForm.pageNumber)); - } catch (final NumberFormatException e) { - if (logger.isDebugEnabled()) { - logger.debug("Invalid value: " + scheduledJobForm.pageNumber, e); - } - } - } - - return displayList(false); - } - - //@Execute(validator = false, input = "error.jsp") - public String search() { - BeanUtil.copyBeanToBean(scheduledJobForm.searchParams, scheduledJobPager, - option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE)); - - return displayList(false); - } - - //@Execute(validator = false, input = "error.jsp") - public String reset() { - scheduledJobPager.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 (scheduledJobForm.crudMode != CommonConstants.CONFIRM_MODE) { - throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.CONFIRM_MODE, - scheduledJobForm.crudMode }); - } - - loadScheduledJob(); - - return "confirm.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp") - public String createpage() { - // page navi - scheduledJobForm.initialize(); - scheduledJobForm.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 (scheduledJobForm.crudMode != CommonConstants.EDIT_MODE) { - throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.EDIT_MODE, - scheduledJobForm.crudMode }); - } - - loadScheduledJob(); - - return "edit.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp") - public String editfromconfirm() { - scheduledJobForm.crudMode = CommonConstants.EDIT_MODE; - - loadScheduledJob(); - - 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 (scheduledJobForm.crudMode != CommonConstants.DELETE_MODE) { - throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE, - scheduledJobForm.crudMode }); - } - - loadScheduledJob(); - - return "confirm.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp") - public String deletefromconfirm() { - scheduledJobForm.crudMode = CommonConstants.DELETE_MODE; - - loadScheduledJob(); - - return "confirm.jsp"; - } - - @Token(save = false, validate = true) - //@Execute(validator = true, input = "edit.jsp") - public String create() { - try { - final ScheduledJob scheduledJob = createScheduledJob(); - scheduledJobService.store(scheduledJob); - 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 ScheduledJob scheduledJob = createScheduledJob(); - scheduledJobService.store(scheduledJob); - 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", scheduledJobForm.id); - - return keys; - } -} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java new file mode 100644 index 000000000..c76d03528 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java @@ -0,0 +1,293 @@ +/* + * 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.scheduledjob; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Resource; + +import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.Token; +import org.codelibs.fess.app.pager.ScheduledJobPager; +import org.codelibs.fess.app.service.RoleTypeService; +import org.codelibs.fess.app.service.ScheduledJobService; +import org.codelibs.fess.app.web.base.FessAdminAction; +import org.codelibs.fess.crud.CommonConstants; +import org.codelibs.fess.es.exentity.ScheduledJob; +import org.codelibs.fess.helper.JobHelper; +import org.codelibs.fess.helper.SystemHelper; +import org.codelibs.fess.util.ComponentUtil; +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 AdminScheduledjobAction extends FessAdminAction { + + // =================================================================================== + // Attribute + // ========= + @Resource + private ScheduledJobService scheduledJobService; + + @Resource + private ScheduledJobPager scheduledJobPager; + + @Resource + protected RoleTypeService roleTypeService; + + @Resource + protected SystemHelper systemHelper; + + @Resource + protected JobHelper jobHelper; + + // =================================================================================== + // Hook + // ====== + @Override + protected void setupHtmlData(ActionRuntime runtime) { + super.setupHtmlData(runtime); + runtime.registerData("helpLink", systemHelper.getHelpLink("scheduledJob")); + } + + // =================================================================================== + // Search Execute + // ============== + @Execute + public HtmlResponse index(ScheduledjobSearchForm form) { + return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse list(Integer pageNumber, ScheduledjobSearchForm form) { + scheduledJobPager.setCurrentPageNumber(pageNumber); + return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse search(ScheduledjobSearchForm form) { + copyBeanToBean(form.searchParams, scheduledJobPager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE)); + return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse reset(ScheduledjobSearchForm form) { + scheduledJobPager.clear(); + return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse back(ScheduledjobSearchForm form) { + return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + protected void searchPaging(RenderData data, ScheduledjobSearchForm form) { + data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(scheduledJobPager)); // page navi + + // restore from pager + copyBeanToBean(scheduledJobPager, form.searchParams, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE)); + } + + // =================================================================================== + // Edit Execute + // ============ + // ----------------------------------------------------- + // Entry Page + // ---------- + @Token(save = true, validate = false) + @Execute + public HtmlResponse createpage(ScheduledjobEditForm form) { + form.initialize(); + form.crudMode = CommonConstants.CREATE_MODE; + return asHtml(path_AdminScheduledjob_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editpage(int crudMode, String id, ScheduledjobEditForm form) { + form.crudMode = crudMode; + form.id = id; + verifyCrudMode(form, CommonConstants.EDIT_MODE); + loadScheduledJob(form); + return asHtml(path_AdminScheduledjob_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editagain(ScheduledjobEditForm form) { + return asHtml(path_AdminScheduledjob_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editfromconfirm(ScheduledjobEditForm form) { + form.crudMode = CommonConstants.EDIT_MODE; + loadScheduledJob(form); + return asHtml(path_AdminScheduledjob_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse deletepage(int crudMode, String id, ScheduledjobEditForm form) { + form.crudMode = crudMode; + form.id = id; + verifyCrudMode(form, CommonConstants.DELETE_MODE); + loadScheduledJob(form); + return asHtml(path_AdminScheduledjob_ConfirmJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse deletefromconfirm(ScheduledjobEditForm form) { + form.crudMode = CommonConstants.DELETE_MODE; + loadScheduledJob(form); + return asHtml(path_AdminScheduledjob_ConfirmJsp); + } + + // ----------------------------------------------------- + // Confirm + // ------- + @Execute + public HtmlResponse confirmpage(int crudMode, String id, ScheduledjobEditForm form) { + form.crudMode = crudMode; + form.id = id; + verifyCrudMode(form, CommonConstants.CONFIRM_MODE); + loadScheduledJob(form); + return asHtml(path_AdminScheduledjob_ConfirmJsp); + } + + @Token(save = false, validate = true, keep = true) + @Execute + public HtmlResponse confirmfromcreate(ScheduledjobEditForm form) { + validate(form, messages -> {}, toEditHtml()); + return asHtml(path_AdminScheduledjob_ConfirmJsp); + } + + @Token(save = false, validate = true, keep = true) + @Execute + public HtmlResponse confirmfromupdate(ScheduledjobEditForm form) { + validate(form, messages -> {}, toEditHtml()); + return asHtml(path_AdminScheduledjob_ConfirmJsp); + } + + // ----------------------------------------------------- + // Actually Crud + // ------------- + @Token(save = false, validate = true) + @Execute + public HtmlResponse create(ScheduledjobEditForm form) { + validate(form, messages -> {}, toEditHtml()); + scheduledJobService.store(createScheduledJob(form)); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + return redirect(getClass()); + } + + @Token(save = false, validate = true) + @Execute + public HtmlResponse update(ScheduledjobEditForm form) { + validate(form, messages -> {}, toEditHtml()); + scheduledJobService.store(createScheduledJob(form)); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + return redirect(getClass()); + } + + @Execute + public HtmlResponse delete(ScheduledjobEditForm form) { + verifyCrudMode(form, CommonConstants.DELETE_MODE); + scheduledJobService.delete(getScheduledJob(form)); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + return redirect(getClass()); + } + + // =================================================================================== + // Assist Logic + // ============ + protected void loadScheduledJob(ScheduledjobEditForm form) { + ScheduledJob scheduledJob = getScheduledJob(form); + copyBeanToBean(scheduledJob, form, op -> op.exclude("crudMode")); + form.jobLogging = scheduledJob.isLoggingEnabled() ? Constants.ON : null; + form.crawler = scheduledJob.isCrawlerJob() ? Constants.ON : null; + form.available = scheduledJob.isEnabled() ? Constants.ON : null; + } + + protected ScheduledJob getScheduledJob(ScheduledjobEditForm form) { + final ScheduledJob scheduledJob = scheduledJobService.getScheduledJob(createKeyMap(form)); + if (scheduledJob == null) { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); + } + return scheduledJob; + } + + protected ScheduledJob createScheduledJob(ScheduledjobEditForm form) { + ScheduledJob scheduledJob; + final String username = systemHelper.getUsername(); + final long currentTime = systemHelper.getCurrentTimeAsLong(); + if (form.crudMode == CommonConstants.EDIT_MODE) { + scheduledJob = getScheduledJob(form); + } else { + scheduledJob = new ScheduledJob(); + scheduledJob.setCreatedBy(username); + scheduledJob.setCreatedTime(currentTime); + } + scheduledJob.setUpdatedBy(username); + scheduledJob.setUpdatedTime(currentTime); + copyBeanToBean(form, scheduledJob, op -> op.exclude(CommonConstants.COMMON_CONVERSION_RULE)); + scheduledJob.setJobLogging(Constants.ON.equals(form.jobLogging) ? Constants.T : Constants.F); + scheduledJob.setCrawler(Constants.ON.equals(form.crawler) ? Constants.T : Constants.F); + scheduledJob.setAvailable(Constants.ON.equals(form.available) ? Constants.T : Constants.F); + return scheduledJob; + } + + protected Map createKeyMap(ScheduledjobEditForm form) { + final Map keys = new HashMap(); + keys.put("id", form.id); + return keys; + } + + // =================================================================================== + // Small Helper + // ============ + protected void verifyCrudMode(ScheduledjobEditForm 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_AdminScheduledjob_EditJsp); + }; + } +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/ScheduledJobForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java similarity index 89% rename from src/main/java/org/codelibs/fess/app/web/admin/ScheduledJobForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java index c954a7e77..53655aedc 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/ScheduledJobForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java @@ -14,32 +14,24 @@ * governing permissions and limitations under the License. */ -package org.codelibs.fess.app.web.admin; +package org.codelibs.fess.app.web.admin.scheduledjob; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.CronExpression; import org.codelibs.fess.util.ComponentUtil; -public class ScheduledJobForm implements Serializable { +/** + * @author shinsuke + */ +public class ScheduledjobEditForm 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/scheduledjob/ScheduledjobSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobSearchForm.java new file mode 100644 index 000000000..7e8c4ebdf --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobSearchForm.java @@ -0,0 +1,31 @@ +/* + * 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.scheduledjob; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * @author shinsuke + */ +public class ScheduledjobSearchForm 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 fe061dc28..a69242589 100644 --- a/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp @@ -42,12 +42,12 @@ -
  • class="active">class="active"> -
    • +
  • class="active">