فهرست منبع

Merge pull request #272 from tonkatu05/issue-250

Issue #251
Shinsuke Sugaya 10 سال پیش
والد
کامیت
6e021c3a70
39فایلهای تغییر یافته به همراه1474 افزوده شده و 2054 حذف شده
  1. BIN
      src/main/h2/webapp/WEB-INF/db/fess.mv.db
  2. 0 117
      src/main/java/org/codelibs/fess/crud/form/admin/BsDataCrawlingConfigForm.java
  3. 0 78
      src/main/java/org/codelibs/fess/crud/form/admin/BsFailureUrlForm.java
  4. 0 65
      src/main/java/org/codelibs/fess/crud/form/admin/BsFavoriteLogForm.java
  5. 0 114
      src/main/java/org/codelibs/fess/crud/form/admin/BsFileAuthenticationForm.java
  6. 0 151
      src/main/java/org/codelibs/fess/crud/form/admin/BsFileCrawlingConfigForm.java
  7. 0 82
      src/main/java/org/codelibs/fess/crud/form/admin/BsJobLogForm.java
  8. 0 104
      src/main/java/org/codelibs/fess/crud/form/admin/BsKeyMatchForm.java
  9. 0 110
      src/main/java/org/codelibs/fess/crud/form/admin/BsLabelTypeForm.java
  10. 0 99
      src/main/java/org/codelibs/fess/crud/form/admin/BsOverlappingHostForm.java
  11. 0 103
      src/main/java/org/codelibs/fess/crud/form/admin/BsPathMappingForm.java
  12. 0 98
      src/main/java/org/codelibs/fess/crud/form/admin/BsRequestHeaderForm.java
  13. 0 102
      src/main/java/org/codelibs/fess/crud/form/admin/BsRoleTypeForm.java
  14. 0 125
      src/main/java/org/codelibs/fess/crud/form/admin/BsScheduledJobForm.java
  15. 0 98
      src/main/java/org/codelibs/fess/crud/form/admin/BsSearchLogForm.java
  16. 0 92
      src/main/java/org/codelibs/fess/crud/form/admin/BsSuggestBadWordForm.java
  17. 0 101
      src/main/java/org/codelibs/fess/crud/form/admin/BsSuggestElevateWordForm.java
  18. 0 65
      src/main/java/org/codelibs/fess/crud/form/admin/BsUserInfoForm.java
  19. 0 118
      src/main/java/org/codelibs/fess/crud/form/admin/BsWebAuthenticationForm.java
  20. 0 155
      src/main/java/org/codelibs/fess/crud/form/admin/BsWebCrawlingConfigForm.java
  21. 90 4
      src/main/java/org/codelibs/fess/web/admin/DataCrawlingConfigForm.java
  22. 53 4
      src/main/java/org/codelibs/fess/web/admin/FailureUrlForm.java
  23. 40 4
      src/main/java/org/codelibs/fess/web/admin/FavoriteLogForm.java
  24. 89 4
      src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java
  25. 124 4
      src/main/java/org/codelibs/fess/web/admin/FileCrawlingConfigForm.java
  26. 56 4
      src/main/java/org/codelibs/fess/web/admin/JobLogForm.java
  27. 78 4
      src/main/java/org/codelibs/fess/web/admin/KeyMatchForm.java
  28. 83 4
      src/main/java/org/codelibs/fess/web/admin/LabelTypeForm.java
  29. 72 4
      src/main/java/org/codelibs/fess/web/admin/OverlappingHostForm.java
  30. 76 4
      src/main/java/org/codelibs/fess/web/admin/PathMappingForm.java
  31. 71 4
      src/main/java/org/codelibs/fess/web/admin/RequestHeaderForm.java
  32. 75 4
      src/main/java/org/codelibs/fess/web/admin/RoleTypeForm.java
  33. 98 5
      src/main/java/org/codelibs/fess/web/admin/ScheduledJobForm.java
  34. 72 4
      src/main/java/org/codelibs/fess/web/admin/SearchLogForm.java
  35. 65 4
      src/main/java/org/codelibs/fess/web/admin/SuggestBadWordForm.java
  36. 74 4
      src/main/java/org/codelibs/fess/web/admin/SuggestElevateWordForm.java
  37. 39 4
      src/main/java/org/codelibs/fess/web/admin/UserInfoForm.java
  38. 91 4
      src/main/java/org/codelibs/fess/web/admin/WebAuthenticationForm.java
  39. 128 4
      src/main/java/org/codelibs/fess/web/admin/WebCrawlingConfigForm.java

BIN
src/main/h2/webapp/WEB-INF/db/fess.mv.db


+ 0 - 117
src/main/java/org/codelibs/fess/crud/form/admin/BsDataCrawlingConfigForm.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsDataCrawlingConfigForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 200)
-    public String name;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 4000)
-    public String handlerName;
-
-    public String handlerParameter;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String handlerScript;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String boost;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1)
-    public String available;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        name = null;
-        handlerName = null;
-        handlerParameter = null;
-        handlerScript = null;
-        boost = "1";
-        available = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 78
src/main/java/org/codelibs/fess/crud/form/admin/BsFailureUrlForm.java

@@ -1,78 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsFailureUrlForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String url;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String threadName;
-
-    public String errorName;
-
-    public String errorLog;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntegerType
-    public String errorCount;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String lastAccessTime;
-
-    public String configId;
-
-    public void initialize() {
-
-        id = null;
-        url = null;
-        threadName = null;
-        errorName = null;
-        errorLog = null;
-        errorCount = null;
-        lastAccessTime = null;
-        configId = null;
-
-    }
-
-}

+ 0 - 65
src/main/java/org/codelibs/fess/crud/form/admin/BsFavoriteLogForm.java

@@ -1,65 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsFavoriteLogForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @LongType
-    public String userId;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String url;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    public void initialize() {
-
-        id = null;
-        userId = null;
-        url = null;
-        createdTime = null;
-
-    }
-
-}

+ 0 - 114
src/main/java/org/codelibs/fess/crud/form/admin/BsFileAuthenticationForm.java

@@ -1,114 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsFileAuthenticationForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String hostname;
-
-    @IntRange(min = -1, max = 2147483647)
-    public String port;
-
-    @Maxbytelength(maxbytelength = 10)
-    public String protocolScheme;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String username;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String password;
-
-    @Maxbytelength(maxbytelength = 1000)
-    public String parameters;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @LongType
-    public String fileCrawlingConfigId;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        hostname = null;
-        port = null;
-        protocolScheme = null;
-        username = null;
-        password = null;
-        parameters = null;
-        fileCrawlingConfigId = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 151
src/main/java/org/codelibs/fess/crud/form/admin/BsFileCrawlingConfigForm.java

@@ -1,151 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.codelibs.fess.annotation.UriType;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongRange;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsFileCrawlingConfigForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 200)
-    public String name;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @UriType(protocols = "file:,smb:")
-    @Maxbytelength(maxbytelength = 4000)
-    public String paths;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String includedPaths;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String excludedPaths;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String includedDocPaths;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String excludedDocPaths;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String configParameter;
-
-    @IntRange(min = 0, max = 2147483647)
-    public String depth;
-
-    @LongRange(min = 0, max = 9223372036854775807l)
-    public String maxAccessCount;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String numOfThread;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String intervalTime;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String boost;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1)
-    public String available;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        name = null;
-        paths = null;
-        includedPaths = null;
-        excludedPaths = null;
-        includedDocPaths = null;
-        excludedDocPaths = null;
-        configParameter = null;
-        depth = null;
-        maxAccessCount = null;
-        numOfThread = null;
-        intervalTime = null;
-        boost = "1";
-        available = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 82
src/main/java/org/codelibs/fess/crud/form/admin/BsJobLogForm.java

@@ -1,82 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsJobLogForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String jobName;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String jobStatus;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String target;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String scriptType;
-
-    public String scriptData;
-
-    public String scriptResult;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String startTime;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String endTime;
-
-    public void initialize() {
-
-        id = null;
-        jobName = null;
-        jobStatus = null;
-        target = null;
-        scriptType = null;
-        scriptData = null;
-        scriptResult = null;
-        startTime = null;
-        endTime = null;
-
-    }
-
-}

+ 0 - 104
src/main/java/org/codelibs/fess/crud/form/admin/BsKeyMatchForm.java

@@ -1,104 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsKeyMatchForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String term;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 4000)
-    public String query;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntegerType
-    @IntRange(min = 0, max = 2147483647)
-    public String maxSize;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String boost;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        term = null;
-        query = null;
-        maxSize = null;
-        boost = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 110
src/main/java/org/codelibs/fess/crud/form/admin/BsLabelTypeForm.java

@@ -1,110 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Mask;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Msg;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsLabelTypeForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String name;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 20)
-    @Mask(mask = "^[a-zA-Z0-9_-]+$", msg = @Msg(key = "errors.alphaDigitOnly"))
-    public String value;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String includedPaths;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String excludedPaths;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        name = null;
-        value = null;
-        includedPaths = null;
-        excludedPaths = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 99
src/main/java/org/codelibs/fess/crud/form/admin/BsOverlappingHostForm.java

@@ -1,99 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsOverlappingHostForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1000)
-    public String regularName;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1000)
-    public String overlappingName;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        regularName = null;
-        overlappingName = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 103
src/main/java/org/codelibs/fess/crud/form/admin/BsPathMappingForm.java

@@ -1,103 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsPathMappingForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1000)
-    public String regex;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1000)
-    public String replacement;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String processType;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        regex = null;
-        replacement = null;
-        processType = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 98
src/main/java/org/codelibs/fess/crud/form/admin/BsRequestHeaderForm.java

@@ -1,98 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsRequestHeaderForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String name;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1000)
-    public String value;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @LongType
-    public String webCrawlingConfigId;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        name = null;
-        value = null;
-        webCrawlingConfigId = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 102
src/main/java/org/codelibs/fess/crud/form/admin/BsRoleTypeForm.java

@@ -1,102 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Mask;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Msg;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsRoleTypeForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String name;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 20)
-    @Mask(mask = "^[a-zA-Z0-9_-| ]+$", msg = @Msg(key = "errors.alphaDigitSpaceOnly"))
-    public String value;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        name = null;
-        value = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 125
src/main/java/org/codelibs/fess/crud/form/admin/BsScheduledJobForm.java

@@ -1,125 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.codelibs.fess.annotation.CronExpression;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsScheduledJobForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String name;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String target;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    @CronExpression
-    public String cronExpression;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String scriptType;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String scriptData;
-
-    // ignore
-    public String crawler;
-
-    // ignore
-    public String jobLogging;
-
-    // ignore
-    public String available;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntegerType
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        name = null;
-        target = null;
-        cronExpression = null;
-        scriptType = null;
-        scriptData = null;
-        crawler = null;
-        jobLogging = null;
-        available = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 98
src/main/java/org/codelibs/fess/crud/form/admin/BsSearchLogForm.java

@@ -1,98 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsSearchLogForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    public String searchWord;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @DateType
-    public String requestedTime;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntegerType
-    public String responseTime;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @LongType
-    public String hitCount;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntegerType
-    public String queryOffset;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntegerType
-    public String queryPageSize;
-
-    public String userAgent;
-
-    public String referer;
-
-    public String clientIp;
-
-    public String userSessionId;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String accessType;
-
-    @LongType
-    public String userId;
-
-    public void initialize() {
-
-        id = null;
-        searchWord = null;
-        requestedTime = null;
-        responseTime = null;
-        hitCount = null;
-        queryOffset = null;
-        queryPageSize = null;
-        userAgent = null;
-        referer = null;
-        clientIp = null;
-        userSessionId = null;
-        accessType = null;
-        userId = null;
-
-    }
-
-}

+ 0 - 92
src/main/java/org/codelibs/fess/crud/form/admin/BsSuggestBadWordForm.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsSuggestBadWordForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String suggestWord;
-
-    public String targetRole;
-
-    public String targetLabel;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType
-    public String updatedTime;
-
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        suggestWord = null;
-        targetRole = null;
-        targetLabel = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 101
src/main/java/org/codelibs/fess/crud/form/admin/BsSuggestElevateWordForm.java

@@ -1,101 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsSuggestElevateWordForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String suggestWord;
-
-    public String reading;
-
-    public String targetRole;
-
-    public String targetLabel;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String boost;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType
-    public String updatedTime;
-
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        suggestWord = null;
-        reading = null;
-        targetRole = null;
-        targetLabel = null;
-        boost = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 65
src/main/java/org/codelibs/fess/crud/form/admin/BsUserInfoForm.java

@@ -1,65 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsUserInfoForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    public String code;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    public void initialize() {
-
-        id = null;
-        code = null;
-        createdTime = null;
-        updatedTime = null;
-
-    }
-
-}

+ 0 - 118
src/main/java/org/codelibs/fess/crud/form/admin/BsWebAuthenticationForm.java

@@ -1,118 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsWebAuthenticationForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String hostname;
-
-    @IntRange(min = -1, max = 2147483647)
-    public String port;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String authRealm;
-
-    @Maxbytelength(maxbytelength = 10)
-    public String protocolScheme;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 100)
-    public String username;
-
-    @Maxbytelength(maxbytelength = 100)
-    public String password;
-
-    @Maxbytelength(maxbytelength = 1000)
-    public String parameters;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @LongType
-    public String webCrawlingConfigId;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        hostname = null;
-        port = null;
-        authRealm = null;
-        protocolScheme = null;
-        username = null;
-        password = null;
-        parameters = null;
-        webCrawlingConfigId = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 0 - 155
src/main/java/org/codelibs/fess/crud/form/admin/BsWebCrawlingConfigForm.java

@@ -1,155 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.form.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.Constants;
-import org.codelibs.fess.annotation.UriType;
-import org.seasar.struts.annotation.DateType;
-import org.seasar.struts.annotation.IntRange;
-import org.seasar.struts.annotation.IntegerType;
-import org.seasar.struts.annotation.LongRange;
-import org.seasar.struts.annotation.LongType;
-import org.seasar.struts.annotation.Maxbytelength;
-import org.seasar.struts.annotation.Required;
-
-public abstract class BsWebCrawlingConfigForm {
-    @IntegerType
-    public String pageNumber;
-
-    public Map<String, String> searchParams = new HashMap<String, String>();
-
-    @IntegerType
-    public int crudMode;
-
-    public String getCurrentPageNumber() {
-        return pageNumber;
-    }
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @LongType
-    public String id;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 200)
-    public String name;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @UriType(protocols = "http:,https:")
-    @Maxbytelength(maxbytelength = 4000)
-    public String urls;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String includedUrls;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String excludedUrls;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String includedDocUrls;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String excludedDocUrls;
-
-    @Maxbytelength(maxbytelength = 4000)
-    public String configParameter;
-
-    @IntRange(min = 0, max = 2147483647)
-    public String depth;
-
-    @LongRange(min = 0, max = 9223372036854775807l)
-    public String maxAccessCount;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 200)
-    public String userAgent;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String numOfThread;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String intervalTime;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String boost;
-
-    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 1)
-    public String available;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntRange(min = 0, max = 2147483647)
-    public String sortOrder;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @Maxbytelength(maxbytelength = 255)
-    public String createdBy;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String createdTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String updatedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String updatedTime;
-
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
-    @Required(target = "confirmfromupdate,update,delete")
-    @IntegerType
-    public String versionNo;
-
-    public void initialize() {
-
-        id = null;
-        name = null;
-        urls = null;
-        includedUrls = null;
-        excludedUrls = null;
-        includedDocUrls = null;
-        excludedDocUrls = null;
-        configParameter = null;
-        depth = null;
-        maxAccessCount = null;
-        userAgent = null;
-        numOfThread = null;
-        intervalTime = null;
-        boost = "1";
-        available = null;
-        sortOrder = null;
-        createdBy = null;
-        createdTime = null;
-        updatedBy = null;
-        updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
-        versionNo = null;
-
-    }
-
-}

+ 90 - 4
src/main/java/org/codelibs/fess/web/admin/DataCrawlingConfigForm.java

@@ -19,11 +19,18 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsDataCrawlingConfigForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class DataCrawlingConfigForm extends BsDataCrawlingConfigForm implements Serializable {
+public class DataCrawlingConfigForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -31,9 +38,88 @@ public class DataCrawlingConfigForm extends BsDataCrawlingConfigForm implements
 
     public String[] labelTypeIds;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 200)
+    public String name;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 4000)
+    public String handlerName;
+
+    public String handlerParameter;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String handlerScript;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String boost;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1)
+    public String available;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        name = null;
+        handlerName = null;
+        handlerParameter = null;
+        handlerScript = null;
+        boost = "1";
+        available = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         sortOrder = "0";
         // Temporary data
         createdBy = "system";

+ 53 - 4
src/main/java/org/codelibs/fess/web/admin/FailureUrlForm.java

@@ -17,10 +17,16 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.codelibs.fess.crud.form.admin.BsFailureUrlForm;
+import org.codelibs.fess.Constants;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Required;
 
-public class FailureUrlForm extends BsFailureUrlForm implements Serializable {
+public class FailureUrlForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -28,8 +34,51 @@ public class FailureUrlForm extends BsFailureUrlForm implements Serializable {
 
     public String fileConfigName;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String url;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String threadName;
+
+    public String errorName;
+
+    public String errorLog;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntegerType
+    public String errorCount;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String lastAccessTime;
+
+    public String configId;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        url = null;
+        threadName = null;
+        errorName = null;
+        errorLog = null;
+        errorCount = null;
+        lastAccessTime = null;
+        configId = null;
     }
+
 }

+ 40 - 4
src/main/java/org/codelibs/fess/web/admin/FavoriteLogForm.java

@@ -17,17 +17,53 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.codelibs.fess.crud.form.admin.BsFavoriteLogForm;
+import org.codelibs.fess.Constants;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Required;
 
-public class FavoriteLogForm extends BsFavoriteLogForm implements Serializable {
+public class FavoriteLogForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     public String csvEncoding;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @LongType
+    public String userId;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String url;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        userId = null;
+        url = null;
+        createdTime = null;
     }
+
 }

+ 89 - 4
src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java

@@ -19,19 +19,104 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsFileAuthenticationForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class FileAuthenticationForm extends BsFileAuthenticationForm implements Serializable {
+public class FileAuthenticationForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String hostname;
+
+    @IntRange(min = -1, max = 2147483647)
+    public String port;
+
+    @Maxbytelength(maxbytelength = 10)
+    public String protocolScheme;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String username;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String password;
+
+    @Maxbytelength(maxbytelength = 1000)
+    public String parameters;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @LongType
+    public String fileCrawlingConfigId;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        hostname = null;
+        port = null;
+        protocolScheme = null;
+        username = null;
+        password = null;
+        parameters = null;
+        fileCrawlingConfigId = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
+
         createdBy = "system";
         final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT);
         createdTime = sdf.format(new Date());
     }
+
 }

+ 124 - 4
src/main/java/org/codelibs/fess/web/admin/FileCrawlingConfigForm.java

@@ -19,11 +19,20 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsFileCrawlingConfigForm;
+import org.codelibs.fess.annotation.UriType;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongRange;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class FileCrawlingConfigForm extends BsFileCrawlingConfigForm implements Serializable {
+public class FileCrawlingConfigForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -31,9 +40,120 @@ public class FileCrawlingConfigForm extends BsFileCrawlingConfigForm implements
 
     public String[] labelTypeIds;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 200)
+    public String name;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @UriType(protocols = "file:,smb:")
+    @Maxbytelength(maxbytelength = 4000)
+    public String paths;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String includedPaths;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String excludedPaths;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String includedDocPaths;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String excludedDocPaths;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String configParameter;
+
+    @IntRange(min = 0, max = 2147483647)
+    public String depth;
+
+    @LongRange(min = 0, max = 9223372036854775807l)
+    public String maxAccessCount;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String numOfThread;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String intervalTime;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String boost;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1)
+    public String available;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        name = null;
+        paths = null;
+        includedPaths = null;
+        excludedPaths = null;
+        includedDocPaths = null;
+        excludedDocPaths = null;
+        configParameter = null;
+        depth = null;
+        maxAccessCount = null;
+        numOfThread = null;
+        intervalTime = null;
+        boost = "1";
+        available = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         sortOrder = "0";
         numOfThread = Integer.toString(Constants.DEFAULT_NUM_OF_THREAD_FOR_FS);
         intervalTime = Integer.toString(Constants.DEFAULT_INTERVAL_TIME_FOR_FS);

+ 56 - 4
src/main/java/org/codelibs/fess/web/admin/JobLogForm.java

@@ -17,15 +17,67 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.codelibs.fess.crud.form.admin.BsJobLogForm;
+import org.codelibs.fess.Constants;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Required;
 
-public class JobLogForm extends BsJobLogForm implements Serializable {
+public class JobLogForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String jobName;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String jobStatus;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String target;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String scriptType;
+
+    public String scriptData;
+
+    public String scriptResult;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String startTime;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String endTime;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        jobName = null;
+        jobStatus = null;
+        target = null;
+        scriptType = null;
+        scriptData = null;
+        scriptResult = null;
+        startTime = null;
+        endTime = null;
     }
 }

+ 78 - 4
src/main/java/org/codelibs/fess/web/admin/KeyMatchForm.java

@@ -17,16 +17,90 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.codelibs.fess.crud.form.admin.BsKeyMatchForm;
+import org.codelibs.fess.Constants;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class KeyMatchForm extends BsKeyMatchForm implements Serializable {
+public class KeyMatchForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String term;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 4000)
+    public String query;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntegerType
+    @IntRange(min = 0, max = 2147483647)
+    public String maxSize;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String boost;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        term = null;
+        query = null;
+        maxSize = null;
+        boost = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         maxSize = "10";
         boost = "100.0";
     }

+ 83 - 4
src/main/java/org/codelibs/fess/web/admin/LabelTypeForm.java

@@ -19,19 +19,98 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsLabelTypeForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Mask;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Msg;
+import org.seasar.struts.annotation.Required;
 
-public class LabelTypeForm extends BsLabelTypeForm implements Serializable {
+public class LabelTypeForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     public String[] roleTypeIds;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String name;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 20)
+    @Mask(mask = "^[a-zA-Z0-9_-]+$", msg = @Msg(key = "errors.alphaDigitOnly"))
+    public String value;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String includedPaths;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String excludedPaths;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        name = null;
+        value = null;
+        includedPaths = null;
+        excludedPaths = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         sortOrder = "0";
         // Temporary data
         createdBy = "system";

+ 72 - 4
src/main/java/org/codelibs/fess/web/admin/OverlappingHostForm.java

@@ -19,17 +19,85 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsOverlappingHostForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class OverlappingHostForm extends BsOverlappingHostForm implements Serializable {
+public class OverlappingHostForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1000)
+    public String regularName;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1000)
+    public String overlappingName;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        regularName = null;
+        overlappingName = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         sortOrder = "0";
         // Temporary data
         createdBy = "system";

+ 76 - 4
src/main/java/org/codelibs/fess/web/admin/PathMappingForm.java

@@ -19,17 +19,89 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsPathMappingForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class PathMappingForm extends BsPathMappingForm implements Serializable {
+public class PathMappingForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1000)
+    public String regex;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1000)
+    public String replacement;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String processType;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        regex = null;
+        replacement = null;
+        processType = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         sortOrder = "0";
         // Temporary data
         createdBy = "system";

+ 71 - 4
src/main/java/org/codelibs/fess/web/admin/RequestHeaderForm.java

@@ -19,17 +19,84 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsRequestHeaderForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class RequestHeaderForm extends BsRequestHeaderForm implements Serializable {
+public class RequestHeaderForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String name;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1000)
+    public String value;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @LongType
+    public String webCrawlingConfigId;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        name = null;
+        value = null;
+        webCrawlingConfigId = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         createdBy = "system";
         final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT);
         createdTime = sdf.format(new Date());

+ 75 - 4
src/main/java/org/codelibs/fess/web/admin/RoleTypeForm.java

@@ -19,17 +19,88 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsRoleTypeForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Mask;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Msg;
+import org.seasar.struts.annotation.Required;
 
-public class RoleTypeForm extends BsRoleTypeForm implements Serializable {
+public class RoleTypeForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String name;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 20)
+    @Mask(mask = "^[a-zA-Z0-9_-| ]+$", msg = @Msg(key = "errors.alphaDigitSpaceOnly"))
+    public String value;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        name = null;
+        value = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         sortOrder = "0";
         // Temporary data
         createdBy = "system";

+ 98 - 5
src/main/java/org/codelibs/fess/web/admin/ScheduledJobForm.java

@@ -19,18 +19,111 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsScheduledJobForm;
+import org.codelibs.fess.annotation.CronExpression;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class ScheduledJobForm extends BsScheduledJobForm implements Serializable {
+public class ScheduledJobForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String name;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String target;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    @CronExpression
+    public String cronExpression;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String scriptType;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String scriptData;
+
+    // ignore
+    public String crawler;
+
+    // ignore
+    public String jobLogging;
+
+    // ignore
+    public String available;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntegerType
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
-        super.initialize();
+        id = null;
+        name = null;
+        target = null;
+        cronExpression = null;
+        scriptType = null;
+        scriptData = null;
+        crawler = null;
+        jobLogging = null;
+        available = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         target = Constants.DEFAULT_JOB_TARGET;
         cronExpression = Constants.DEFAULT_CRON_EXPRESSION;
         scriptType = Constants.DEFAULT_JOB_SCRIPT_TYPE;

+ 72 - 4
src/main/java/org/codelibs/fess/web/admin/SearchLogForm.java

@@ -17,12 +17,17 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import org.codelibs.fess.crud.form.admin.BsSearchLogForm;
 import org.codelibs.fess.db.exentity.ClickLog;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Required;
 
-public class SearchLogForm extends BsSearchLogForm implements Serializable {
+public class SearchLogForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -30,8 +35,71 @@ public class SearchLogForm extends BsSearchLogForm implements Serializable {
 
     public List<ClickLog> clickLogList;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    public String searchWord;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @DateType
+    public String requestedTime;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntegerType
+    public String responseTime;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @LongType
+    public String hitCount;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntegerType
+    public String queryOffset;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntegerType
+    public String queryPageSize;
+
+    public String userAgent;
+
+    public String referer;
+
+    public String clientIp;
+
+    public String userSessionId;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String accessType;
+
+    @LongType
+    public String userId;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        searchWord = null;
+        requestedTime = null;
+        responseTime = null;
+        hitCount = null;
+        queryOffset = null;
+        queryPageSize = null;
+        userAgent = null;
+        referer = null;
+        clientIp = null;
+        userSessionId = null;
+        accessType = null;
+        userId = null;
     }
 }

+ 65 - 4
src/main/java/org/codelibs/fess/web/admin/SuggestBadWordForm.java

@@ -17,20 +17,81 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.struts.upload.FormFile;
-import org.codelibs.fess.crud.form.admin.BsSuggestBadWordForm;
+import org.codelibs.fess.Constants;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
 import org.seasar.struts.annotation.Required;
 
-public class SuggestBadWordForm extends BsSuggestBadWordForm implements Serializable {
+public class SuggestBadWordForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String suggestWord;
+
+    public String targetRole;
+
+    public String targetLabel;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType
+    public String updatedTime;
+
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     @Required(target = "upload")
     public FormFile suggestBadWordFile;
 
-    @Override
     public void initialize() {
-        super.initialize();
+        id = null;
+        suggestWord = null;
+        targetRole = null;
+        targetLabel = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
     }
 }

+ 74 - 4
src/main/java/org/codelibs/fess/web/admin/SuggestElevateWordForm.java

@@ -17,21 +17,91 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.struts.upload.FormFile;
-import org.codelibs.fess.crud.form.admin.BsSuggestElevateWordForm;
+import org.codelibs.fess.Constants;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
 import org.seasar.struts.annotation.Required;
 
-public class SuggestElevateWordForm extends BsSuggestElevateWordForm implements Serializable {
+public class SuggestElevateWordForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @Required(target = "upload")
     public FormFile suggestElevateWordFile;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String suggestWord;
+
+    public String reading;
+
+    public String targetRole;
+
+    public String targetLabel;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String boost;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType
+    public String updatedTime;
+
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        suggestWord = null;
+        reading = null;
+        targetRole = null;
+        targetLabel = null;
+        boost = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         boost = "100";
     }
 }

+ 39 - 4
src/main/java/org/codelibs/fess/web/admin/UserInfoForm.java

@@ -17,15 +17,50 @@
 package org.codelibs.fess.web.admin;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.codelibs.fess.crud.form.admin.BsUserInfoForm;
+import org.codelibs.fess.Constants;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Required;
 
-public class UserInfoForm extends BsUserInfoForm implements Serializable {
+public class UserInfoForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    public String code;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        code = null;
+        createdTime = null;
+        updatedTime = null;
     }
 }

+ 91 - 4
src/main/java/org/codelibs/fess/web/admin/WebAuthenticationForm.java

@@ -19,17 +19,104 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsWebAuthenticationForm;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class WebAuthenticationForm extends BsWebAuthenticationForm implements Serializable {
+public class WebAuthenticationForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String hostname;
+
+    @IntRange(min = -1, max = 2147483647)
+    public String port;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String authRealm;
+
+    @Maxbytelength(maxbytelength = 10)
+    public String protocolScheme;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 100)
+    public String username;
+
+    @Maxbytelength(maxbytelength = 100)
+    public String password;
+
+    @Maxbytelength(maxbytelength = 1000)
+    public String parameters;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @LongType
+    public String webCrawlingConfigId;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        hostname = null;
+        port = null;
+        authRealm = null;
+        protocolScheme = null;
+        username = null;
+        password = null;
+        parameters = null;
+        webCrawlingConfigId = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         createdBy = "system";
         final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT);
         createdTime = sdf.format(new Date());

+ 128 - 4
src/main/java/org/codelibs/fess/web/admin/WebCrawlingConfigForm.java

@@ -19,13 +19,22 @@ package org.codelibs.fess.web.admin;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.codelibs.core.util.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.crud.form.admin.BsWebCrawlingConfigForm;
+import org.codelibs.fess.annotation.UriType;
 import org.codelibs.fess.util.ComponentUtil;
+import org.seasar.struts.annotation.DateType;
+import org.seasar.struts.annotation.IntRange;
+import org.seasar.struts.annotation.IntegerType;
+import org.seasar.struts.annotation.LongRange;
+import org.seasar.struts.annotation.LongType;
+import org.seasar.struts.annotation.Maxbytelength;
+import org.seasar.struts.annotation.Required;
 
-public class WebCrawlingConfigForm extends BsWebCrawlingConfigForm implements Serializable {
+public class WebCrawlingConfigForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -33,9 +42,124 @@ public class WebCrawlingConfigForm extends BsWebCrawlingConfigForm implements Se
 
     public String[] labelTypeIds;
 
-    @Override
+    @IntegerType
+    public String pageNumber;
+
+    public Map<String, String> searchParams = new HashMap<String, String>();
+
+    @IntegerType
+    public int crudMode;
+
+    public String getCurrentPageNumber() {
+        return pageNumber;
+    }
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @LongType
+    public String id;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 200)
+    public String name;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @UriType(protocols = "http:,https:")
+    @Maxbytelength(maxbytelength = 4000)
+    public String urls;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String includedUrls;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String excludedUrls;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String includedDocUrls;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String excludedDocUrls;
+
+    @Maxbytelength(maxbytelength = 4000)
+    public String configParameter;
+
+    @IntRange(min = 0, max = 2147483647)
+    public String depth;
+
+    @LongRange(min = 0, max = 9223372036854775807l)
+    public String maxAccessCount;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 200)
+    public String userAgent;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String numOfThread;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String intervalTime;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String boost;
+
+    @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 1)
+    public String available;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntRange(min = 0, max = 2147483647)
+    public String sortOrder;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @Maxbytelength(maxbytelength = 255)
+    public String createdBy;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String createdTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String updatedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String updatedTime;
+
+    @Maxbytelength(maxbytelength = 255)
+    public String deletedBy;
+
+    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    public String deletedTime;
+
+    @Required(target = "confirmfromupdate,update,delete")
+    @IntegerType
+    public String versionNo;
+
     public void initialize() {
-        super.initialize();
+        id = null;
+        name = null;
+        urls = null;
+        includedUrls = null;
+        excludedUrls = null;
+        includedDocUrls = null;
+        excludedDocUrls = null;
+        configParameter = null;
+        depth = null;
+        maxAccessCount = null;
+        userAgent = null;
+        numOfThread = null;
+        intervalTime = null;
+        boost = "1";
+        available = null;
+        sortOrder = null;
+        createdBy = null;
+        createdTime = null;
+        updatedBy = null;
+        updatedTime = null;
+        deletedBy = null;
+        deletedTime = null;
+        versionNo = null;
         sortOrder = "0";
         userAgent = ComponentUtil.getUserAgentName();
         if (StringUtil.isBlank(userAgent)) {