fix #269

src/main/java/org/codelibs/fess/crud/action/admin/BsLabelTypeAction.java

@@ -29,9 +29,9 @@ import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.LabelType;
-import org.codelibs.fess.form.admin.LabelTypeForm;
 import org.codelibs.fess.pager.LabelTypePager;
 import org.codelibs.fess.service.LabelTypeService;
+import org.codelibs.fess.web.admin.LabelTypeForm;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/crud/action/admin/BsOverlappingHostAction.java

@@ -29,9 +29,9 @@ import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.OverlappingHost;
-import org.codelibs.fess.form.admin.OverlappingHostForm;
 import org.codelibs.fess.pager.OverlappingHostPager;
 import org.codelibs.fess.service.OverlappingHostService;
+import org.codelibs.fess.web.admin.OverlappingHostForm;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/crud/action/admin/BsPathMappingAction.java

@@ -29,9 +29,9 @@ import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.PathMapping;
-import org.codelibs.fess.form.admin.PathMappingForm;
 import org.codelibs.fess.pager.PathMappingPager;
 import org.codelibs.fess.service.PathMappingService;
+import org.codelibs.fess.web.admin.PathMappingForm;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/crud/action/admin/BsRequestHeaderAction.java

@@ -29,9 +29,9 @@ import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.RequestHeader;
-import org.codelibs.fess.form.admin.RequestHeaderForm;
 import org.codelibs.fess.pager.RequestHeaderPager;
 import org.codelibs.fess.service.RequestHeaderService;
+import org.codelibs.fess.web.admin.RequestHeaderForm;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/crud/action/admin/BsWebCrawlingConfigAction.java

@@ -29,9 +29,9 @@ import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.WebCrawlingConfig;
-import org.codelibs.fess.form.admin.WebCrawlingConfigForm;
 import org.codelibs.fess.pager.WebCrawlingConfigPager;
 import org.codelibs.fess.service.WebCrawlingConfigService;
+import org.codelibs.fess.web.admin.WebCrawlingConfigForm;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/form/AppletForm.java → src/main/java/org/codelibs/fess/web/AppletForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form;
+package org.codelibs.fess.web;
 
 import org.seasar.struts.annotation.Required;
 

src/main/java/org/codelibs/fess/action/ErrorAction.java → src/main/java/org/codelibs/fess/web/ErrorAction.java

@@ -14,11 +14,10 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action;
+package org.codelibs.fess.web;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.form.ErrorForm;
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;
 

src/main/java/org/codelibs/fess/form/ErrorForm.java → src/main/java/org/codelibs/fess/web/ErrorForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form;
+package org.codelibs.fess.web;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/IndexAction.java → src/main/java/org/codelibs/fess/web/IndexAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action;
+package org.codelibs.fess.web;
 
 import java.awt.Desktop;
 import java.io.BufferedInputStream;
@@ -67,7 +67,6 @@ import org.codelibs.fess.db.exentity.SearchLog;
 import org.codelibs.fess.db.exentity.UserInfo;
 import org.codelibs.fess.entity.FieldAnalysisResponse;
 import org.codelibs.fess.entity.LoginInfo;
-import org.codelibs.fess.form.IndexForm;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.DocumentHelper;
 import org.codelibs.fess.helper.FieldHelper;

src/main/java/org/codelibs/fess/form/IndexForm.java → src/main/java/org/codelibs/fess/web/IndexForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form;
+package org.codelibs.fess.web;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/LoginAction.java → src/main/java/org/codelibs/fess/web/LoginAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action;
+package org.codelibs.fess.web;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -35,7 +35,6 @@ import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.FessSystemException;
 import org.codelibs.fess.entity.LoginInfo;
-import org.codelibs.fess.form.LoginForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.sastruts.core.SSCConstants;

src/main/java/org/codelibs/fess/form/LoginForm.java → src/main/java/org/codelibs/fess/web/LoginForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form;
+package org.codelibs.fess.web;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/BoostDocumentRuleAction.java → src/main/java/org/codelibs/fess/web/admin/BoostDocumentRuleAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -23,16 +23,15 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.action.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.db.exentity.BoostDocumentRule;
-import org.codelibs.fess.form.admin.BoostDocumentRuleForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.BoostDocumentRulePager;
 import org.codelibs.fess.service.BoostDocumentRuleService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/BoostDocumentRuleForm.java → src/main/java/org/codelibs/fess/web/admin/BoostDocumentRuleForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/codelibs/fess/action/admin/CrawlAction.java → src/main/java/org/codelibs/fess/web/admin/CrawlAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -28,7 +28,6 @@ import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
-import org.codelibs.fess.form.admin.CrawlForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;

src/main/java/org/codelibs/fess/form/admin/CrawlForm.java → src/main/java/org/codelibs/fess/web/admin/CrawlForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/CrawlingSessionAction.java → src/main/java/org/codelibs/fess/web/admin/CrawlingSessionAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -23,17 +23,16 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.CrawlingSession;
 import org.codelibs.fess.db.exentity.CrawlingSessionInfo;
-import org.codelibs.fess.form.admin.CrawlingSessionForm;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.CrawlingSessionPager;
 import org.codelibs.fess.service.CrawlingSessionService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/form/admin/CrawlingSessionForm.java → src/main/java/org/codelibs/fess/web/admin/CrawlingSessionForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/DataAction.java → src/main/java/org/codelibs/fess/web/admin/DataAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -41,7 +41,6 @@ import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.FessSystemException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
-import org.codelibs.fess.form.admin.DataForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.service.ClickLogService;
 import org.codelibs.fess.service.CrawlingSessionService;

src/main/java/org/codelibs/fess/action/admin/DataCrawlingConfigAction.java → src/main/java/org/codelibs/fess/web/admin/DataCrawlingConfigAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.beans.FessBeans;
 import org.codelibs.fess.crud.CommonConstants;
@@ -34,13 +33,13 @@ import org.codelibs.fess.db.exentity.DataCrawlingConfig;
 import org.codelibs.fess.db.exentity.LabelType;
 import org.codelibs.fess.db.exentity.RoleType;
 import org.codelibs.fess.ds.DataStoreFactory;
-import org.codelibs.fess.form.admin.DataCrawlingConfigForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.DataCrawlingConfigPager;
 import org.codelibs.fess.service.FailureUrlService;
 import org.codelibs.fess.service.LabelTypeService;
 import org.codelibs.fess.service.RoleTypeService;
 import org.codelibs.fess.service.DataCrawlingConfigService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/DataCrawlingConfigForm.java → src/main/java/org/codelibs/fess/web/admin/DataCrawlingConfigForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/form/admin/DataForm.java → src/main/java/org/codelibs/fess/web/admin/DataForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/DesignAction.java → src/main/java/org/codelibs/fess/web/admin/DesignAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -34,7 +34,6 @@ import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.FessSystemException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
-import org.codelibs.fess.form.admin.DesignForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;

src/main/java/org/codelibs/fess/form/admin/DesignForm.java → src/main/java/org/codelibs/fess/web/admin/DesignForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/DictAction.java → src/main/java/org/codelibs/fess/web/admin/DictAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 
@@ -23,7 +23,6 @@ import javax.annotation.Resource;
 import org.codelibs.fess.dict.DictionaryFile;
 import org.codelibs.fess.dict.DictionaryItem;
 import org.codelibs.fess.dict.DictionaryManager;
-import org.codelibs.fess.form.admin.DictForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;

src/main/java/org/codelibs/fess/form/admin/DictForm.java → src/main/java/org/codelibs/fess/web/admin/DictForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/DocumentAction.java → src/main/java/org/codelibs/fess/web/admin/DocumentAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -37,7 +37,6 @@ import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
-import org.codelibs.fess.form.admin.DocumentForm;
 import org.codelibs.fess.helper.FieldHelper;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;

src/main/java/org/codelibs/fess/form/admin/DocumentForm.java → src/main/java/org/codelibs/fess/web/admin/DocumentForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/main/java/org/codelibs/fess/action/admin/FailureUrlAction.java → src/main/java/org/codelibs/fess/web/admin/FailureUrlAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -23,15 +23,14 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.FailureUrl;
-import org.codelibs.fess.form.admin.FailureUrlForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.FailureUrlPager;
 import org.codelibs.fess.service.FailureUrlService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/form/admin/FailureUrlForm.java → src/main/java/org/codelibs/fess/web/admin/FailureUrlForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/FavoriteLogAction.java → src/main/java/org/codelibs/fess/web/admin/FavoriteLogAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.BufferedWriter;
 import java.io.OutputStreamWriter;
@@ -30,15 +30,14 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.FavoriteLog;
-import org.codelibs.fess.form.admin.FavoriteLogForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.FavoriteLogPager;
 import org.codelibs.fess.service.FavoriteLogService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/FavoriteLogForm.java → src/main/java/org/codelibs/fess/web/admin/FavoriteLogForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/FileAuthenticationAction.java → src/main/java/org/codelibs/fess/web/admin/FileAuthenticationAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -26,18 +26,17 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.action.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.db.exentity.FileAuthentication;
 import org.codelibs.fess.db.exentity.FileCrawlingConfig;
-import org.codelibs.fess.form.admin.FileAuthenticationForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.FileAuthenticationPager;
 import org.codelibs.fess.service.FileAuthenticationService;
 import org.codelibs.fess.service.FileCrawlingConfigService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/FileAuthenticationForm.java → src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/FileCrawlingConfigAction.java → src/main/java/org/codelibs/fess/web/admin/FileCrawlingConfigAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -23,7 +23,6 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.beans.FessBeans;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
@@ -31,13 +30,13 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.FileCrawlingConfig;
 import org.codelibs.fess.db.exentity.LabelType;
 import org.codelibs.fess.db.exentity.RoleType;
-import org.codelibs.fess.form.admin.FileCrawlingConfigForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.FileCrawlingConfigPager;
 import org.codelibs.fess.service.FailureUrlService;
 import org.codelibs.fess.service.FileCrawlingConfigService;
 import org.codelibs.fess.service.LabelTypeService;
 import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/FileCrawlingConfigForm.java → src/main/java/org/codelibs/fess/web/admin/FileCrawlingConfigForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/IndexAction.java → src/main/java/org/codelibs/fess/web/admin/IndexAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

src/main/java/org/codelibs/fess/action/admin/JobLogAction.java → src/main/java/org/codelibs/fess/web/admin/JobLogAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,15 +24,14 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.JobLog;
-import org.codelibs.fess.form.admin.JobLogForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.JobLogPager;
 import org.codelibs.fess.service.JobLogService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/form/admin/JobLogForm.java → src/main/java/org/codelibs/fess/web/admin/JobLogForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/KeyMatchAction.java → src/main/java/org/codelibs/fess/web/admin/KeyMatchAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -23,17 +23,16 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.action.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.db.exentity.KeyMatch;
-import org.codelibs.fess.form.admin.KeyMatchForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.KeyMatchPager;
 import org.codelibs.fess.service.KeyMatchService;
 import org.codelibs.fess.util.ComponentUtil;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/KeyMatchForm.java → src/main/java/org/codelibs/fess/web/admin/KeyMatchForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/LabelTypeAction.java → src/main/java/org/codelibs/fess/web/admin/LabelTypeAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/org/codelibs/fess/form/admin/LabelTypeForm.java → src/main/java/org/codelibs/fess/web/admin/LabelTypeForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/LogAction.java → src/main/java/org/codelibs/fess/web/admin/LogAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,7 +36,6 @@ import javax.annotation.Resource;
 import org.apache.commons.codec.binary.Base64;
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.form.admin.LogForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;

src/main/java/org/codelibs/fess/form/admin/LogForm.java → src/main/java/org/codelibs/fess/web/admin/LogForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/OverlappingHostAction.java → src/main/java/org/codelibs/fess/web/admin/OverlappingHostAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 

src/main/java/org/codelibs/fess/form/admin/OverlappingHostForm.java → src/main/java/org/codelibs/fess/web/admin/OverlappingHostForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/PathMappingAction.java → src/main/java/org/codelibs/fess/web/admin/PathMappingAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 

src/main/java/org/codelibs/fess/form/admin/PathMappingForm.java → src/main/java/org/codelibs/fess/web/admin/PathMappingForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/RequestHeaderAction.java → src/main/java/org/codelibs/fess/web/admin/RequestHeaderAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;

src/main/java/org/codelibs/fess/form/admin/RequestHeaderForm.java → src/main/java/org/codelibs/fess/web/admin/RequestHeaderForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/RoleTypeAction.java → src/main/java/org/codelibs/fess/web/admin/RoleTypeAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -23,16 +23,15 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.codelibs.fess.action.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.db.exentity.RoleType;
-import org.codelibs.fess.form.admin.RoleTypeForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.RoleTypePager;
 import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/RoleTypeForm.java → src/main/java/org/codelibs/fess/web/admin/RoleTypeForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/ScheduledJobAction.java → src/main/java/org/codelibs/fess/web/admin/ScheduledJobAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -27,7 +27,6 @@ import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.ScheduledJob;
-import org.codelibs.fess.form.admin.ScheduledJobForm;
 import org.codelibs.fess.pager.ScheduledJobPager;
 import org.codelibs.fess.service.ScheduledJobService;
 import org.codelibs.sastruts.core.annotation.Token;
@@ -36,15 +35,14 @@ import org.seasar.framework.util.StringUtil;
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;
 import org.seasar.struts.exception.ActionMessagesException;
-
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.beans.FessBeans;
 import org.codelibs.fess.db.exentity.RoleType;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.JobExecutor;
 import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/codelibs/fess/form/admin/ScheduledJobForm.java → src/main/java/org/codelibs/fess/web/admin/ScheduledJobForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/SearchListAction.java → src/main/java/org/codelibs/fess/web/admin/SearchListAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.NumberFormat;
@@ -29,7 +29,6 @@ import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.InvalidQueryException;
 import org.codelibs.fess.ResultOffsetExceededException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
-import org.codelibs.fess.form.admin.SearchListForm;
 import org.codelibs.fess.helper.FieldHelper;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.QueryHelper;

src/main/java/org/codelibs/fess/form/admin/SearchListForm.java → src/main/java/org/codelibs/fess/web/admin/SearchListForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/SearchLogAction.java → src/main/java/org/codelibs/fess/web/admin/SearchLogAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.BufferedWriter;
 import java.io.OutputStreamWriter;
@@ -30,16 +30,15 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.db.exentity.SearchLog;
-import org.codelibs.fess.form.admin.SearchLogForm;
 import org.codelibs.fess.pager.SearchLogPager;
 import org.codelibs.fess.service.SearchLogService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.struts.annotation.Execute;

src/main/java/org/codelibs/fess/form/admin/SearchLogForm.java → src/main/java/org/codelibs/fess/web/admin/SearchLogForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/org/codelibs/fess/action/admin/StatsAction.java → src/main/java/org/codelibs/fess/web/admin/StatsAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.List;
@@ -26,7 +26,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.crud.CommonConstants;
-import org.codelibs.fess.form.admin.StatsForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.StatsPager;
 import org.codelibs.fess.service.SearchFieldLogService;

src/main/java/org/codelibs/fess/form/admin/StatsForm.java → src/main/java/org/codelibs/fess/web/admin/StatsForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.HashMap;

src/main/java/org/codelibs/fess/action/admin/SuggestBadWordAction.java → src/main/java/org/codelibs/fess/web/admin/SuggestBadWordAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -38,17 +38,16 @@ import org.apache.commons.io.IOUtils;
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.FessSystemException;
-import org.codelibs.fess.action.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.db.exentity.SuggestBadWord;
-import org.codelibs.fess.form.admin.SuggestBadWordForm;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.SuggestBadWordPager;
 import org.codelibs.fess.service.SuggestBadWordService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.robot.util.StreamUtil;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;

src/main/java/org/codelibs/fess/form/admin/SuggestBadWordForm.java → src/main/java/org/codelibs/fess/web/admin/SuggestBadWordForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/SuggestElevateWordAction.java → src/main/java/org/codelibs/fess/web/admin/SuggestElevateWordAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -40,17 +40,16 @@ import org.apache.commons.logging.LogFactory;
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.FessSystemException;
-import org.codelibs.fess.action.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.db.exentity.SuggestElevateWord;
-import org.codelibs.fess.form.admin.SuggestElevateWordForm;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.SuggestElevateWordPager;
 import org.codelibs.fess.service.SuggestElevateWordService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.robot.util.StreamUtil;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;

src/main/java/org/codelibs/fess/form/admin/SuggestElevateWordForm.java → src/main/java/org/codelibs/fess/web/admin/SuggestElevateWordForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/SystemAction.java → src/main/java/org/codelibs/fess/web/admin/SystemAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -32,7 +32,6 @@ import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.ScheduledJob;
-import org.codelibs.fess.form.admin.SystemForm;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.helper.WebManagementHelper;

src/main/java/org/codelibs/fess/form/admin/SystemForm.java → src/main/java/org/codelibs/fess/web/admin/SystemForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/main/java/org/codelibs/fess/action/admin/SystemInfoAction.java → src/main/java/org/codelibs/fess/web/admin/SystemInfoAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -27,7 +27,6 @@ import javax.annotation.Resource;
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.form.admin.SystemInfoForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;

src/main/java/org/codelibs/fess/form/admin/SystemInfoForm.java → src/main/java/org/codelibs/fess/web/admin/SystemInfoForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/UserInfoAction.java → src/main/java/org/codelibs/fess/web/admin/UserInfoAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.util.HashMap;
 import java.util.List;
@@ -23,15 +23,14 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.action.base.FessAdminAction;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.UserInfo;
-import org.codelibs.fess.form.admin.UserInfoForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.UserInfoPager;
 import org.codelibs.fess.service.UserInfoService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.seasar.framework.beans.util.Beans;
 import org.seasar.framework.util.StringUtil;

src/main/java/org/codelibs/fess/form/admin/UserInfoForm.java → src/main/java/org/codelibs/fess/web/admin/UserInfoForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/WebAuthenticationAction.java → src/main/java/org/codelibs/fess/web/admin/WebAuthenticationAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -26,18 +26,17 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.action.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.db.exentity.WebAuthentication;
 import org.codelibs.fess.db.exentity.WebCrawlingConfig;
-import org.codelibs.fess.form.admin.WebAuthenticationForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.WebAuthenticationPager;
 import org.codelibs.fess.service.WebAuthenticationService;
 import org.codelibs.fess.service.WebCrawlingConfigService;
+import org.codelibs.fess.web.base.FessAdminAction;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.seasar.framework.beans.util.Beans;

src/main/java/org/codelibs/fess/form/admin/WebAuthenticationForm.java → src/main/java/org/codelibs/fess/web/admin/WebAuthenticationForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/WebCrawlingConfigAction.java → src/main/java/org/codelibs/fess/web/admin/WebCrawlingConfigAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/org/codelibs/fess/form/admin/WebCrawlingConfigForm.java → src/main/java/org/codelibs/fess/web/admin/WebCrawlingConfigForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;

src/main/java/org/codelibs/fess/action/admin/WizardAction.java → src/main/java/org/codelibs/fess/web/admin/WizardAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -33,7 +33,6 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.db.exentity.FileCrawlingConfig;
 import org.codelibs.fess.db.exentity.ScheduledJob;
 import org.codelibs.fess.db.exentity.WebCrawlingConfig;
-import org.codelibs.fess.form.admin.WizardForm;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.TriggeredJob;

src/main/java/org/codelibs/fess/form/admin/WizardForm.java → src/main/java/org/codelibs/fess/web/admin/WizardForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin;
+package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
 

src/main/java/org/codelibs/fess/action/admin/dict/SynonymAction.java → src/main/java/org/codelibs/fess/web/admin/dict/SynonymAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin.dict;
+package org.codelibs.fess.web.admin.dict;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,7 +35,6 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.dict.DictionaryExpiredException;
 import org.codelibs.fess.dict.synonym.SynonymFile;
 import org.codelibs.fess.dict.synonym.SynonymItem;
-import org.codelibs.fess.form.admin.dict.SynonymForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.SynonymPager;
 import org.codelibs.fess.service.SynonymService;

src/main/java/org/codelibs/fess/form/admin/dict/SynonymForm.java → src/main/java/org/codelibs/fess/web/admin/dict/SynonymForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin.dict;
+package org.codelibs.fess.web.admin.dict;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/codelibs/fess/action/admin/dict/UserDictAction.java → src/main/java/org/codelibs/fess/web/admin/dict/UserDictAction.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.action.admin.dict;
+package org.codelibs.fess.web.admin.dict;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,7 +33,6 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.dict.DictionaryExpiredException;
 import org.codelibs.fess.dict.userdict.UserDictFile;
 import org.codelibs.fess.dict.userdict.UserDictItem;
-import org.codelibs.fess.form.admin.dict.UserDictForm;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.UserDictPager;
 import org.codelibs.fess.service.UserDictService;

src/main/java/org/codelibs/fess/form/admin/dict/UserDictForm.java → src/main/java/org/codelibs/fess/web/admin/dict/UserDictForm.java

@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.form.admin.dict;
+package org.codelibs.fess.web.admin.dict;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/codelibs/fess/action/base/FessAdminAction.java → src/main/java/org/codelibs/fess/web/base/FessAdminAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.action.base;
+package org.codelibs.fess.web.base;
 
 public abstract class FessAdminAction extends FessBaseAction {
 

src/main/java/org/codelibs/fess/action/base/FessBaseAction.java → src/main/java/org/codelibs/fess/web/base/FessBaseAction.java

@@ -29,7 +29,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.action.base;
+package org.codelibs.fess.web.base;
 
 import java.lang.reflect.Method;
 import java.time.LocalDate;

src/main/java/org/codelibs/fess/action/base/FessSearchAction.java → src/main/java/org/codelibs/fess/web/base/FessSearchAction.java

@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.action.base;
+package org.codelibs.fess.web.base;
 
 public abstract class FessSearchAction extends FessBaseAction {