modify files to start up

pom.xml

@@ -412,7 +412,9 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
 			<version>1.2</version> <!-- contains taglibs.standard -->
+			<!-- 
 			<scope>provided</scope>
+			 -->
 		</dependency>
 
 		<!-- elasticsearch -->

src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -45,7 +45,6 @@ import org.codelibs.fess.util.FacetResponse.Field;
 import org.codelibs.fess.util.MoreLikeThisResponse;
 import org.codelibs.fess.util.WebApiUtil;
 import org.lastaflute.web.util.LaRequestUtil;
-import org.lastaflute.web.util.LaResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/codelibs/fess/api/xml/XmlApiManager.java

@@ -42,7 +42,6 @@ import org.codelibs.fess.util.FacetResponse;
 import org.codelibs.fess.util.FacetResponse.Field;
 import org.codelibs.fess.util.MoreLikeThisResponse;
 import org.codelibs.fess.util.WebApiUtil;
-import org.lastaflute.web.util.LaResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/codelibs/fess/app/pager/BoostDocumentRulePager.java

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

src/main/java/org/codelibs/fess/app/pager/CrawlingSessionPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class CrawlingSessionPager {
+public class CrawlingSessionPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class DataConfigPager {
+public class DataConfigPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class FailureUrlPager {
+public class FailureUrlPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     //@Maxbytelength(maxbytelength = 1000)
     public String url;

src/main/java/org/codelibs/fess/app/pager/FileAuthenticationPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class FileAuthenticationPager {
+public class FileAuthenticationPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class FileConfigPager {
+public class FileConfigPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/JobLogPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class JobLogPager {
+public class JobLogPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java

@@ -14,17 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class KeyMatchPager {
+public class KeyMatchPager implements Serializable {
 
-    public KeyMatchPager() {
-        super();
-    }
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class LabelTypePager {
+public class LabelTypePager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/OverlappingHostPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class OverlappingHostPager {
+public class OverlappingHostPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/PathMappingPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class PathMappingPager {
+public class PathMappingPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/RequestHeaderPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class RequestHeaderPager {
+public class RequestHeaderPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class RoleTypePager {
+public class RoleTypePager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/ScheduledJobPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class ScheduledJobPager {
+public class ScheduledJobPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/SuggestBadWordPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class SuggestBadWordPager {
+public class SuggestBadWordPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/SuggestElevateWordPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class SuggestElevateWordPager {
+public class SuggestElevateWordPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/SynonymPager.java

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

src/main/java/org/codelibs/fess/app/pager/UserDictPager.java

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

src/main/java/org/codelibs/fess/app/pager/WebAuthenticationPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class WebAuthenticationPager {
+public class WebAuthenticationPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java

@@ -14,13 +14,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.pager;
+package org.codelibs.fess.app.pager;
 
+import java.io.Serializable;
 import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class WebConfigPager {
+public class WebConfigPager implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int DEFAULT_PAGE_SIZE = 20;
 

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.BoostDocumentRulePager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.BoostDocumentRuleCB;
 import org.codelibs.fess.es.exbhv.BoostDocumentRuleBhv;
 import org.codelibs.fess.es.exentity.BoostDocumentRule;
-import org.codelibs.fess.pager.BoostDocumentRulePager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class BoostDocumentRuleService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Serializable;
@@ -40,6 +39,7 @@ import org.codelibs.core.CoreLibConstants;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.FessSystemException;
+import org.codelibs.fess.app.pager.CrawlingSessionPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.CrawlingSessionCB;
@@ -47,7 +47,6 @@ import org.codelibs.fess.es.exbhv.CrawlingSessionBhv;
 import org.codelibs.fess.es.exbhv.CrawlingSessionInfoBhv;
 import org.codelibs.fess.es.exentity.CrawlingSession;
 import org.codelibs.fess.es.exentity.CrawlingSessionInfo;
-import org.codelibs.fess.pager.CrawlingSessionPager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.ListResultBean;

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +25,7 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.app.pager.DataConfigPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.DataConfigCB;
@@ -35,7 +35,6 @@ import org.codelibs.fess.es.exbhv.DataConfigToRoleBhv;
 import org.codelibs.fess.es.exentity.DataConfig;
 import org.codelibs.fess.es.exentity.DataConfigToLabel;
 import org.codelibs.fess.es.exentity.DataConfigToRole;
-import org.codelibs.fess.pager.DataConfigPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class DataConfigService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.io.StringWriter;
@@ -32,6 +31,7 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.app.pager.FailureUrlPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.FailureUrlCB;
@@ -39,7 +39,6 @@ import org.codelibs.fess.es.exbhv.FailureUrlBhv;
 import org.codelibs.fess.es.exentity.CrawlingConfig;
 import org.codelibs.fess.es.exentity.FailureUrl;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.FailureUrlPager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.FileAuthenticationPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.FileAuthenticationCB;
 import org.codelibs.fess.es.exbhv.FileAuthenticationBhv;
 import org.codelibs.fess.es.exentity.FileAuthentication;
-import org.codelibs.fess.pager.FileAuthenticationPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class FileAuthenticationService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +25,7 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.app.pager.FileConfigPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.FileConfigCB;
@@ -35,7 +35,6 @@ import org.codelibs.fess.es.exbhv.FileConfigToRoleBhv;
 import org.codelibs.fess.es.exentity.FileConfig;
 import org.codelibs.fess.es.exentity.FileConfigToLabel;
 import org.codelibs.fess.es.exentity.FileConfigToRole;
-import org.codelibs.fess.pager.FileConfigPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class FileConfigService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.JobLogPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.JobLogCB;
 import org.codelibs.fess.es.exbhv.JobLogBhv;
 import org.codelibs.fess.es.exentity.JobLog;
-import org.codelibs.fess.pager.JobLogPager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.KeyMatchPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.KeyMatchCB;
 import org.codelibs.fess.es.exbhv.KeyMatchBhv;
 import org.codelibs.fess.es.exentity.KeyMatch;
-import org.codelibs.fess.pager.KeyMatchPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class KeyMatchService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +24,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.LabelTypePager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.LabelTypeCB;
@@ -33,7 +33,6 @@ import org.codelibs.fess.es.exbhv.LabelTypeBhv;
 import org.codelibs.fess.es.exentity.LabelToRole;
 import org.codelibs.fess.es.exentity.LabelType;
 import org.codelibs.fess.helper.LabelTypeHelper;
-import org.codelibs.fess.pager.LabelTypePager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.OverlappingHostPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.OverlappingHostCB;
 import org.codelibs.fess.es.exbhv.OverlappingHostBhv;
 import org.codelibs.fess.es.exentity.OverlappingHost;
-import org.codelibs.fess.pager.OverlappingHostPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class OverlappingHostService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
@@ -25,12 +24,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.PathMappingPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.PathMappingCB;
 import org.codelibs.fess.es.exbhv.PathMappingBhv;
 import org.codelibs.fess.es.exentity.PathMapping;
-import org.codelibs.fess.pager.PathMappingPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class PathMappingService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.RequestHeaderPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.RequestHeaderCB;
 import org.codelibs.fess.es.exbhv.RequestHeaderBhv;
 import org.codelibs.fess.es.exentity.RequestHeader;
-import org.codelibs.fess.pager.RequestHeaderPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class RequestHeaderService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.RoleTypePager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.RoleTypeCB;
 import org.codelibs.fess.es.exbhv.RoleTypeBhv;
 import org.codelibs.fess.es.exentity.RoleType;
-import org.codelibs.fess.pager.RoleTypePager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class RoleTypeService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -25,13 +24,13 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.app.pager.ScheduledJobPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.ScheduledJobCB;
 import org.codelibs.fess.es.exbhv.ScheduledJobBhv;
 import org.codelibs.fess.es.exentity.ScheduledJob;
 import org.codelibs.fess.job.JobScheduler;
-import org.codelibs.fess.pager.ScheduledJobPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class ScheduledJobService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Serializable;
@@ -31,12 +30,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fess.app.pager.SuggestBadWordPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.SuggestBadWordCB;
 import org.codelibs.fess.es.exbhv.SuggestBadWordBhv;
 import org.codelibs.fess.es.exentity.SuggestBadWord;
-import org.codelibs.fess.pager.SuggestBadWordPager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Serializable;
@@ -31,12 +30,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fess.app.pager.SuggestElevateWordPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.SuggestElevateWordCB;
 import org.codelibs.fess.es.exbhv.SuggestElevateWordBhv;
 import org.codelibs.fess.es.exentity.SuggestElevateWord;
-import org.codelibs.fess.pager.SuggestElevateWordPager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +23,7 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fess.app.pager.SynonymPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.dict.DictionaryExpiredException;
 import org.codelibs.fess.dict.DictionaryFile;
@@ -31,7 +31,6 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList;
 import org.codelibs.fess.dict.DictionaryManager;
 import org.codelibs.fess.dict.synonym.SynonymFile;
 import org.codelibs.fess.dict.synonym.SynonymItem;
-import org.codelibs.fess.pager.SynonymPager;
 
 public class SynonymService {
     @Resource

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +23,7 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fess.app.pager.UserDictPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.dict.DictionaryExpiredException;
 import org.codelibs.fess.dict.DictionaryFile;
@@ -31,7 +31,6 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList;
 import org.codelibs.fess.dict.DictionaryManager;
 import org.codelibs.fess.dict.userdict.UserDictFile;
 import org.codelibs.fess.dict.userdict.UserDictItem;
-import org.codelibs.fess.pager.UserDictPager;
 
 public class UserDictService {
     @Resource

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +23,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
+import org.codelibs.fess.app.pager.WebAuthenticationPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.WebAuthenticationCB;
 import org.codelibs.fess.es.exbhv.WebAuthenticationBhv;
 import org.codelibs.fess.es.exentity.WebAuthentication;
-import org.codelibs.fess.pager.WebAuthenticationPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class WebAuthenticationService implements Serializable {

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

@@ -14,9 +14,8 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.service;
+package org.codelibs.fess.app.service;
 
-import java.beans.Beans;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +25,7 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.app.pager.WebConfigPager;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.es.cbean.WebConfigCB;
@@ -35,7 +35,6 @@ import org.codelibs.fess.es.exbhv.WebConfigToRoleBhv;
 import org.codelibs.fess.es.exentity.WebConfig;
 import org.codelibs.fess.es.exentity.WebConfigToLabel;
 import org.codelibs.fess.es.exentity.WebConfigToRole;
-import org.codelibs.fess.pager.WebConfigPager;
 import org.dbflute.cbean.result.PagingResultBean;
 
 public class WebConfigService implements Serializable {

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

@@ -34,8 +34,8 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.es.exentity.BoostDocumentRule;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.BoostDocumentRulePager;
-import org.codelibs.fess.service.BoostDocumentRuleService;
+import org.codelibs.fess.app.pager.BoostDocumentRulePager;
+import org.codelibs.fess.app.service.BoostDocumentRuleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -34,8 +34,8 @@ import org.codelibs.fess.es.exentity.CrawlingSession;
 import org.codelibs.fess.es.exentity.CrawlingSessionInfo;
 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.app.pager.CrawlingSessionPager;
+import org.codelibs.fess.app.service.CrawlingSessionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -43,7 +43,7 @@ import org.codelibs.fess.FessSystemException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.service.CrawlingSessionService;
+import org.codelibs.fess.app.service.CrawlingSessionService;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -39,11 +39,11 @@ import org.codelibs.fess.es.exentity.LabelType;
 import org.codelibs.fess.es.exentity.RoleType;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.DataConfigPager;
-import org.codelibs.fess.service.DataConfigService;
-import org.codelibs.fess.service.FailureUrlService;
-import org.codelibs.fess.service.LabelTypeService;
-import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.app.pager.DataConfigPager;
+import org.codelibs.fess.app.service.DataConfigService;
+import org.codelibs.fess.app.service.FailureUrlService;
+import org.codelibs.fess.app.service.LabelTypeService;
+import org.codelibs.fess.app.service.RoleTypeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -31,8 +31,8 @@ import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.es.exentity.FailureUrl;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.FailureUrlPager;
-import org.codelibs.fess.service.FailureUrlService;
+import org.codelibs.fess.app.pager.FailureUrlPager;
+import org.codelibs.fess.app.service.FailureUrlService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -37,9 +37,9 @@ import org.codelibs.fess.es.exentity.FileAuthentication;
 import org.codelibs.fess.es.exentity.FileConfig;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.FileAuthenticationPager;
-import org.codelibs.fess.service.FileAuthenticationService;
-import org.codelibs.fess.service.FileConfigService;
+import org.codelibs.fess.app.pager.FileAuthenticationPager;
+import org.codelibs.fess.app.service.FileAuthenticationService;
+import org.codelibs.fess.app.service.FileConfigService;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -35,11 +35,11 @@ import org.codelibs.fess.es.exentity.LabelType;
 import org.codelibs.fess.es.exentity.RoleType;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.FileConfigPager;
-import org.codelibs.fess.service.FailureUrlService;
-import org.codelibs.fess.service.FileConfigService;
-import org.codelibs.fess.service.LabelTypeService;
-import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.app.pager.FileConfigPager;
+import org.codelibs.fess.app.service.FailureUrlService;
+import org.codelibs.fess.app.service.FileConfigService;
+import org.codelibs.fess.app.service.LabelTypeService;
+import org.codelibs.fess.app.service.RoleTypeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -33,8 +33,8 @@ import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.es.exentity.JobLog;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.JobLogPager;
-import org.codelibs.fess.service.JobLogService;
+import org.codelibs.fess.app.pager.JobLogPager;
+import org.codelibs.fess.app.service.JobLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -34,9 +34,9 @@ import org.codelibs.fess.es.exentity.LabelType;
 import org.codelibs.fess.es.exentity.RoleType;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.LabelTypePager;
-import org.codelibs.fess.service.LabelTypeService;
-import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.app.pager.LabelTypePager;
+import org.codelibs.fess.app.service.LabelTypeService;
+import org.codelibs.fess.app.service.RoleTypeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -33,8 +33,8 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.es.exentity.OverlappingHost;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.OverlappingHostPager;
-import org.codelibs.fess.service.OverlappingHostService;
+import org.codelibs.fess.app.pager.OverlappingHostPager;
+import org.codelibs.fess.app.service.OverlappingHostService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -34,8 +34,8 @@ import org.codelibs.fess.es.exentity.PathMapping;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.PathMappingPager;
-import org.codelibs.fess.service.PathMappingService;
+import org.codelibs.fess.app.pager.PathMappingPager;
+import org.codelibs.fess.app.service.PathMappingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -35,9 +35,9 @@ import org.codelibs.fess.es.exentity.RequestHeader;
 import org.codelibs.fess.es.exentity.WebConfig;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.RequestHeaderPager;
-import org.codelibs.fess.service.RequestHeaderService;
-import org.codelibs.fess.service.WebConfigService;
+import org.codelibs.fess.app.pager.RequestHeaderPager;
+import org.codelibs.fess.app.service.RequestHeaderService;
+import org.codelibs.fess.app.service.WebConfigService;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -33,8 +33,8 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.es.exentity.RoleType;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.RoleTypePager;
-import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.app.pager.RoleTypePager;
+import org.codelibs.fess.app.service.RoleTypeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -37,9 +37,9 @@ 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.pager.ScheduledJobPager;
-import org.codelibs.fess.service.RoleTypeService;
-import org.codelibs.fess.service.ScheduledJobService;
+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;
 

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

@@ -50,8 +50,8 @@ import org.codelibs.fess.es.exentity.SuggestBadWord;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 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.app.pager.SuggestBadWordPager;
+import org.codelibs.fess.app.service.SuggestBadWordService;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -50,8 +50,8 @@ import org.codelibs.fess.es.exentity.SuggestElevateWord;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 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.app.pager.SuggestElevateWordPager;
+import org.codelibs.fess.app.service.SuggestElevateWordService;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -30,7 +30,7 @@ import org.codelibs.fess.crud.util.SAStrutsUtil;
 import org.codelibs.fess.es.exentity.ScheduledJob;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.service.ScheduledJobService;
+import org.codelibs.fess.app.service.ScheduledJobService;
 import org.lastaflute.web.util.LaRequestUtil;
 
 public class SystemAction implements Serializable {

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

@@ -38,9 +38,9 @@ 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.pager.WebAuthenticationPager;
-import org.codelibs.fess.service.WebAuthenticationService;
-import org.codelibs.fess.service.WebConfigService;
+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;

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

@@ -36,11 +36,11 @@ import org.codelibs.fess.es.exentity.RoleType;
 import org.codelibs.fess.es.exentity.WebConfig;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.WebConfigPager;
-import org.codelibs.fess.service.FailureUrlService;
-import org.codelibs.fess.service.LabelTypeService;
-import org.codelibs.fess.service.RoleTypeService;
-import org.codelibs.fess.service.WebConfigService;
+import org.codelibs.fess.app.pager.WebConfigPager;
+import org.codelibs.fess.app.service.FailureUrlService;
+import org.codelibs.fess.app.service.LabelTypeService;
+import org.codelibs.fess.app.service.RoleTypeService;
+import org.codelibs.fess.app.service.WebConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -35,9 +35,9 @@ import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.TriggeredJob;
-import org.codelibs.fess.service.FileConfigService;
-import org.codelibs.fess.service.ScheduledJobService;
-import org.codelibs.fess.service.WebConfigService;
+import org.codelibs.fess.app.service.FileConfigService;
+import org.codelibs.fess.app.service.ScheduledJobService;
+import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.robot.util.CharUtil;
 import org.slf4j.Logger;

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

@@ -40,8 +40,8 @@ import org.codelibs.fess.dict.synonym.SynonymFile;
 import org.codelibs.fess.dict.synonym.SynonymItem;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.SynonymPager;
-import org.codelibs.fess.service.SynonymService;
+import org.codelibs.fess.app.pager.SynonymPager;
+import org.codelibs.fess.app.service.SynonymService;
 import org.lastaflute.web.util.LaResponseUtil;
 
 public class SynonymAction {

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

@@ -38,8 +38,8 @@ import org.codelibs.fess.dict.userdict.UserDictFile;
 import org.codelibs.fess.dict.userdict.UserDictItem;
 import org.codelibs.fess.exception.SSCActionMessagesException;
 import org.codelibs.fess.helper.SystemHelper;
-import org.codelibs.fess.pager.UserDictPager;
-import org.codelibs.fess.service.UserDictService;
+import org.codelibs.fess.app.pager.UserDictPager;
+import org.codelibs.fess.app.service.UserDictService;
 import org.lastaflute.web.util.LaResponseUtil;
 
 public class UserDictAction {

src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java

@@ -22,12 +22,12 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.codelibs.fess.annotation.Token;
+import org.codelibs.fess.app.pager.KeyMatchPager;
+import org.codelibs.fess.app.service.KeyMatchService;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.es.exentity.KeyMatch;
 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.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;

src/main/java/org/codelibs/fess/app/web/admin/keymatch/KeyMatchEditForm.java

@@ -17,8 +17,6 @@
 package org.codelibs.fess.app.web.admin.keymatch;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.codelibs.fess.util.ComponentUtil;
 

src/main/java/org/codelibs/fess/client/FessEsClient.java

@@ -2,7 +2,6 @@ package org.codelibs.fess.client;
 
 import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;

src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java

@@ -31,11 +31,11 @@ import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.app.service.FailureUrlService;
 import org.codelibs.fess.ds.DataStoreCrawlingException;
 import org.codelibs.fess.ds.DataStoreException;
 import org.codelibs.fess.ds.IndexUpdateCallback;
 import org.codelibs.fess.es.exentity.DataConfig;
-import org.codelibs.fess.service.FailureUrlService;
 import org.codelibs.robot.exception.RobotCrawlAccessException;
 import org.codelibs.robot.exception.RobotMultipleCrawlAccessException;
 import org.lastaflute.di.core.SingletonLaContainer;

src/main/java/org/codelibs/fess/es/bsentity/BsBoostDocumentRule.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsClickLog.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsCrawlingSession.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsCrawlingSessionInfo.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsDataConfig.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsDataConfigToLabel.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsDataConfigToRole.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsFailureUrl.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsFavoriteLog.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsFileAuthentication.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsFileConfig.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsFileConfigToLabel.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsFileConfigToRole.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsJobLog.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsKeyMatch.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsLabelToRole.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsLabelType.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsOverlappingHost.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsPathMapping.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsRequestHeader.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsRoleType.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsScheduledJob.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsSearchFieldLog.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsSearchLog.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsSuggestBadWord.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsSuggestElevateWord.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsUserInfo.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsWebAuthentication.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsWebConfig.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsWebConfigToLabel.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/org/codelibs/fess/es/bsentity/BsWebConfigToRole.java

@@ -1,6 +1,5 @@
 package org.codelibs.fess.es.bsentity;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;