Shinsuke Sugaya пре 11 година
родитељ
комит
c65bc25a41
78 измењених фајлова са 483 додато и 2293 уклоњено
  1. 2 6
      src/main/config/h2/fess.ddl
  2. 2 6
      src/main/config/mysql/fess.ddl
  3. 3 7
      src/main/config/oracle/fess.ddl
  4. 12 24
      src/main/config/tablemeta.properties
  5. 0 6
      src/main/java/jp/sf/fess/Constants.java
  6. 7 0
      src/main/java/jp/sf/fess/action/admin/DataCrawlingConfigAction.java
  7. 2 1
      src/main/java/jp/sf/fess/action/admin/FileCrawlingConfigAction.java
  8. 1 1
      src/main/java/jp/sf/fess/action/admin/WebCrawlingConfigAction.java
  9. 2 1
      src/main/java/jp/sf/fess/api/json/JsonApiManager.java
  10. 2 1
      src/main/java/jp/sf/fess/api/xml/XmlApiManager.java
  11. 2 7
      src/main/java/jp/sf/fess/crud/form/admin/BsFailureUrlForm.java
  12. 3 58
      src/main/java/jp/sf/fess/db/bsbhv/BsFailureUrlBhv.java
  13. 2 134
      src/main/java/jp/sf/fess/db/bsbhv/BsFileCrawlingConfigBhv.java
  14. 2 134
      src/main/java/jp/sf/fess/db/bsbhv/BsWebCrawlingConfigBhv.java
  15. 18 105
      src/main/java/jp/sf/fess/db/bsentity/BsFailureUrl.java
  16. 2 35
      src/main/java/jp/sf/fess/db/bsentity/BsFileCrawlingConfig.java
  17. 2 35
      src/main/java/jp/sf/fess/db/bsentity/BsWebCrawlingConfig.java
  18. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/BrowserTypeDbm.java
  19. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/ClickLogDbm.java
  20. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/CrawlingSessionDbm.java
  21. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/CrawlingSessionInfoDbm.java
  22. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToBrowserTypeMappingDbm.java
  23. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToLabelTypeMappingDbm.java
  24. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToRoleTypeMappingDbm.java
  25. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataCrawlingConfigDbm.java
  26. 11 53
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/FailureUrlDbm.java
  27. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/FavoriteLogDbm.java
  28. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileAuthenticationDbm.java
  29. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToBrowserTypeMappingDbm.java
  30. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToLabelTypeMappingDbm.java
  31. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToRoleTypeMappingDbm.java
  32. 2 9
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileCrawlingConfigDbm.java
  33. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/JobLogDbm.java
  34. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/LabelTypeDbm.java
  35. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/LabelTypeToRoleTypeMappingDbm.java
  36. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/OverlappingHostDbm.java
  37. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/PathMappingDbm.java
  38. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/RequestHeaderDbm.java
  39. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/RoleTypeDbm.java
  40. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/ScheduledJobDbm.java
  41. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/SearchFieldLogDbm.java
  42. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/SearchLogDbm.java
  43. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/UserInfoDbm.java
  44. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebAuthenticationDbm.java
  45. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToBrowserTypeMappingDbm.java
  46. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToLabelTypeMappingDbm.java
  47. 1 1
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToRoleTypeMappingDbm.java
  48. 2 9
      src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebCrawlingConfigDbm.java
  49. 3 196
      src/main/java/jp/sf/fess/db/cbean/bs/BsFailureUrlCB.java
  50. 0 35
      src/main/java/jp/sf/fess/db/cbean/bs/BsFileCrawlingConfigCB.java
  51. 0 35
      src/main/java/jp/sf/fess/db/cbean/bs/BsWebCrawlingConfigCB.java
  52. 85 279
      src/main/java/jp/sf/fess/db/cbean/cq/bs/AbstractBsFailureUrlCQ.java
  53. 0 166
      src/main/java/jp/sf/fess/db/cbean/cq/bs/AbstractBsFileCrawlingConfigCQ.java
  54. 0 166
      src/main/java/jp/sf/fess/db/cbean/cq/bs/AbstractBsWebCrawlingConfigCQ.java
  55. 13 219
      src/main/java/jp/sf/fess/db/cbean/cq/bs/BsFailureUrlCQ.java
  56. 0 128
      src/main/java/jp/sf/fess/db/cbean/cq/bs/BsFileCrawlingConfigCQ.java
  57. 0 128
      src/main/java/jp/sf/fess/db/cbean/cq/bs/BsWebCrawlingConfigCQ.java
  58. 2 33
      src/main/java/jp/sf/fess/db/cbean/cq/ciq/FailureUrlCIQ.java
  59. 0 44
      src/main/java/jp/sf/fess/db/cbean/cq/ciq/FileCrawlingConfigCIQ.java
  60. 0 44
      src/main/java/jp/sf/fess/db/cbean/cq/ciq/WebCrawlingConfigCIQ.java
  61. 0 31
      src/main/java/jp/sf/fess/db/cbean/nss/FailureUrlNss.java
  62. 24 0
      src/main/java/jp/sf/fess/db/exentity/CrawlingConfig.java
  63. 1 4
      src/main/java/jp/sf/fess/db/exentity/DataCrawlingConfig.java
  64. 25 8
      src/main/java/jp/sf/fess/db/exentity/FailureUrl.java
  65. 1 4
      src/main/java/jp/sf/fess/db/exentity/FileCrawlingConfig.java
  66. 1 4
      src/main/java/jp/sf/fess/db/exentity/WebCrawlingConfig.java
  67. 4 4
      src/main/java/jp/sf/fess/ds/impl/AbstractDataStoreImpl.java
  68. 46 6
      src/main/java/jp/sf/fess/ds/impl/CsvDataStoreImpl.java
  69. 3 1
      src/main/java/jp/sf/fess/ds/impl/DatabaseDataStoreImpl.java
  70. 9 7
      src/main/java/jp/sf/fess/ds/impl/FileListDataStoreImpl.java
  71. 73 13
      src/main/java/jp/sf/fess/helper/CrawlingConfigHelper.java
  72. 5 62
      src/main/java/jp/sf/fess/helper/RobotLogHelper.java
  73. 12 2
      src/main/java/jp/sf/fess/helper/SystemHelper.java
  74. 2 2
      src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java
  75. 16 0
      src/main/java/jp/sf/fess/helper/impl/SearchLogHelperImpl.java
  76. 49 12
      src/main/java/jp/sf/fess/service/FailureUrlService.java
  77. 2 0
      src/main/java/jp/sf/fess/service/SearchLogService.java
  78. BIN
      src/main/webapp/WEB-INF/db/fess.h2.db

+ 2 - 6
src/main/config/h2/fess.ddl

@@ -460,10 +460,7 @@ CREATE TABLE FAILURE_URL(
   ERROR_LOG VARCHAR(4000),
   ERROR_COUNT INTEGER NOT NULL,
   LAST_ACCESS_TIME TIMESTAMP NOT NULL,
-  WEB_CONFIG_ID BIGINT,
-  FILE_CONFIG_ID BIGINT,
-  FOREIGN KEY (FILE_CONFIG_ID) REFERENCES FILE_CRAWLING_CONFIG (ID),
-  FOREIGN KEY (WEB_CONFIG_ID) REFERENCES WEB_CRAWLING_CONFIG (ID)
+  CONFIG_ID VARCHAR(100)
 );
 
 /**********************************/
@@ -542,8 +539,7 @@ CREATE INDEX IDX_SEARCH_LOG_BY_USER_ID ON SEARCH_LOG (USER_ID);
 CREATE INDEX IDX_CLICK_LOG_URL ON CLICK_LOG (URL);
 
 CREATE INDEX IDX_FAILURE_URL_FOR_LIST ON FAILURE_URL (URL, LAST_ACCESS_TIME, ERROR_NAME, ERROR_COUNT);
-CREATE INDEX IDX_FAILURE_URL_BY_WEB_CONFIG_ID ON FAILURE_URL (WEB_CONFIG_ID);
-CREATE INDEX IDX_FAILURE_URL_BY_FILE_CONFIG_ID ON FAILURE_URL (FILE_CONFIG_ID);
+CREATE INDEX IDX_FAILURE_URL_BY_CONFIG_ID ON FAILURE_URL (CONFIG_ID);
 
 CREATE INDEX IDX_SEARCH_FIELD_LOG_NAME ON SEARCH_FIELD_LOG (NAME);
 

+ 2 - 6
src/main/config/mysql/fess.ddl

@@ -460,10 +460,7 @@ CREATE TABLE FAILURE_URL(
   ERROR_LOG TEXT,
   ERROR_COUNT INTEGER NOT NULL,
   LAST_ACCESS_TIME TIMESTAMP NOT NULL,
-  WEB_CONFIG_ID BIGINT,
-  FILE_CONFIG_ID BIGINT,
-  FOREIGN KEY (FILE_CONFIG_ID) REFERENCES FILE_CRAWLING_CONFIG (ID),
-  FOREIGN KEY (WEB_CONFIG_ID) REFERENCES WEB_CRAWLING_CONFIG (ID)
+  CONFIG_ID VARCHAR(100)
 );
 
 /**********************************/
@@ -542,8 +539,7 @@ CREATE INDEX IDX_SEARCH_LOG_BY_USER_ID ON SEARCH_LOG (USER_ID);
 CREATE INDEX IDX_CLICK_LOG_URL ON CLICK_LOG (URL(255));
 
 CREATE INDEX IDX_FAILURE_URL_FOR_LIST ON FAILURE_URL (URL(200), LAST_ACCESS_TIME, ERROR_NAME(100), ERROR_COUNT);
-CREATE INDEX IDX_FAILURE_URL_BY_WEB_CONFIG_ID ON FAILURE_URL (WEB_CONFIG_ID);
-CREATE INDEX IDX_FAILURE_URL_BY_FILE_CONFIG_ID ON FAILURE_URL (FILE_CONFIG_ID);
+CREATE INDEX IDX_FAILURE_URL_BY_CONFIG_ID ON FAILURE_URL (CONFIG_ID);
 
 CREATE INDEX IDX_SEARCH_FIELD_LOG_NAME ON SEARCH_FIELD_LOG (NAME);
 

+ 3 - 7
src/main/config/oracle/fess.ddl

@@ -462,12 +462,9 @@ CREATE TABLE "FAILURE_URL"(
   "ERROR_LOG" VARCHAR2(4000),
   "ERROR_COUNT" NUMBER(9,0) NOT NULL,
   "LAST_ACCESS_TIME" TIMESTAMP NOT NULL,
-  "WEB_CONFIG_ID" NUMBER(18,0),
-  "FILE_CONFIG_ID" NUMBER(18,0),
+  "CONFIG_ID" VARCHAR2(100),
 
-  CONSTRAINT "FAILURE_URL_PK" PRIMARY KEY ("ID") ENABLE,
-  FOREIGN KEY (FILE_CONFIG_ID) REFERENCES FILE_CRAWLING_CONFIG (ID),
-  FOREIGN KEY (WEB_CONFIG_ID) REFERENCES WEB_CRAWLING_CONFIG (ID)
+  CONSTRAINT "FAILURE_URL_PK" PRIMARY KEY ("ID") ENABLE
 );
 
 CREATE TABLE "FILE_AUTHENTICATION"(
@@ -543,8 +540,7 @@ CREATE INDEX IDX_S_L_BY_USID ON SEARCH_LOG (USER_ID);
 CREATE INDEX IDX_C_L_URL ON CLICK_LOG (URL);
 
 CREATE INDEX IDX_F_U_FOR_L ON FAILURE_URL (URL, LAST_ACCESS_TIME, ERROR_NAME, ERROR_COUNT);
-CREATE INDEX IDX_F_U_BY_W_C_ID ON FAILURE_URL (WEB_CONFIG_ID);
-CREATE INDEX IDX_F_U_BY_F_C_ID ON FAILURE_URL (FILE_CONFIG_ID);
+CREATE INDEX IDX_F_U_BY_W_C_ID ON FAILURE_URL (CONFIG_ID);
 
 CREATE INDEX IDX_S_F_LOG_NAME ON SEARCH_FIELD_LOG (NAME);
 

+ 12 - 24
src/main/config/tablemeta.properties

@@ -491,30 +491,18 @@ failureUrl.lastAccessTime.floatTypeParam=
 failureUrl.lastAccessTime.doubleTypeParam=
 failureUrl.lastAccessTime.dateTypeParam=(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
 failureUrl.lastAccessTime.defaultValue=
-failureUrl.webConfigId.requiredParam=
-failureUrl.webConfigId.additionalAnnotation=
-failureUrl.webConfigId.annotation=
-failureUrl.webConfigId.enableJavaType=true
-failureUrl.webConfigId.longTypeParam=
-failureUrl.webConfigId.integerTypeParam=
-failureUrl.webConfigId.shortTypeParam=
-failureUrl.webConfigId.byteTypeParam=
-failureUrl.webConfigId.floatTypeParam=
-failureUrl.webConfigId.doubleTypeParam=
-failureUrl.webConfigId.dateTypeParam=
-failureUrl.webConfigId.defaultValue=
-failureUrl.fileConfigId.requiredParam=
-failureUrl.fileConfigId.additionalAnnotation=
-failureUrl.fileConfigId.annotation=
-failureUrl.fileConfigId.enableJavaType=true
-failureUrl.fileConfigId.longTypeParam=
-failureUrl.fileConfigId.integerTypeParam=
-failureUrl.fileConfigId.shortTypeParam=
-failureUrl.fileConfigId.byteTypeParam=
-failureUrl.fileConfigId.floatTypeParam=
-failureUrl.fileConfigId.doubleTypeParam=
-failureUrl.fileConfigId.dateTypeParam=
-failureUrl.fileConfigId.defaultValue=
+failureUrl.configId.requiredParam=
+failureUrl.configId.additionalAnnotation=
+failureUrl.configId.annotation=
+failureUrl.configId.enableJavaType=true
+failureUrl.configId.longTypeParam=
+failureUrl.configId.integerTypeParam=
+failureUrl.configId.shortTypeParam=
+failureUrl.configId.byteTypeParam=
+failureUrl.configId.floatTypeParam=
+failureUrl.configId.doubleTypeParam=
+failureUrl.configId.dateTypeParam=
+failureUrl.configId.defaultValue=
 
 favoriteLog.ignored=false
 favoriteLog.importPackages=import jp.sf.fess.Constants;import jp.sf.fess.annotation.UriType;import org.seasar.struts.annotation.Maxbytelength;import org.seasar.struts.annotation.IntRange;import org.seasar.struts.annotation.LongRange;import org.seasar.struts.annotation.FloatRange;

+ 0 - 6
src/main/java/jp/sf/fess/Constants.java

@@ -318,12 +318,6 @@ public class Constants extends CoreLibConstants {
 
     public static final int EXIT_FAIL = 1;
 
-    public static final String DATA_CONFIG_ID_PREFIX = "D";
-
-    public static final String FILE_CONFIG_ID_PREFIX = "F";
-
-    public static final String WEB_CONFIG_ID_PREFIX = "W";
-
     public static final String DOC_ID = "docId";
 
 }

+ 7 - 0
src/main/java/jp/sf/fess/action/admin/DataCrawlingConfigAction.java

@@ -36,6 +36,7 @@ import jp.sf.fess.db.exentity.RoleType;
 import jp.sf.fess.ds.DataStoreFactory;
 import jp.sf.fess.helper.SystemHelper;
 import jp.sf.fess.service.BrowserTypeService;
+import jp.sf.fess.service.FailureUrlService;
 import jp.sf.fess.service.LabelTypeService;
 import jp.sf.fess.service.RoleTypeService;
 import jp.sf.fess.util.FessBeans;
@@ -65,6 +66,9 @@ public class DataCrawlingConfigAction extends BsDataCrawlingConfigAction {
     @Resource
     protected DataStoreFactory dataStoreFactory;
 
+    @Resource
+    protected FailureUrlService failureUrlService;
+
     @Resource
     protected SystemHelper systemHelper;
 
@@ -142,6 +146,9 @@ public class DataCrawlingConfigAction extends BsDataCrawlingConfigAction {
                         new Object[] { dataCrawlingConfigForm.id });
             }
 
+            failureUrlService
+                    .deleteByConfigId(dataCrawlingConfig.getConfigId());
+
             //dataCrawlingConfigService.delete(dataCrawlingConfig);
             final String username = systemHelper.getUsername();
             final Timestamp timestamp = systemHelper.getCurrentTimestamp();

+ 2 - 1
src/main/java/jp/sf/fess/action/admin/FileCrawlingConfigAction.java

@@ -137,7 +137,8 @@ public class FileCrawlingConfigAction extends BsFileCrawlingConfigAction {
                         new Object[] { fileCrawlingConfigForm.id });
             }
 
-            failureUrlService.deleteByFileConfigId(fileCrawlingConfig.getId());
+            failureUrlService
+                    .deleteByConfigId(fileCrawlingConfig.getConfigId());
 
             //fileCrawlingConfigService.delete(fileCrawlingConfig);
             final String username = systemHelper.getUsername();

+ 1 - 1
src/main/java/jp/sf/fess/action/admin/WebCrawlingConfigAction.java

@@ -139,7 +139,7 @@ public class WebCrawlingConfigAction extends BsWebCrawlingConfigAction {
                         new Object[] { webCrawlingConfigForm.id });
             }
 
-            failureUrlService.deleteByWebConfigId(webCrawlingConfig.getId());
+            failureUrlService.deleteByConfigId(webCrawlingConfig.getConfigId());
 
             //     webCrawlingConfigService.delete(webCrawlingConfig);
             final String username = systemHelper.getUsername();

+ 2 - 1
src/main/java/jp/sf/fess/api/json/JsonApiManager.java

@@ -45,6 +45,7 @@ import jp.sf.fess.util.MoreLikeThisResponse;
 import jp.sf.fess.util.WebApiUtil;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.codelibs.core.CoreLibConstants;
 import org.seasar.framework.util.StringUtil;
 import org.seasar.struts.util.RequestUtil;
 import org.seasar.struts.util.ResponseUtil;
@@ -699,7 +700,7 @@ public class JsonApiManager extends BaseApiManager implements WebApiManager {
             buf.append(obj);
         } else if (obj instanceof Date) {
             final SimpleDateFormat sdf = new SimpleDateFormat(
-                    Constants.DATE_FORMAT_ISO_8601_EXTEND);
+                    CoreLibConstants.DATE_FORMAT_ISO_8601_EXTEND);
             buf.append('\"')
                     .append(StringEscapeUtils.escapeXml(sdf.format(obj)))
                     .append('\"');

+ 2 - 1
src/main/java/jp/sf/fess/api/xml/XmlApiManager.java

@@ -44,6 +44,7 @@ import jp.sf.fess.util.MoreLikeThisResponse;
 import jp.sf.fess.util.WebApiUtil;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.codelibs.core.CoreLibConstants;
 import org.seasar.framework.util.StringUtil;
 import org.seasar.struts.util.ResponseUtil;
 import org.slf4j.Logger;
@@ -478,7 +479,7 @@ public class XmlApiManager extends BaseApiManager implements WebApiManager {
             buf.append("</data>");
         } else if (obj instanceof Date) {
             final SimpleDateFormat sdf = new SimpleDateFormat(
-                    Constants.DATE_FORMAT_ISO_8601_EXTEND);
+                    CoreLibConstants.DATE_FORMAT_ISO_8601_EXTEND);
             buf.append(StringEscapeUtils.escapeXml(sdf.format(obj)));
         } else if (obj != null) {
             buf.append(StringEscapeUtils.escapeXml(obj.toString()));

+ 2 - 7
src/main/java/jp/sf/fess/crud/form/admin/BsFailureUrlForm.java

@@ -61,11 +61,7 @@ public abstract class BsFailureUrlForm {
     @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
     public String lastAccessTime;
 
-    @LongType
-    public String webConfigId;
-
-    @LongType
-    public String fileConfigId;
+    public String configId;
 
     public void initialize() {
 
@@ -76,8 +72,7 @@ public abstract class BsFailureUrlForm {
         errorLog = null;
         errorCount = null;
         lastAccessTime = null;
-        webConfigId = null;
-        fileConfigId = null;
+        configId = null;
 
     }
 

+ 3 - 58
src/main/java/jp/sf/fess/db/bsbhv/BsFailureUrlBhv.java

@@ -22,8 +22,6 @@ import jp.sf.fess.db.bsentity.dbmeta.FailureUrlDbm;
 import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.exbhv.FailureUrlBhv;
 import jp.sf.fess.db.exentity.FailureUrl;
-import jp.sf.fess.db.exentity.FileCrawlingConfig;
-import jp.sf.fess.db.exentity.WebCrawlingConfig;
 
 import org.seasar.dbflute.Entity;
 import org.seasar.dbflute.bhv.AbstractBehaviorWritable;
@@ -46,7 +44,7 @@ import org.seasar.dbflute.outsidesql.executor.OutsideSqlBasicExecutor;
  *     ID
  * 
  * [column]
- *     ID, URL, THREAD_NAME, ERROR_NAME, ERROR_LOG, ERROR_COUNT, LAST_ACCESS_TIME, WEB_CONFIG_ID, FILE_CONFIG_ID
+ *     ID, URL, THREAD_NAME, ERROR_NAME, ERROR_LOG, ERROR_COUNT, LAST_ACCESS_TIME, CONFIG_ID
  * 
  * [sequence]
  *     
@@ -58,13 +56,13 @@ import org.seasar.dbflute.outsidesql.executor.OutsideSqlBasicExecutor;
  *     
  * 
  * [foreign table]
- *     FILE_CRAWLING_CONFIG, WEB_CRAWLING_CONFIG
+ *     
  * 
  * [referrer table]
  *     
  * 
  * [foreign property]
- *     fileCrawlingConfig, webCrawlingConfig
+ *     
  * 
  * [referrer property]
  *     
@@ -473,59 +471,6 @@ public abstract class BsFailureUrlBhv extends AbstractBehaviorWritable {
     // ===================================================================================
     //                                                                   Pull out Relation
     //                                                                   =================
-    /**
-     * Pull out the list of foreign table 'FileCrawlingConfig'.
-     * @param failureUrlList The list of failureUrl. (NotNull, EmptyAllowed)
-     * @return The list of foreign table. (NotNull, EmptyAllowed, NotNullElement)
-     */
-    public List<FileCrawlingConfig> pulloutFileCrawlingConfig(
-            final List<FailureUrl> failureUrlList) {
-        return helpPulloutInternally(failureUrlList,
-                new InternalPulloutCallback<FailureUrl, FileCrawlingConfig>() {
-                    @Override
-                    public FileCrawlingConfig getFr(final FailureUrl e) {
-                        return e.getFileCrawlingConfig();
-                    }
-
-                    @Override
-                    public boolean hasRf() {
-                        return true;
-                    }
-
-                    @Override
-                    public void setRfLs(final FileCrawlingConfig e,
-                            final List<FailureUrl> ls) {
-                        e.setFailureUrlList(ls);
-                    }
-                });
-    }
-
-    /**
-     * Pull out the list of foreign table 'WebCrawlingConfig'.
-     * @param failureUrlList The list of failureUrl. (NotNull, EmptyAllowed)
-     * @return The list of foreign table. (NotNull, EmptyAllowed, NotNullElement)
-     */
-    public List<WebCrawlingConfig> pulloutWebCrawlingConfig(
-            final List<FailureUrl> failureUrlList) {
-        return helpPulloutInternally(failureUrlList,
-                new InternalPulloutCallback<FailureUrl, WebCrawlingConfig>() {
-                    @Override
-                    public WebCrawlingConfig getFr(final FailureUrl e) {
-                        return e.getWebCrawlingConfig();
-                    }
-
-                    @Override
-                    public boolean hasRf() {
-                        return true;
-                    }
-
-                    @Override
-                    public void setRfLs(final WebCrawlingConfig e,
-                            final List<FailureUrl> ls) {
-                        e.setFailureUrlList(ls);
-                    }
-                });
-    }
 
     // ===================================================================================
     //                                                                      Extract Column

+ 2 - 134
src/main/java/jp/sf/fess/db/bsbhv/BsFileCrawlingConfigBhv.java

@@ -19,19 +19,16 @@ package jp.sf.fess.db.bsbhv;
 import java.util.List;
 
 import jp.sf.fess.db.bsentity.dbmeta.FileCrawlingConfigDbm;
-import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.FileAuthenticationCB;
 import jp.sf.fess.db.cbean.FileConfigToBrowserTypeMappingCB;
 import jp.sf.fess.db.cbean.FileConfigToLabelTypeMappingCB;
 import jp.sf.fess.db.cbean.FileConfigToRoleTypeMappingCB;
 import jp.sf.fess.db.cbean.FileCrawlingConfigCB;
-import jp.sf.fess.db.exbhv.FailureUrlBhv;
 import jp.sf.fess.db.exbhv.FileAuthenticationBhv;
 import jp.sf.fess.db.exbhv.FileConfigToBrowserTypeMappingBhv;
 import jp.sf.fess.db.exbhv.FileConfigToLabelTypeMappingBhv;
 import jp.sf.fess.db.exbhv.FileConfigToRoleTypeMappingBhv;
 import jp.sf.fess.db.exbhv.FileCrawlingConfigBhv;
-import jp.sf.fess.db.exentity.FailureUrl;
 import jp.sf.fess.db.exentity.FileAuthentication;
 import jp.sf.fess.db.exentity.FileConfigToBrowserTypeMapping;
 import jp.sf.fess.db.exentity.FileConfigToLabelTypeMapping;
@@ -76,13 +73,13 @@ import org.seasar.dbflute.outsidesql.executor.OutsideSqlBasicExecutor;
  *     
  * 
  * [referrer table]
- *     FAILURE_URL, FILE_AUTHENTICATION, FILE_CONFIG_TO_BROWSER_TYPE_MAPPING, FILE_CONFIG_TO_LABEL_TYPE_MAPPING, FILE_CONFIG_TO_ROLE_TYPE_MAPPING
+ *     FILE_AUTHENTICATION, FILE_CONFIG_TO_BROWSER_TYPE_MAPPING, FILE_CONFIG_TO_LABEL_TYPE_MAPPING, FILE_CONFIG_TO_ROLE_TYPE_MAPPING
  * 
  * [foreign property]
  *     
  * 
  * [referrer property]
- *     failureUrlList, fileAuthenticationList, fileConfigToBrowserTypeMappingList, fileConfigToLabelTypeMappingList, fileConfigToRoleTypeMappingList
+ *     fileAuthenticationList, fileConfigToBrowserTypeMappingList, fileConfigToLabelTypeMappingList, fileConfigToRoleTypeMappingList
  * </pre>
  * @author DBFlute(AutoGenerator)
  */
@@ -498,135 +495,6 @@ public abstract class BsFileCrawlingConfigBhv extends AbstractBehaviorWritable {
     // ===================================================================================
     //                                                                       Load Referrer
     //                                                                       =============
-    /**
-     * {Refer to overload method that has an argument of the list of entity.}
-     * @param fileCrawlingConfig The entity of fileCrawlingConfig. (NotNull)
-     * @param conditionBeanSetupper The instance of referrer condition-bean set-upper for registering referrer condition. (NotNull)
-     */
-    public void loadFailureUrlList(final FileCrawlingConfig fileCrawlingConfig,
-            final ConditionBeanSetupper<FailureUrlCB> conditionBeanSetupper) {
-        xassLRArg(fileCrawlingConfig, conditionBeanSetupper);
-        loadFailureUrlList(xnewLRLs(fileCrawlingConfig), conditionBeanSetupper);
-    }
-
-    /**
-     * Load referrer of failureUrlList with the set-upper for condition-bean of referrer. <br />
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlList'.
-     * <pre>
-     * fileCrawlingConfigBhv.<span style="color: #FD4747">loadFailureUrlList</span>(fileCrawlingConfigList, new ConditionBeanSetupper&lt;FailureUrlCB&gt;() {
-     *     public void setup(FailureUrlCB cb) {
-     *         cb.setupSelect...();
-     *         cb.query().setFoo...(value);
-     *         cb.query().addOrderBy_Bar...(); <span style="color: #3F7E5E">// basically you should order referrer list</span>
-     *     }
-     * });
-     * for (FileCrawlingConfig fileCrawlingConfig : fileCrawlingConfigList) {
-     *     ... = fileCrawlingConfig.<span style="color: #FD4747">getFailureUrlList()</span>;
-     * }
-     * </pre>
-     * About internal policy, the value of primary key(and others too) is treated as case-insensitive. <br />
-     * The condition-bean that the set-upper provides have settings before you touch it. It is as follows:
-     * <pre>
-     * cb.query().setFileConfigId_InScope(pkList);
-     * cb.query().addOrderBy_FileConfigId_Asc();
-     * </pre>
-     * @param fileCrawlingConfigList The entity list of fileCrawlingConfig. (NotNull)
-     * @param conditionBeanSetupper The instance of referrer condition-bean set-upper for registering referrer condition. (NotNull)
-     */
-    public void loadFailureUrlList(
-            final List<FileCrawlingConfig> fileCrawlingConfigList,
-            final ConditionBeanSetupper<FailureUrlCB> conditionBeanSetupper) {
-        xassLRArg(fileCrawlingConfigList, conditionBeanSetupper);
-        loadFailureUrlList(fileCrawlingConfigList,
-                new LoadReferrerOption<FailureUrlCB, FailureUrl>()
-                        .xinit(conditionBeanSetupper));
-    }
-
-    /**
-     * {Refer to overload method that has an argument of the list of entity.}
-     * @param fileCrawlingConfig The entity of fileCrawlingConfig. (NotNull)
-     * @param loadReferrerOption The option of load-referrer. (NotNull)
-     */
-    public void loadFailureUrlList(
-            final FileCrawlingConfig fileCrawlingConfig,
-            final LoadReferrerOption<FailureUrlCB, FailureUrl> loadReferrerOption) {
-        xassLRArg(fileCrawlingConfig, loadReferrerOption);
-        loadFailureUrlList(xnewLRLs(fileCrawlingConfig), loadReferrerOption);
-    }
-
-    /**
-     * {Refer to overload method that has an argument of condition-bean setupper.}
-     * @param fileCrawlingConfigList The entity list of fileCrawlingConfig. (NotNull)
-     * @param loadReferrerOption The option of load-referrer. (NotNull)
-     */
-    public void loadFailureUrlList(
-            final List<FileCrawlingConfig> fileCrawlingConfigList,
-            final LoadReferrerOption<FailureUrlCB, FailureUrl> loadReferrerOption) {
-        xassLRArg(fileCrawlingConfigList, loadReferrerOption);
-        if (fileCrawlingConfigList.isEmpty()) {
-            return;
-        }
-        final FailureUrlBhv referrerBhv = xgetBSFLR().select(
-                FailureUrlBhv.class);
-        helpLoadReferrerInternally(
-                fileCrawlingConfigList,
-                loadReferrerOption,
-                new InternalLoadReferrerCallback<FileCrawlingConfig, Long, FailureUrlCB, FailureUrl>() {
-                    @Override
-                    public Long getPKVal(final FileCrawlingConfig e) {
-                        return e.getId();
-                    }
-
-                    @Override
-                    public void setRfLs(final FileCrawlingConfig e,
-                            final List<FailureUrl> ls) {
-                        e.setFailureUrlList(ls);
-                    }
-
-                    @Override
-                    public FailureUrlCB newMyCB() {
-                        return referrerBhv.newMyConditionBean();
-                    }
-
-                    @Override
-                    public void qyFKIn(final FailureUrlCB cb,
-                            final List<Long> ls) {
-                        cb.query().setFileConfigId_InScope(ls);
-                    }
-
-                    @Override
-                    public void qyOdFKAsc(final FailureUrlCB cb) {
-                        cb.query().addOrderBy_FileConfigId_Asc();
-                    }
-
-                    @Override
-                    public void spFKCol(final FailureUrlCB cb) {
-                        cb.specify().columnFileConfigId();
-                    }
-
-                    @Override
-                    public List<FailureUrl> selRfLs(final FailureUrlCB cb) {
-                        return referrerBhv.selectList(cb);
-                    }
-
-                    @Override
-                    public Long getFKVal(final FailureUrl e) {
-                        return e.getFileConfigId();
-                    }
-
-                    @Override
-                    public void setlcEt(final FailureUrl re,
-                            final FileCrawlingConfig le) {
-                        re.setFileCrawlingConfig(le);
-                    }
-
-                    @Override
-                    public String getRfPrNm() {
-                        return "failureUrlList";
-                    }
-                });
-    }
-
     /**
      * {Refer to overload method that has an argument of the list of entity.}
      * @param fileCrawlingConfig The entity of fileCrawlingConfig. (NotNull)

+ 2 - 134
src/main/java/jp/sf/fess/db/bsbhv/BsWebCrawlingConfigBhv.java

@@ -19,21 +19,18 @@ package jp.sf.fess.db.bsbhv;
 import java.util.List;
 
 import jp.sf.fess.db.bsentity.dbmeta.WebCrawlingConfigDbm;
-import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.RequestHeaderCB;
 import jp.sf.fess.db.cbean.WebAuthenticationCB;
 import jp.sf.fess.db.cbean.WebConfigToBrowserTypeMappingCB;
 import jp.sf.fess.db.cbean.WebConfigToLabelTypeMappingCB;
 import jp.sf.fess.db.cbean.WebConfigToRoleTypeMappingCB;
 import jp.sf.fess.db.cbean.WebCrawlingConfigCB;
-import jp.sf.fess.db.exbhv.FailureUrlBhv;
 import jp.sf.fess.db.exbhv.RequestHeaderBhv;
 import jp.sf.fess.db.exbhv.WebAuthenticationBhv;
 import jp.sf.fess.db.exbhv.WebConfigToBrowserTypeMappingBhv;
 import jp.sf.fess.db.exbhv.WebConfigToLabelTypeMappingBhv;
 import jp.sf.fess.db.exbhv.WebConfigToRoleTypeMappingBhv;
 import jp.sf.fess.db.exbhv.WebCrawlingConfigBhv;
-import jp.sf.fess.db.exentity.FailureUrl;
 import jp.sf.fess.db.exentity.RequestHeader;
 import jp.sf.fess.db.exentity.WebAuthentication;
 import jp.sf.fess.db.exentity.WebConfigToBrowserTypeMapping;
@@ -79,13 +76,13 @@ import org.seasar.dbflute.outsidesql.executor.OutsideSqlBasicExecutor;
  *     
  * 
  * [referrer table]
- *     FAILURE_URL, REQUEST_HEADER, WEB_AUTHENTICATION, WEB_CONFIG_TO_BROWSER_TYPE_MAPPING, WEB_CONFIG_TO_LABEL_TYPE_MAPPING, WEB_CONFIG_TO_ROLE_TYPE_MAPPING
+ *     REQUEST_HEADER, WEB_AUTHENTICATION, WEB_CONFIG_TO_BROWSER_TYPE_MAPPING, WEB_CONFIG_TO_LABEL_TYPE_MAPPING, WEB_CONFIG_TO_ROLE_TYPE_MAPPING
  * 
  * [foreign property]
  *     
  * 
  * [referrer property]
- *     failureUrlList, requestHeaderList, webAuthenticationList, webConfigToBrowserTypeMappingList, webConfigToLabelTypeMappingList, webConfigToRoleTypeMappingList
+ *     requestHeaderList, webAuthenticationList, webConfigToBrowserTypeMappingList, webConfigToLabelTypeMappingList, webConfigToRoleTypeMappingList
  * </pre>
  * @author DBFlute(AutoGenerator)
  */
@@ -501,135 +498,6 @@ public abstract class BsWebCrawlingConfigBhv extends AbstractBehaviorWritable {
     // ===================================================================================
     //                                                                       Load Referrer
     //                                                                       =============
-    /**
-     * {Refer to overload method that has an argument of the list of entity.}
-     * @param webCrawlingConfig The entity of webCrawlingConfig. (NotNull)
-     * @param conditionBeanSetupper The instance of referrer condition-bean set-upper for registering referrer condition. (NotNull)
-     */
-    public void loadFailureUrlList(final WebCrawlingConfig webCrawlingConfig,
-            final ConditionBeanSetupper<FailureUrlCB> conditionBeanSetupper) {
-        xassLRArg(webCrawlingConfig, conditionBeanSetupper);
-        loadFailureUrlList(xnewLRLs(webCrawlingConfig), conditionBeanSetupper);
-    }
-
-    /**
-     * Load referrer of failureUrlList with the set-upper for condition-bean of referrer. <br />
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlList'.
-     * <pre>
-     * webCrawlingConfigBhv.<span style="color: #FD4747">loadFailureUrlList</span>(webCrawlingConfigList, new ConditionBeanSetupper&lt;FailureUrlCB&gt;() {
-     *     public void setup(FailureUrlCB cb) {
-     *         cb.setupSelect...();
-     *         cb.query().setFoo...(value);
-     *         cb.query().addOrderBy_Bar...(); <span style="color: #3F7E5E">// basically you should order referrer list</span>
-     *     }
-     * });
-     * for (WebCrawlingConfig webCrawlingConfig : webCrawlingConfigList) {
-     *     ... = webCrawlingConfig.<span style="color: #FD4747">getFailureUrlList()</span>;
-     * }
-     * </pre>
-     * About internal policy, the value of primary key(and others too) is treated as case-insensitive. <br />
-     * The condition-bean that the set-upper provides have settings before you touch it. It is as follows:
-     * <pre>
-     * cb.query().setWebConfigId_InScope(pkList);
-     * cb.query().addOrderBy_WebConfigId_Asc();
-     * </pre>
-     * @param webCrawlingConfigList The entity list of webCrawlingConfig. (NotNull)
-     * @param conditionBeanSetupper The instance of referrer condition-bean set-upper for registering referrer condition. (NotNull)
-     */
-    public void loadFailureUrlList(
-            final List<WebCrawlingConfig> webCrawlingConfigList,
-            final ConditionBeanSetupper<FailureUrlCB> conditionBeanSetupper) {
-        xassLRArg(webCrawlingConfigList, conditionBeanSetupper);
-        loadFailureUrlList(webCrawlingConfigList,
-                new LoadReferrerOption<FailureUrlCB, FailureUrl>()
-                        .xinit(conditionBeanSetupper));
-    }
-
-    /**
-     * {Refer to overload method that has an argument of the list of entity.}
-     * @param webCrawlingConfig The entity of webCrawlingConfig. (NotNull)
-     * @param loadReferrerOption The option of load-referrer. (NotNull)
-     */
-    public void loadFailureUrlList(
-            final WebCrawlingConfig webCrawlingConfig,
-            final LoadReferrerOption<FailureUrlCB, FailureUrl> loadReferrerOption) {
-        xassLRArg(webCrawlingConfig, loadReferrerOption);
-        loadFailureUrlList(xnewLRLs(webCrawlingConfig), loadReferrerOption);
-    }
-
-    /**
-     * {Refer to overload method that has an argument of condition-bean setupper.}
-     * @param webCrawlingConfigList The entity list of webCrawlingConfig. (NotNull)
-     * @param loadReferrerOption The option of load-referrer. (NotNull)
-     */
-    public void loadFailureUrlList(
-            final List<WebCrawlingConfig> webCrawlingConfigList,
-            final LoadReferrerOption<FailureUrlCB, FailureUrl> loadReferrerOption) {
-        xassLRArg(webCrawlingConfigList, loadReferrerOption);
-        if (webCrawlingConfigList.isEmpty()) {
-            return;
-        }
-        final FailureUrlBhv referrerBhv = xgetBSFLR().select(
-                FailureUrlBhv.class);
-        helpLoadReferrerInternally(
-                webCrawlingConfigList,
-                loadReferrerOption,
-                new InternalLoadReferrerCallback<WebCrawlingConfig, Long, FailureUrlCB, FailureUrl>() {
-                    @Override
-                    public Long getPKVal(final WebCrawlingConfig e) {
-                        return e.getId();
-                    }
-
-                    @Override
-                    public void setRfLs(final WebCrawlingConfig e,
-                            final List<FailureUrl> ls) {
-                        e.setFailureUrlList(ls);
-                    }
-
-                    @Override
-                    public FailureUrlCB newMyCB() {
-                        return referrerBhv.newMyConditionBean();
-                    }
-
-                    @Override
-                    public void qyFKIn(final FailureUrlCB cb,
-                            final List<Long> ls) {
-                        cb.query().setWebConfigId_InScope(ls);
-                    }
-
-                    @Override
-                    public void qyOdFKAsc(final FailureUrlCB cb) {
-                        cb.query().addOrderBy_WebConfigId_Asc();
-                    }
-
-                    @Override
-                    public void spFKCol(final FailureUrlCB cb) {
-                        cb.specify().columnWebConfigId();
-                    }
-
-                    @Override
-                    public List<FailureUrl> selRfLs(final FailureUrlCB cb) {
-                        return referrerBhv.selectList(cb);
-                    }
-
-                    @Override
-                    public Long getFKVal(final FailureUrl e) {
-                        return e.getWebConfigId();
-                    }
-
-                    @Override
-                    public void setlcEt(final FailureUrl re,
-                            final WebCrawlingConfig le) {
-                        re.setWebCrawlingConfig(le);
-                    }
-
-                    @Override
-                    public String getRfPrNm() {
-                        return "failureUrlList";
-                    }
-                });
-    }
-
     /**
      * {Refer to overload method that has an argument of the list of entity.}
      * @param webCrawlingConfig The entity of webCrawlingConfig. (NotNull)

+ 18 - 105
src/main/java/jp/sf/fess/db/bsentity/BsFailureUrl.java

@@ -23,8 +23,6 @@ import java.util.Set;
 
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
 import jp.sf.fess.db.exentity.FailureUrl;
-import jp.sf.fess.db.exentity.FileCrawlingConfig;
-import jp.sf.fess.db.exentity.WebCrawlingConfig;
 
 import org.seasar.dbflute.Entity;
 import org.seasar.dbflute.dbmeta.DBMeta;
@@ -36,7 +34,7 @@ import org.seasar.dbflute.dbmeta.DBMeta;
  *     ID
  * 
  * [column]
- *     ID, URL, THREAD_NAME, ERROR_NAME, ERROR_LOG, ERROR_COUNT, LAST_ACCESS_TIME, WEB_CONFIG_ID, FILE_CONFIG_ID
+ *     ID, URL, THREAD_NAME, ERROR_NAME, ERROR_LOG, ERROR_COUNT, LAST_ACCESS_TIME, CONFIG_ID
  * 
  * [sequence]
  *     
@@ -48,13 +46,13 @@ import org.seasar.dbflute.dbmeta.DBMeta;
  *     
  * 
  * [foreign table]
- *     FILE_CRAWLING_CONFIG, WEB_CRAWLING_CONFIG
+ *     
  * 
  * [referrer table]
  *     
  * 
  * [foreign property]
- *     fileCrawlingConfig, webCrawlingConfig
+ *     
  * 
  * [referrer property]
  *     
@@ -68,8 +66,7 @@ import org.seasar.dbflute.dbmeta.DBMeta;
  * String errorLog = entity.getErrorLog();
  * Integer errorCount = entity.getErrorCount();
  * java.sql.Timestamp lastAccessTime = entity.getLastAccessTime();
- * Long webConfigId = entity.getWebConfigId();
- * Long fileConfigId = entity.getFileConfigId();
+ * String configId = entity.getConfigId();
  * entity.setId(id);
  * entity.setUrl(url);
  * entity.setThreadName(threadName);
@@ -77,8 +74,7 @@ import org.seasar.dbflute.dbmeta.DBMeta;
  * entity.setErrorLog(errorLog);
  * entity.setErrorCount(errorCount);
  * entity.setLastAccessTime(lastAccessTime);
- * entity.setWebConfigId(webConfigId);
- * entity.setFileConfigId(fileConfigId);
+ * entity.setConfigId(configId);
  * = = = = = = = = = =/
  * </pre>
  * @author DBFlute(AutoGenerator)
@@ -118,11 +114,8 @@ public abstract class BsFailureUrl implements Entity, Serializable, Cloneable {
     /** LAST_ACCESS_TIME: {IX+, NotNull, TIMESTAMP(23, 10)} */
     protected java.sql.Timestamp _lastAccessTime;
 
-    /** WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG} */
-    protected Long _webConfigId;
-
-    /** FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG} */
-    protected Long _fileConfigId;
+    /** CONFIG_ID: {IX, VARCHAR(100)} */
+    protected String _configId;
 
     // -----------------------------------------------------
     //                                              Internal
@@ -177,45 +170,6 @@ public abstract class BsFailureUrl implements Entity, Serializable, Cloneable {
     // ===================================================================================
     //                                                                    Foreign Property
     //                                                                    ================
-    /** FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'. */
-    protected FileCrawlingConfig _fileCrawlingConfig;
-
-    /**
-     * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-     * @return The entity of foreign property 'fileCrawlingConfig'. (NullAllowed: when e.g. null FK column, no setupSelect)
-     */
-    public FileCrawlingConfig getFileCrawlingConfig() {
-        return _fileCrawlingConfig;
-    }
-
-    /**
-     * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-     * @param fileCrawlingConfig The entity of foreign property 'fileCrawlingConfig'. (NullAllowed)
-     */
-    public void setFileCrawlingConfig(
-            final FileCrawlingConfig fileCrawlingConfig) {
-        _fileCrawlingConfig = fileCrawlingConfig;
-    }
-
-    /** WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'. */
-    protected WebCrawlingConfig _webCrawlingConfig;
-
-    /**
-     * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-     * @return The entity of foreign property 'webCrawlingConfig'. (NullAllowed: when e.g. null FK column, no setupSelect)
-     */
-    public WebCrawlingConfig getWebCrawlingConfig() {
-        return _webCrawlingConfig;
-    }
-
-    /**
-     * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-     * @param webCrawlingConfig The entity of foreign property 'webCrawlingConfig'. (NullAllowed)
-     */
-    public void setWebCrawlingConfig(final WebCrawlingConfig webCrawlingConfig) {
-        _webCrawlingConfig = webCrawlingConfig;
-    }
-
     // ===================================================================================
     //                                                                   Referrer Property
     //                                                                   =================
@@ -319,21 +273,9 @@ public abstract class BsFailureUrl implements Entity, Serializable, Cloneable {
     public String toStringWithRelation() {
         final StringBuilder sb = new StringBuilder();
         sb.append(toString());
-        final String l = "\n  ";
-        if (_fileCrawlingConfig != null) {
-            sb.append(l).append(
-                    xbRDS(_fileCrawlingConfig, "fileCrawlingConfig"));
-        }
-        if (_webCrawlingConfig != null) {
-            sb.append(l).append(xbRDS(_webCrawlingConfig, "webCrawlingConfig"));
-        }
         return sb.toString();
     }
 
-    protected String xbRDS(final Entity e, final String name) { // buildRelationDisplayString()
-        return e.buildDisplayString(name, true, true);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -364,8 +306,7 @@ public abstract class BsFailureUrl implements Entity, Serializable, Cloneable {
         sb.append(delimiter).append(getErrorLog());
         sb.append(delimiter).append(getErrorCount());
         sb.append(delimiter).append(getLastAccessTime());
-        sb.append(delimiter).append(getWebConfigId());
-        sb.append(delimiter).append(getFileConfigId());
+        sb.append(delimiter).append(getConfigId());
         if (sb.length() > delimiter.length()) {
             sb.delete(0, delimiter.length());
         }
@@ -374,18 +315,7 @@ public abstract class BsFailureUrl implements Entity, Serializable, Cloneable {
     }
 
     protected String buildRelationString() {
-        final StringBuilder sb = new StringBuilder();
-        final String c = ",";
-        if (_fileCrawlingConfig != null) {
-            sb.append(c).append("fileCrawlingConfig");
-        }
-        if (_webCrawlingConfig != null) {
-            sb.append(c).append("webCrawlingConfig");
-        }
-        if (sb.length() > c.length()) {
-            sb.delete(0, c.length()).insert(0, "(").append(")");
-        }
-        return sb.toString();
+        return "";
     }
 
     /**
@@ -525,36 +455,19 @@ public abstract class BsFailureUrl implements Entity, Serializable, Cloneable {
     }
 
     /**
-     * [get] WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG} <br />
-     * @return The value of the column 'WEB_CONFIG_ID'. (NullAllowed even if selected: for no constraint)
-     */
-    public Long getWebConfigId() {
-        return _webConfigId;
-    }
-
-    /**
-     * [set] WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG} <br />
-     * @param webConfigId The value of the column 'WEB_CONFIG_ID'. (NullAllowed: null update allowed for no constraint)
-     */
-    public void setWebConfigId(final Long webConfigId) {
-        __modifiedProperties.addPropertyName("webConfigId");
-        _webConfigId = webConfigId;
-    }
-
-    /**
-     * [get] FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG} <br />
-     * @return The value of the column 'FILE_CONFIG_ID'. (NullAllowed even if selected: for no constraint)
+     * [get] CONFIG_ID: {IX, VARCHAR(100)} <br />
+     * @return The value of the column 'CONFIG_ID'. (NullAllowed even if selected: for no constraint)
      */
-    public Long getFileConfigId() {
-        return _fileConfigId;
+    public String getConfigId() {
+        return _configId;
     }
 
     /**
-     * [set] FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG} <br />
-     * @param fileConfigId The value of the column 'FILE_CONFIG_ID'. (NullAllowed: null update allowed for no constraint)
+     * [set] CONFIG_ID: {IX, VARCHAR(100)} <br />
+     * @param configId The value of the column 'CONFIG_ID'. (NullAllowed: null update allowed for no constraint)
      */
-    public void setFileConfigId(final Long fileConfigId) {
-        __modifiedProperties.addPropertyName("fileConfigId");
-        _fileConfigId = fileConfigId;
+    public void setConfigId(final String configId) {
+        __modifiedProperties.addPropertyName("configId");
+        _configId = configId;
     }
 }

+ 2 - 35
src/main/java/jp/sf/fess/db/bsentity/BsFileCrawlingConfig.java

@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Set;
 
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
-import jp.sf.fess.db.exentity.FailureUrl;
 import jp.sf.fess.db.exentity.FileAuthentication;
 import jp.sf.fess.db.exentity.FileConfigToBrowserTypeMapping;
 import jp.sf.fess.db.exentity.FileConfigToLabelTypeMapping;
@@ -54,13 +53,13 @@ import org.seasar.dbflute.dbmeta.DBMeta;
  *     
  * 
  * [referrer table]
- *     FAILURE_URL, FILE_AUTHENTICATION, FILE_CONFIG_TO_BROWSER_TYPE_MAPPING, FILE_CONFIG_TO_LABEL_TYPE_MAPPING, FILE_CONFIG_TO_ROLE_TYPE_MAPPING
+ *     FILE_AUTHENTICATION, FILE_CONFIG_TO_BROWSER_TYPE_MAPPING, FILE_CONFIG_TO_LABEL_TYPE_MAPPING, FILE_CONFIG_TO_ROLE_TYPE_MAPPING
  * 
  * [foreign property]
  *     
  * 
  * [referrer property]
- *     failureUrlList, fileAuthenticationList, fileConfigToBrowserTypeMappingList, fileConfigToLabelTypeMappingList, fileConfigToRoleTypeMappingList
+ *     fileAuthenticationList, fileConfigToBrowserTypeMappingList, fileConfigToLabelTypeMappingList, fileConfigToRoleTypeMappingList
  * 
  * [get/set template]
  * /= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@@ -249,28 +248,6 @@ public abstract class BsFileCrawlingConfig implements Entity, Serializable,
     // ===================================================================================
     //                                                                   Referrer Property
     //                                                                   =================
-    /** FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlList'. */
-    protected List<FailureUrl> _failureUrlList;
-
-    /**
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlList'.
-     * @return The entity list of referrer property 'failureUrlList'. (NotNull: even if no loading, returns empty list)
-     */
-    public List<FailureUrl> getFailureUrlList() {
-        if (_failureUrlList == null) {
-            _failureUrlList = newReferrerList();
-        }
-        return _failureUrlList;
-    }
-
-    /**
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlList'.
-     * @param failureUrlList The entity list of referrer property 'failureUrlList'. (NullAllowed)
-     */
-    public void setFailureUrlList(final List<FailureUrl> failureUrlList) {
-        _failureUrlList = failureUrlList;
-    }
-
     /** FILE_AUTHENTICATION by FILE_CRAWLING_CONFIG_ID, named 'fileAuthenticationList'. */
     protected List<FileAuthentication> _fileAuthenticationList;
 
@@ -464,13 +441,6 @@ public abstract class BsFileCrawlingConfig implements Entity, Serializable,
         final StringBuilder sb = new StringBuilder();
         sb.append(toString());
         final String l = "\n  ";
-        if (_failureUrlList != null) {
-            for (final Entity e : _failureUrlList) {
-                if (e != null) {
-                    sb.append(l).append(xbRDS(e, "failureUrlList"));
-                }
-            }
-        }
         if (_fileAuthenticationList != null) {
             for (final Entity e : _fileAuthenticationList) {
                 if (e != null) {
@@ -564,9 +534,6 @@ public abstract class BsFileCrawlingConfig implements Entity, Serializable,
     protected String buildRelationString() {
         final StringBuilder sb = new StringBuilder();
         final String c = ",";
-        if (_failureUrlList != null && !_failureUrlList.isEmpty()) {
-            sb.append(c).append("failureUrlList");
-        }
         if (_fileAuthenticationList != null
                 && !_fileAuthenticationList.isEmpty()) {
             sb.append(c).append("fileAuthenticationList");

+ 2 - 35
src/main/java/jp/sf/fess/db/bsentity/BsWebCrawlingConfig.java

@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Set;
 
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
-import jp.sf.fess.db.exentity.FailureUrl;
 import jp.sf.fess.db.exentity.RequestHeader;
 import jp.sf.fess.db.exentity.WebAuthentication;
 import jp.sf.fess.db.exentity.WebConfigToBrowserTypeMapping;
@@ -55,13 +54,13 @@ import org.seasar.dbflute.dbmeta.DBMeta;
  *     
  * 
  * [referrer table]
- *     FAILURE_URL, REQUEST_HEADER, WEB_AUTHENTICATION, WEB_CONFIG_TO_BROWSER_TYPE_MAPPING, WEB_CONFIG_TO_LABEL_TYPE_MAPPING, WEB_CONFIG_TO_ROLE_TYPE_MAPPING
+ *     REQUEST_HEADER, WEB_AUTHENTICATION, WEB_CONFIG_TO_BROWSER_TYPE_MAPPING, WEB_CONFIG_TO_LABEL_TYPE_MAPPING, WEB_CONFIG_TO_ROLE_TYPE_MAPPING
  * 
  * [foreign property]
  *     
  * 
  * [referrer property]
- *     failureUrlList, requestHeaderList, webAuthenticationList, webConfigToBrowserTypeMappingList, webConfigToLabelTypeMappingList, webConfigToRoleTypeMappingList
+ *     requestHeaderList, webAuthenticationList, webConfigToBrowserTypeMappingList, webConfigToLabelTypeMappingList, webConfigToRoleTypeMappingList
  * 
  * [get/set template]
  * /= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@@ -255,28 +254,6 @@ public abstract class BsWebCrawlingConfig implements Entity, Serializable,
     // ===================================================================================
     //                                                                   Referrer Property
     //                                                                   =================
-    /** FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlList'. */
-    protected List<FailureUrl> _failureUrlList;
-
-    /**
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlList'.
-     * @return The entity list of referrer property 'failureUrlList'. (NotNull: even if no loading, returns empty list)
-     */
-    public List<FailureUrl> getFailureUrlList() {
-        if (_failureUrlList == null) {
-            _failureUrlList = newReferrerList();
-        }
-        return _failureUrlList;
-    }
-
-    /**
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlList'.
-     * @param failureUrlList The entity list of referrer property 'failureUrlList'. (NullAllowed)
-     */
-    public void setFailureUrlList(final List<FailureUrl> failureUrlList) {
-        _failureUrlList = failureUrlList;
-    }
-
     /** REQUEST_HEADER by WEB_CRAWLING_CONFIG_ID, named 'requestHeaderList'. */
     protected List<RequestHeader> _requestHeaderList;
 
@@ -492,13 +469,6 @@ public abstract class BsWebCrawlingConfig implements Entity, Serializable,
         final StringBuilder sb = new StringBuilder();
         sb.append(toString());
         final String l = "\n  ";
-        if (_failureUrlList != null) {
-            for (final Entity e : _failureUrlList) {
-                if (e != null) {
-                    sb.append(l).append(xbRDS(e, "failureUrlList"));
-                }
-            }
-        }
         if (_requestHeaderList != null) {
             for (final Entity e : _requestHeaderList) {
                 if (e != null) {
@@ -600,9 +570,6 @@ public abstract class BsWebCrawlingConfig implements Entity, Serializable,
     protected String buildRelationString() {
         final StringBuilder sb = new StringBuilder();
         final String c = ",";
-        if (_failureUrlList != null && !_failureUrlList.isEmpty()) {
-            sb.append(c).append("failureUrlList");
-        }
         if (_requestHeaderList != null && !_requestHeaderList.isEmpty()) {
             sb.append(c).append("requestHeaderList");
         }

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/BrowserTypeDbm.java

@@ -258,7 +258,7 @@ public class BrowserTypeDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D41CA918_16A9_416B_B647_2C87A057862D",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_22259CE8_7A1A_48C9_B0CC_2E33C7875229",
             false,
             null,
             null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/ClickLogDbm.java

@@ -167,7 +167,7 @@ public class ClickLogDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5784FA0C_8F21_45C1_8BC0_0B77795C1FDD",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_456E3C8D_EEB3_4F0A_8A0A_3712FF1E2800",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnSearchId = cci("SEARCH_ID", "SEARCH_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/CrawlingSessionDbm.java

@@ -180,7 +180,7 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1A924665_7570_4B11_9238_780D8838302B",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9AAE16DA_0823_450C_A0D8_8D9954DB2E8E",
             false, null, null, null, "crawlingSessionInfoList", null);
 
     protected final ColumnInfo _columnSessionId = cci("SESSION_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/CrawlingSessionInfoDbm.java

@@ -180,7 +180,7 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_7F2CE21E_C25C_4598_82C4_A1009DD96CFC",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E6F8AC2C_D5F8_4ED2_A456_5AF88F044850",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnCrawlingSessionId = cci(

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToBrowserTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class DataConfigToBrowserTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E5B07DE6_C536_40E4_8F72_E39704B418C4",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_54B90FC1_2994_458B_B414_189B55C9EE4D",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnDataConfigId = cci("DATA_CONFIG_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToLabelTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class DataConfigToLabelTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3F5F83E_2B8A_46F0_9F23_E925931DB082",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_944B959E_A2C3_4C16_BFF0_92C7E61C7828",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnDataConfigId = cci("DATA_CONFIG_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToRoleTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class DataConfigToRoleTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_78F3C3A4_FF01_4ECF_A193_4224C74B27FB",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_06775EF6_A065_45AF_8AA1_EB9E46677B83",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnDataConfigId = cci("DATA_CONFIG_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataCrawlingConfigDbm.java

@@ -310,7 +310,7 @@ public class DataCrawlingConfigDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0B9D5A74_12B9_4AC0_833B_E3638BFF6024",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D4F0A908_257C_465E_9D16_46C7676E0EE9",
             false,
             null,
             null,

+ 11 - 53
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FailureUrlDbm.java

@@ -28,7 +28,6 @@ import org.seasar.dbflute.Entity;
 import org.seasar.dbflute.dbmeta.AbstractDBMeta;
 import org.seasar.dbflute.dbmeta.PropertyGateway;
 import org.seasar.dbflute.dbmeta.info.ColumnInfo;
-import org.seasar.dbflute.dbmeta.info.ForeignInfo;
 import org.seasar.dbflute.dbmeta.info.UniqueInfo;
 import org.seasar.dbflute.dbmeta.name.TableSqlName;
 
@@ -70,8 +69,7 @@ public class FailureUrlDbm extends AbstractDBMeta {
         setupEpg(_epgMap, new EpgErrorLog(), "errorLog");
         setupEpg(_epgMap, new EpgErrorCount(), "errorCount");
         setupEpg(_epgMap, new EpgLastAccessTime(), "lastAccessTime");
-        setupEpg(_epgMap, new EpgWebConfigId(), "webConfigId");
-        setupEpg(_epgMap, new EpgFileConfigId(), "fileConfigId");
+        setupEpg(_epgMap, new EpgConfigId(), "configId");
     }
 
     @Override
@@ -163,27 +161,15 @@ public class FailureUrlDbm extends AbstractDBMeta {
         }
     }
 
-    public static class EpgWebConfigId implements PropertyGateway {
+    public static class EpgConfigId implements PropertyGateway {
         @Override
         public Object read(final Entity e) {
-            return ((FailureUrl) e).getWebConfigId();
+            return ((FailureUrl) e).getConfigId();
         }
 
         @Override
         public void write(final Entity e, final Object v) {
-            ((FailureUrl) e).setWebConfigId(ctl(v));
-        }
-    }
-
-    public static class EpgFileConfigId implements PropertyGateway {
-        @Override
-        public Object read(final Entity e) {
-            return ((FailureUrl) e).getFileConfigId();
-        }
-
-        @Override
-        public void write(final Entity e, final Object v) {
-            ((FailureUrl) e).setFileConfigId(ctl(v));
+            ((FailureUrl) e).setConfigId((String) v);
         }
     }
 
@@ -232,7 +218,7 @@ public class FailureUrlDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4A115054_9480_4EE9_86AB_7EAEF962B3A2",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_7B2DAF5F_D6A4_4685_9369_BB3D040D4CE8",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnUrl = cci("URL", "URL", null, null, true,
@@ -261,15 +247,9 @@ public class FailureUrlDbm extends AbstractDBMeta {
             java.sql.Timestamp.class, false, false, "TIMESTAMP", 23, 10, null,
             false, null, null, null, null, null);
 
-    protected final ColumnInfo _columnWebConfigId = cci("WEB_CONFIG_ID",
-            "WEB_CONFIG_ID", null, null, false, "webConfigId", Long.class,
-            false, false, "BIGINT", 19, 0, null, false, null, null,
-            "webCrawlingConfig", null, null);
-
-    protected final ColumnInfo _columnFileConfigId = cci("FILE_CONFIG_ID",
-            "FILE_CONFIG_ID", null, null, false, "fileConfigId", Long.class,
-            false, false, "BIGINT", 19, 0, null, false, null, null,
-            "fileCrawlingConfig", null, null);
+    protected final ColumnInfo _columnConfigId = cci("CONFIG_ID", "CONFIG_ID",
+            null, null, false, "configId", String.class, false, false,
+            "VARCHAR", 100, 0, null, false, null, null, null, null, null);
 
     public ColumnInfo columnId() {
         return _columnId;
@@ -299,12 +279,8 @@ public class FailureUrlDbm extends AbstractDBMeta {
         return _columnLastAccessTime;
     }
 
-    public ColumnInfo columnWebConfigId() {
-        return _columnWebConfigId;
-    }
-
-    public ColumnInfo columnFileConfigId() {
-        return _columnFileConfigId;
+    public ColumnInfo columnConfigId() {
+        return _columnConfigId;
     }
 
     @Override
@@ -317,8 +293,7 @@ public class FailureUrlDbm extends AbstractDBMeta {
         ls.add(columnErrorLog());
         ls.add(columnErrorCount());
         ls.add(columnLastAccessTime());
-        ls.add(columnWebConfigId());
-        ls.add(columnFileConfigId());
+        ls.add(columnConfigId());
         return ls;
     }
 
@@ -353,23 +328,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
     // -----------------------------------------------------
     //                                      Foreign Property
     //                                      ----------------
-    public ForeignInfo foreignFileCrawlingConfig() {
-        final Map<ColumnInfo, ColumnInfo> map = newLinkedHashMap(
-                columnFileConfigId(), FileCrawlingConfigDbm.getInstance()
-                        .columnId());
-        return cfi("CONSTRAINT_FBE", "fileCrawlingConfig", this,
-                FileCrawlingConfigDbm.getInstance(), map, 0, false, false,
-                false, false, null, null, false, "failureUrlList");
-    }
-
-    public ForeignInfo foreignWebCrawlingConfig() {
-        final Map<ColumnInfo, ColumnInfo> map = newLinkedHashMap(
-                columnWebConfigId(), WebCrawlingConfigDbm.getInstance()
-                        .columnId());
-        return cfi("CONSTRAINT_FBE3", "webCrawlingConfig", this,
-                WebCrawlingConfigDbm.getInstance(), map, 1, false, false,
-                false, false, null, null, false, "failureUrlList");
-    }
 
     // -----------------------------------------------------
     //                                     Referrer Property

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FavoriteLogDbm.java

@@ -167,7 +167,7 @@ public class FavoriteLogDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3E627B17_3EF8_4744_8F04_99A388F9A905",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FBA5677B_CE15_44E2_AE7C_6F1081DEA432",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnUserId = cci("USER_ID", "USER_ID", null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileAuthenticationDbm.java

@@ -310,7 +310,7 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0DE6A197_6735_4CA5_99EE_3DC42CD9A8E2",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_AE6887C8_40E1_4109_AAA7_1F3F92013ECA",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnHostname = cci("HOSTNAME", "HOSTNAME",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToBrowserTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class FileConfigToBrowserTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B0BC0334_9EC5_475D_8E3A_B367C4A2E669",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_ADC71CB7_D124_4237_ACBA_4244B5B0B854",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnFileConfigId = cci("FILE_CONFIG_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToLabelTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class FileConfigToLabelTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_75F74A02_C2C3_4ECA_AF13_71D8A60AA9AD",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_637A8DAA_5001_42B4_A128_49EC888DD83B",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnFileConfigId = cci("FILE_CONFIG_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToRoleTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class FileConfigToRoleTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_97B5ADF1_4B2B_4A1A_8911_810C6B365933",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3378BA5C_C67A_4A90_9235_4D81E1B7081A",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnFileConfigId = cci("FILE_CONFIG_ID",

+ 2 - 9
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileCrawlingConfigDbm.java

@@ -401,12 +401,12 @@ public class FileCrawlingConfigDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_98769B60_EC99_43E9_9C3F_CF1E75ABBF60",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2B960FF6_C5A8_4126_9DFC_5B2862E189E9",
             false,
             null,
             null,
             null,
-            "failureUrlList,fileAuthenticationList,fileConfigToBrowserTypeMappingList,fileConfigToLabelTypeMappingList,fileConfigToRoleTypeMappingList",
+            "fileAuthenticationList,fileConfigToBrowserTypeMappingList,fileConfigToLabelTypeMappingList,fileConfigToRoleTypeMappingList",
             null);
 
     protected final ColumnInfo _columnName = cci("NAME", "NAME", null, null,
@@ -656,13 +656,6 @@ public class FileCrawlingConfigDbm extends AbstractDBMeta {
     // -----------------------------------------------------
     //                                     Referrer Property
     //                                     -----------------
-    public ReferrerInfo referrerFailureUrlList() {
-        final Map<ColumnInfo, ColumnInfo> map = newLinkedHashMap(columnId(),
-                FailureUrlDbm.getInstance().columnFileConfigId());
-        return cri("CONSTRAINT_FBE", "failureUrlList", this,
-                FailureUrlDbm.getInstance(), map, false, "fileCrawlingConfig");
-    }
-
     public ReferrerInfo referrerFileAuthenticationList() {
         final Map<ColumnInfo, ColumnInfo> map = newLinkedHashMap(columnId(),
                 FileAuthenticationDbm.getInstance()

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/JobLogDbm.java

@@ -231,7 +231,7 @@ public class JobLogDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_131D8FB9_8D41_4A03_BEB7_9262977BC90D",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C83BEC8C_23AD_4F46_958A_38A3C242B7D3",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnJobName = cci("JOB_NAME", "JOB_NAME",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/LabelTypeDbm.java

@@ -284,7 +284,7 @@ public class LabelTypeDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_060CF1E5_6E83_486D_9C25_2D972AF6F355",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_61698DC2_5A75_4C92_B9FB_59225A037C16",
             false,
             null,
             null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/LabelTypeToRoleTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class LabelTypeToRoleTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_96F6074E_A18D_48ED_8F32_4F71CC4B64A7",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8E852A30_BA83_4197_9E9B_1CB2E195010D",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnLabelTypeId = cci("LABEL_TYPE_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/OverlappingHostDbm.java

@@ -257,7 +257,7 @@ public class OverlappingHostDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9EC144CB_B1BF_42AD_8968_ACF67F680697",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C530E106_743C_4422_BC04_808214F8B80D",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnRegularName = cci("REGULAR_NAME",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/PathMappingDbm.java

@@ -271,7 +271,7 @@ public class PathMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2F2B2FEF_0BF8_41BE_A43D_4EFA6E62193D",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F9A459D4_BB61_4E3B_B946_0B17FFA41E69",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnRegex = cci("REGEX", "REGEX", null, null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/RequestHeaderDbm.java

@@ -258,7 +258,7 @@ public class RequestHeaderDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A06C281D_C680_48EA_AC66_2A96E56C0304",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E1A8C1E4_97DF_4832_A951_389241910EE6",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnName = cci("NAME", "NAME", null, null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/RoleTypeDbm.java

@@ -258,7 +258,7 @@ public class RoleTypeDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0D9BC963_B611_44F0_837B_0F02BD9F4847",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B5EB0F7F_F5B4_4F0C_AAD3_ECF2AAEA8D9A",
             false,
             null,
             null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/ScheduledJobDbm.java

@@ -335,7 +335,7 @@ public class ScheduledJobDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_7423A7F0_057A_4298_83C8_58132727B0C0",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C85CB7B0_E4B3_4D29_AB51_AA42FD7943CD",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnName = cci("NAME", "NAME", null, null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/SearchFieldLogDbm.java

@@ -167,7 +167,7 @@ public class SearchFieldLogDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0E1864CF_AD17_4516_B4AD_3C8A3DC1E7B8",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3EA987B4_45E6_4421_A302_9297A29D24DB",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnSearchId = cci("SEARCH_ID", "SEARCH_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/SearchLogDbm.java

@@ -286,7 +286,7 @@ public class SearchLogDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_380A14A7_E02A_40AA_B0B1_825DFB0AB844",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_57E30DFF_CD73_4308_A17D_2909EB5EFD16",
             false, null, null, null, "clickLogList,searchFieldLogList", null);
 
     protected final ColumnInfo _columnSearchWord = cci("SEARCH_WORD",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/UserInfoDbm.java

@@ -167,7 +167,7 @@ public class UserInfoDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_26646B52_2FBC_4E74_8A56_6292786B7F3C",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B3AEF12F_833A_479E_A3D4_17D66FAB2DD4",
             false, null, null, null, "favoriteLogList,searchLogList", null);
 
     protected final ColumnInfo _columnCode = cci("CODE", "CODE", null, null,

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebAuthenticationDbm.java

@@ -323,7 +323,7 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0F7C7995_E44A_453D_8938_45539768010D",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FD10FC3F_7BE9_45E7_BD34_F57CE47607D2",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnHostname = cci("HOSTNAME", "HOSTNAME",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToBrowserTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class WebConfigToBrowserTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_42107AD0_2A38_4917_8034_38503E26087D",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C4049944_82FE_4F48_AE3E_058E66E45A96",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnWebConfigId = cci("WEB_CONFIG_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToLabelTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class WebConfigToLabelTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B5E907A6_CB39_4B37_9446_C571EE87D642",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3E5ABA26_9696_4B60_9307_68EAFEFC7ABE",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnWebConfigId = cci("WEB_CONFIG_ID",

+ 1 - 1
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToRoleTypeMappingDbm.java

@@ -154,7 +154,7 @@ public class WebConfigToRoleTypeMappingDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_328F9765_4DEC_4217_AC1F_33D082834575",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3E6A995C_BB62_43C5_980A_BE93168D474E",
             false, null, null, null, null, null);
 
     protected final ColumnInfo _columnWebConfigId = cci("WEB_CONFIG_ID",

+ 2 - 9
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebCrawlingConfigDbm.java

@@ -414,12 +414,12 @@ public class WebCrawlingConfigDbm extends AbstractDBMeta {
             "BIGINT",
             19,
             0,
-            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3B5DAAB_8D15_4A8A_8261_C0B3426CE65C",
+            "NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_853D1307_E292_48A2_B130_C0D28306B556",
             false,
             null,
             null,
             null,
-            "failureUrlList,requestHeaderList,webAuthenticationList,webConfigToBrowserTypeMappingList,webConfigToLabelTypeMappingList,webConfigToRoleTypeMappingList",
+            "requestHeaderList,webAuthenticationList,webConfigToBrowserTypeMappingList,webConfigToLabelTypeMappingList,webConfigToRoleTypeMappingList",
             null);
 
     protected final ColumnInfo _columnName = cci("NAME", "NAME", null, null,
@@ -678,13 +678,6 @@ public class WebCrawlingConfigDbm extends AbstractDBMeta {
     // -----------------------------------------------------
     //                                     Referrer Property
     //                                     -----------------
-    public ReferrerInfo referrerFailureUrlList() {
-        final Map<ColumnInfo, ColumnInfo> map = newLinkedHashMap(columnId(),
-                FailureUrlDbm.getInstance().columnWebConfigId());
-        return cri("CONSTRAINT_FBE3", "failureUrlList", this,
-                FailureUrlDbm.getInstance(), map, false, "webCrawlingConfig");
-    }
-
     public ReferrerInfo referrerRequestHeaderList() {
         final Map<ColumnInfo, ColumnInfo> map = newLinkedHashMap(columnId(),
                 RequestHeaderDbm.getInstance().columnWebCrawlingConfigId());

+ 3 - 196
src/main/java/jp/sf/fess/db/cbean/bs/BsFailureUrlCB.java

@@ -21,13 +21,7 @@ import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
 import jp.sf.fess.db.allcommon.ImplementedInvokerAssistant;
 import jp.sf.fess.db.allcommon.ImplementedSqlClauseCreator;
 import jp.sf.fess.db.cbean.FailureUrlCB;
-import jp.sf.fess.db.cbean.FileCrawlingConfigCB;
-import jp.sf.fess.db.cbean.WebCrawlingConfigCB;
 import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
-import jp.sf.fess.db.cbean.cq.FileCrawlingConfigCQ;
-import jp.sf.fess.db.cbean.cq.WebCrawlingConfigCQ;
-import jp.sf.fess.db.cbean.nss.FileCrawlingConfigNss;
-import jp.sf.fess.db.cbean.nss.WebCrawlingConfigNss;
 
 import org.seasar.dbflute.cbean.AbstractConditionBean;
 import org.seasar.dbflute.cbean.AndQuery;
@@ -296,83 +290,6 @@ public class BsFailureUrlCB extends AbstractConditionBean {
     // ===================================================================================
     //                                                                         SetupSelect
     //                                                                         ===========
-    protected FileCrawlingConfigNss _nssFileCrawlingConfig;
-
-    public FileCrawlingConfigNss getNssFileCrawlingConfig() {
-        if (_nssFileCrawlingConfig == null) {
-            _nssFileCrawlingConfig = new FileCrawlingConfigNss(null);
-        }
-        return _nssFileCrawlingConfig;
-    }
-
-    /**
-     * Set up relation columns to select clause. <br />
-     * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-     * <pre>
-     * FailureUrlCB cb = new FailureUrlCB();
-     * cb.<span style="color: #FD4747">setupSelect_FileCrawlingConfig()</span>; <span style="color: #3F7E5E">// ...().with[nested-relation]()</span>
-     * cb.query().setFoo...(value);
-     * FailureUrl failureUrl = failureUrlBhv.selectEntityWithDeletedCheck(cb);
-     * ... = failureUrl.<span style="color: #FD4747">getFileCrawlingConfig()</span>; <span style="color: #3F7E5E">// you can get by using SetupSelect</span>
-     * </pre>
-     * @return The set-upper of nested relation. {setupSelect...().with[nested-relation]} (NotNull)
-     */
-    public FileCrawlingConfigNss setupSelect_FileCrawlingConfig() {
-        if (hasSpecifiedColumn()) { // if reverse call
-            specify().columnFileConfigId();
-        }
-        doSetupSelect(new SsCall() {
-            @Override
-            public ConditionQuery qf() {
-                return query().queryFileCrawlingConfig();
-            }
-        });
-        if (_nssFileCrawlingConfig == null
-                || !_nssFileCrawlingConfig.hasConditionQuery()) {
-            _nssFileCrawlingConfig = new FileCrawlingConfigNss(query()
-                    .queryFileCrawlingConfig());
-        }
-        return _nssFileCrawlingConfig;
-    }
-
-    protected WebCrawlingConfigNss _nssWebCrawlingConfig;
-
-    public WebCrawlingConfigNss getNssWebCrawlingConfig() {
-        if (_nssWebCrawlingConfig == null) {
-            _nssWebCrawlingConfig = new WebCrawlingConfigNss(null);
-        }
-        return _nssWebCrawlingConfig;
-    }
-
-    /**
-     * Set up relation columns to select clause. <br />
-     * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-     * <pre>
-     * FailureUrlCB cb = new FailureUrlCB();
-     * cb.<span style="color: #FD4747">setupSelect_WebCrawlingConfig()</span>; <span style="color: #3F7E5E">// ...().with[nested-relation]()</span>
-     * cb.query().setFoo...(value);
-     * FailureUrl failureUrl = failureUrlBhv.selectEntityWithDeletedCheck(cb);
-     * ... = failureUrl.<span style="color: #FD4747">getWebCrawlingConfig()</span>; <span style="color: #3F7E5E">// you can get by using SetupSelect</span>
-     * </pre>
-     * @return The set-upper of nested relation. {setupSelect...().with[nested-relation]} (NotNull)
-     */
-    public WebCrawlingConfigNss setupSelect_WebCrawlingConfig() {
-        if (hasSpecifiedColumn()) { // if reverse call
-            specify().columnWebConfigId();
-        }
-        doSetupSelect(new SsCall() {
-            @Override
-            public ConditionQuery qf() {
-                return query().queryWebCrawlingConfig();
-            }
-        });
-        if (_nssWebCrawlingConfig == null
-                || !_nssWebCrawlingConfig.hasConditionQuery()) {
-            _nssWebCrawlingConfig = new WebCrawlingConfigNss(query()
-                    .queryWebCrawlingConfig());
-        }
-        return _nssWebCrawlingConfig;
-    }
 
     // [DBFlute-0.7.4]
     // ===================================================================================
@@ -428,10 +345,6 @@ public class BsFailureUrlCB extends AbstractConditionBean {
 
     public static class HpSpecification extends
             HpAbstractSpecification<FailureUrlCQ> {
-        protected FileCrawlingConfigCB.HpSpecification _fileCrawlingConfig;
-
-        protected WebCrawlingConfigCB.HpSpecification _webCrawlingConfig;
-
         public HpSpecification(final ConditionBean baseCB,
                 final HpSpQyCall<FailureUrlCQ> qyCall,
                 final HpCBPurpose purpose, final DBMetaProvider dbmetaProvider) {
@@ -495,19 +408,11 @@ public class BsFailureUrlCB extends AbstractConditionBean {
         }
 
         /**
-         * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-         * @return The information object of specified column. (NotNull)
-         */
-        public HpSpecifiedColumn columnWebConfigId() {
-            return doColumn("WEB_CONFIG_ID");
-        }
-
-        /**
-         * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
+         * CONFIG_ID: {IX, VARCHAR(100)}
          * @return The information object of specified column. (NotNull)
          */
-        public HpSpecifiedColumn columnFileConfigId() {
-            return doColumn("FILE_CONFIG_ID");
+        public HpSpecifiedColumn columnConfigId() {
+            return doColumn("CONFIG_ID");
         }
 
         @Override
@@ -523,14 +428,6 @@ public class BsFailureUrlCB extends AbstractConditionBean {
         @Override
         protected void doSpecifyRequiredColumn() {
             columnId(); // PK
-            if (qyCall().qy().hasConditionQueryFileCrawlingConfig()
-                    || qyCall().qy().xgetReferrerQuery() instanceof FileCrawlingConfigCQ) {
-                columnFileConfigId(); // FK or one-to-one referrer
-            }
-            if (qyCall().qy().hasConditionQueryWebCrawlingConfig()
-                    || qyCall().qy().xgetReferrerQuery() instanceof WebCrawlingConfigCQ) {
-                columnWebConfigId(); // FK or one-to-one referrer
-            }
         }
 
         @Override
@@ -538,96 +435,6 @@ public class BsFailureUrlCB extends AbstractConditionBean {
             return "FAILURE_URL";
         }
 
-        /**
-         * Prepare to specify functions about relation table. <br />
-         * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-         * @return The instance for specification for relation table to specify. (NotNull)
-         */
-        public FileCrawlingConfigCB.HpSpecification specifyFileCrawlingConfig() {
-            assertRelation("fileCrawlingConfig");
-            if (_fileCrawlingConfig == null) {
-                _fileCrawlingConfig = new FileCrawlingConfigCB.HpSpecification(
-                        _baseCB, new HpSpQyCall<FileCrawlingConfigCQ>() {
-                            @Override
-                            public boolean has() {
-                                return _qyCall.has()
-                                        && _qyCall
-                                                .qy()
-                                                .hasConditionQueryFileCrawlingConfig();
-                            }
-
-                            @Override
-                            public FileCrawlingConfigCQ qy() {
-                                return _qyCall.qy().queryFileCrawlingConfig();
-                            }
-                        }, _purpose, _dbmetaProvider);
-                if (xhasSyncQyCall()) { // inherits it
-                    _fileCrawlingConfig
-                            .xsetSyncQyCall(new HpSpQyCall<FileCrawlingConfigCQ>() {
-                                @Override
-                                public boolean has() {
-                                    return xsyncQyCall().has()
-                                            && xsyncQyCall()
-                                                    .qy()
-                                                    .hasConditionQueryFileCrawlingConfig();
-                                }
-
-                                @Override
-                                public FileCrawlingConfigCQ qy() {
-                                    return xsyncQyCall().qy()
-                                            .queryFileCrawlingConfig();
-                                }
-                            });
-                }
-            }
-            return _fileCrawlingConfig;
-        }
-
-        /**
-         * Prepare to specify functions about relation table. <br />
-         * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-         * @return The instance for specification for relation table to specify. (NotNull)
-         */
-        public WebCrawlingConfigCB.HpSpecification specifyWebCrawlingConfig() {
-            assertRelation("webCrawlingConfig");
-            if (_webCrawlingConfig == null) {
-                _webCrawlingConfig = new WebCrawlingConfigCB.HpSpecification(
-                        _baseCB, new HpSpQyCall<WebCrawlingConfigCQ>() {
-                            @Override
-                            public boolean has() {
-                                return _qyCall.has()
-                                        && _qyCall
-                                                .qy()
-                                                .hasConditionQueryWebCrawlingConfig();
-                            }
-
-                            @Override
-                            public WebCrawlingConfigCQ qy() {
-                                return _qyCall.qy().queryWebCrawlingConfig();
-                            }
-                        }, _purpose, _dbmetaProvider);
-                if (xhasSyncQyCall()) { // inherits it
-                    _webCrawlingConfig
-                            .xsetSyncQyCall(new HpSpQyCall<WebCrawlingConfigCQ>() {
-                                @Override
-                                public boolean has() {
-                                    return xsyncQyCall().has()
-                                            && xsyncQyCall()
-                                                    .qy()
-                                                    .hasConditionQueryWebCrawlingConfig();
-                                }
-
-                                @Override
-                                public WebCrawlingConfigCQ qy() {
-                                    return xsyncQyCall().qy()
-                                            .queryWebCrawlingConfig();
-                                }
-                            });
-                }
-            }
-            return _webCrawlingConfig;
-        }
-
         /**
          * Prepare for (Specify)MyselfDerived (SubQuery).
          * @return The object to set up a function for myself table. (NotNull)

+ 0 - 35
src/main/java/jp/sf/fess/db/cbean/bs/BsFileCrawlingConfigCB.java

@@ -20,7 +20,6 @@ import jp.sf.fess.db.allcommon.DBFluteConfig;
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
 import jp.sf.fess.db.allcommon.ImplementedInvokerAssistant;
 import jp.sf.fess.db.allcommon.ImplementedSqlClauseCreator;
-import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.FileAuthenticationCB;
 import jp.sf.fess.db.cbean.FileConfigToBrowserTypeMappingCB;
 import jp.sf.fess.db.cbean.FileConfigToLabelTypeMappingCB;
@@ -553,40 +552,6 @@ public class BsFileCrawlingConfigCB extends AbstractConditionBean {
             return "FILE_CRAWLING_CONFIG";
         }
 
-        /**
-         * Prepare for (Specify)DerivedReferrer. <br />
-         * {select max(FOO) from FAILURE_URL where ...) as FOO_MAX} <br />
-         * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlList'.
-         * <pre>
-         * cb.specify().<span style="color: #FD4747">derivedFailureUrlList()</span>.<span style="color: #FD4747">max</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-         *     public void query(FailureUrlCB subCB) {
-         *         subCB.specify().<span style="color: #FD4747">columnFoo...</span> <span style="color: #3F7E5E">// derived column by function</span>
-         *         subCB.query().setBar... <span style="color: #3F7E5E">// referrer condition</span>
-         *     }
-         * }, FailureUrl.<span style="color: #FD4747">ALIAS_foo...</span>);
-         * </pre>
-         * @return The object to set up a function for referrer table. (NotNull)
-         */
-        public HpSDRFunction<FailureUrlCB, FileCrawlingConfigCQ> derivedFailureUrlList() {
-            assertDerived("failureUrlList");
-            if (xhasSyncQyCall()) {
-                xsyncQyCall().qy();
-            } // for sync (for example, this in ColumnQuery)
-            return new HpSDRFunction<FailureUrlCB, FileCrawlingConfigCQ>(
-                    _baseCB, _qyCall.qy(),
-                    new HpSDRSetupper<FailureUrlCB, FileCrawlingConfigCQ>() {
-                        @Override
-                        public void setup(final String function,
-                                final SubQuery<FailureUrlCB> subQuery,
-                                final FileCrawlingConfigCQ cq,
-                                final String aliasName,
-                                final DerivedReferrerOption option) {
-                            cq.xsderiveFailureUrlList(function, subQuery,
-                                    aliasName, option);
-                        }
-                    }, _dbmetaProvider);
-        }
-
         /**
          * Prepare for (Specify)DerivedReferrer. <br />
          * {select max(FOO) from FILE_AUTHENTICATION where ...) as FOO_MAX} <br />

+ 0 - 35
src/main/java/jp/sf/fess/db/cbean/bs/BsWebCrawlingConfigCB.java

@@ -20,7 +20,6 @@ import jp.sf.fess.db.allcommon.DBFluteConfig;
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
 import jp.sf.fess.db.allcommon.ImplementedInvokerAssistant;
 import jp.sf.fess.db.allcommon.ImplementedSqlClauseCreator;
-import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.RequestHeaderCB;
 import jp.sf.fess.db.cbean.WebAuthenticationCB;
 import jp.sf.fess.db.cbean.WebConfigToBrowserTypeMappingCB;
@@ -562,40 +561,6 @@ public class BsWebCrawlingConfigCB extends AbstractConditionBean {
             return "WEB_CRAWLING_CONFIG";
         }
 
-        /**
-         * Prepare for (Specify)DerivedReferrer. <br />
-         * {select max(FOO) from FAILURE_URL where ...) as FOO_MAX} <br />
-         * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlList'.
-         * <pre>
-         * cb.specify().<span style="color: #FD4747">derivedFailureUrlList()</span>.<span style="color: #FD4747">max</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-         *     public void query(FailureUrlCB subCB) {
-         *         subCB.specify().<span style="color: #FD4747">columnFoo...</span> <span style="color: #3F7E5E">// derived column by function</span>
-         *         subCB.query().setBar... <span style="color: #3F7E5E">// referrer condition</span>
-         *     }
-         * }, FailureUrl.<span style="color: #FD4747">ALIAS_foo...</span>);
-         * </pre>
-         * @return The object to set up a function for referrer table. (NotNull)
-         */
-        public HpSDRFunction<FailureUrlCB, WebCrawlingConfigCQ> derivedFailureUrlList() {
-            assertDerived("failureUrlList");
-            if (xhasSyncQyCall()) {
-                xsyncQyCall().qy();
-            } // for sync (for example, this in ColumnQuery)
-            return new HpSDRFunction<FailureUrlCB, WebCrawlingConfigCQ>(
-                    _baseCB, _qyCall.qy(),
-                    new HpSDRSetupper<FailureUrlCB, WebCrawlingConfigCQ>() {
-                        @Override
-                        public void setup(final String function,
-                                final SubQuery<FailureUrlCB> subQuery,
-                                final WebCrawlingConfigCQ cq,
-                                final String aliasName,
-                                final DerivedReferrerOption option) {
-                            cq.xsderiveFailureUrlList(function, subQuery,
-                                    aliasName, option);
-                        }
-                    }, _dbmetaProvider);
-        }
-
         /**
          * Prepare for (Specify)DerivedReferrer. <br />
          * {select max(FOO) from REQUEST_HEADER where ...) as FOO_MAX} <br />

+ 85 - 279
src/main/java/jp/sf/fess/db/cbean/cq/bs/AbstractBsFailureUrlCQ.java

@@ -20,11 +20,7 @@ import java.util.Collection;
 
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
 import jp.sf.fess.db.cbean.FailureUrlCB;
-import jp.sf.fess.db.cbean.FileCrawlingConfigCB;
-import jp.sf.fess.db.cbean.WebCrawlingConfigCB;
 import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
-import jp.sf.fess.db.cbean.cq.FileCrawlingConfigCQ;
-import jp.sf.fess.db.cbean.cq.WebCrawlingConfigCQ;
 
 import org.seasar.dbflute.cbean.AbstractConditionQuery;
 import org.seasar.dbflute.cbean.ConditionQuery;
@@ -972,347 +968,157 @@ public abstract class AbstractBsFailureUrlCQ extends AbstractConditionQuery {
     abstract protected ConditionValue getCValueLastAccessTime();
 
     /**
-     * Equal(=). And NullIgnored, OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigId The value of webConfigId as equal. (NullAllowed: if null, no condition)
-     */
-    public void setWebConfigId_Equal(final Long webConfigId) {
-        doSetWebConfigId_Equal(webConfigId);
-    }
-
-    protected void doSetWebConfigId_Equal(final Long webConfigId) {
-        regWebConfigId(CK_EQ, webConfigId);
-    }
-
-    /**
-     * NotEqual(&lt;&gt;). And NullIgnored, OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigId The value of webConfigId as notEqual. (NullAllowed: if null, no condition)
-     */
-    public void setWebConfigId_NotEqual(final Long webConfigId) {
-        doSetWebConfigId_NotEqual(webConfigId);
-    }
-
-    protected void doSetWebConfigId_NotEqual(final Long webConfigId) {
-        regWebConfigId(CK_NES, webConfigId);
-    }
-
-    /**
-     * GreaterThan(&gt;). And NullIgnored, OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigId The value of webConfigId as greaterThan. (NullAllowed: if null, no condition)
-     */
-    public void setWebConfigId_GreaterThan(final Long webConfigId) {
-        regWebConfigId(CK_GT, webConfigId);
-    }
-
-    /**
-     * LessThan(&lt;). And NullIgnored, OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigId The value of webConfigId as lessThan. (NullAllowed: if null, no condition)
-     */
-    public void setWebConfigId_LessThan(final Long webConfigId) {
-        regWebConfigId(CK_LT, webConfigId);
-    }
-
-    /**
-     * GreaterEqual(&gt;=). And NullIgnored, OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigId The value of webConfigId as greaterEqual. (NullAllowed: if null, no condition)
-     */
-    public void setWebConfigId_GreaterEqual(final Long webConfigId) {
-        regWebConfigId(CK_GE, webConfigId);
-    }
-
-    /**
-     * LessEqual(&lt;=). And NullIgnored, OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigId The value of webConfigId as lessEqual. (NullAllowed: if null, no condition)
-     */
-    public void setWebConfigId_LessEqual(final Long webConfigId) {
-        regWebConfigId(CK_LE, webConfigId);
-    }
-
-    /**
-     * RangeOf with various options. (versatile) <br />
-     * {(default) minNumber &lt;= column &lt;= maxNumber} <br />
-     * And NullIgnored, OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param minNumber The min number of webConfigId. (NullAllowed: if null, no from-condition)
-     * @param maxNumber The max number of webConfigId. (NullAllowed: if null, no to-condition)
-     * @param rangeOfOption The option of range-of. (NotNull)
-     */
-    public void setWebConfigId_RangeOf(final Long minNumber,
-            final Long maxNumber, final RangeOfOption rangeOfOption) {
-        regROO(minNumber, maxNumber, getCValueWebConfigId(), "WEB_CONFIG_ID",
-                rangeOfOption);
-    }
-
-    /**
-     * InScope {in (1, 2)}. And NullIgnored, NullElementIgnored, SeveralRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigIdList The collection of webConfigId as inScope. (NullAllowed: if null (or empty), no condition)
-     */
-    public void setWebConfigId_InScope(final Collection<Long> webConfigIdList) {
-        doSetWebConfigId_InScope(webConfigIdList);
-    }
-
-    protected void doSetWebConfigId_InScope(
-            final Collection<Long> webConfigIdList) {
-        regINS(CK_INS, cTL(webConfigIdList), getCValueWebConfigId(),
-                "WEB_CONFIG_ID");
-    }
-
-    /**
-     * NotInScope {not in (1, 2)}. And NullIgnored, NullElementIgnored, SeveralRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     * @param webConfigIdList The collection of webConfigId as notInScope. (NullAllowed: if null (or empty), no condition)
+     * Equal(=). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as equal. (NullAllowed: if null (or empty), no condition)
      */
-    public void setWebConfigId_NotInScope(final Collection<Long> webConfigIdList) {
-        doSetWebConfigId_NotInScope(webConfigIdList);
+    public void setConfigId_Equal(final String configId) {
+        doSetConfigId_Equal(fRES(configId));
     }
 
-    protected void doSetWebConfigId_NotInScope(
-            final Collection<Long> webConfigIdList) {
-        regINS(CK_NINS, cTL(webConfigIdList), getCValueWebConfigId(),
-                "WEB_CONFIG_ID");
+    protected void doSetConfigId_Equal(final String configId) {
+        regConfigId(CK_EQ, configId);
     }
 
     /**
-     * Set up InScopeRelation (sub-query). <br />
-     * {in (select WEB_CONFIG_ID from WEB_CRAWLING_CONFIG where ...)} <br />
-     * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-     * @param subQuery The sub-query of WebCrawlingConfig for 'in-scope'. (NotNull)
-     */
-    public void inScopeWebCrawlingConfig(
-            final SubQuery<WebCrawlingConfigCB> subQuery) {
-        assertObjectNotNull("subQuery<WebCrawlingConfigCB>", subQuery);
-        final WebCrawlingConfigCB cb = new WebCrawlingConfigCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepWebConfigId_InScopeRelation_WebCrawlingConfig(cb
-                .query()); // for saving query-value.
-        registerInScopeRelation(cb.query(), "WEB_CONFIG_ID", "ID",
-                subQueryPropertyName, "webCrawlingConfig");
-    }
-
-    public abstract String keepWebConfigId_InScopeRelation_WebCrawlingConfig(
-            WebCrawlingConfigCQ subQuery);
-
-    /**
-     * Set up NotInScopeRelation (sub-query). <br />
-     * {not in (select WEB_CONFIG_ID from WEB_CRAWLING_CONFIG where ...)} <br />
-     * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-     * @param subQuery The sub-query of WebCrawlingConfig for 'not in-scope'. (NotNull)
+     * NotEqual(&lt;&gt;). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as notEqual. (NullAllowed: if null (or empty), no condition)
      */
-    public void notInScopeWebCrawlingConfig(
-            final SubQuery<WebCrawlingConfigCB> subQuery) {
-        assertObjectNotNull("subQuery<WebCrawlingConfigCB>", subQuery);
-        final WebCrawlingConfigCB cb = new WebCrawlingConfigCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepWebConfigId_NotInScopeRelation_WebCrawlingConfig(cb
-                .query()); // for saving query-value.
-        registerNotInScopeRelation(cb.query(), "WEB_CONFIG_ID", "ID",
-                subQueryPropertyName, "webCrawlingConfig");
+    public void setConfigId_NotEqual(final String configId) {
+        doSetConfigId_NotEqual(fRES(configId));
     }
 
-    public abstract String keepWebConfigId_NotInScopeRelation_WebCrawlingConfig(
-            WebCrawlingConfigCQ subQuery);
-
-    /**
-     * IsNull {is null}. And OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
-     */
-    public void setWebConfigId_IsNull() {
-        regWebConfigId(CK_ISN, DOBJ);
+    protected void doSetConfigId_NotEqual(final String configId) {
+        regConfigId(CK_NES, configId);
     }
 
     /**
-     * IsNotNull {is not null}. And OnlyOnceRegistered. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
+     * GreaterThan(&gt;). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as greaterThan. (NullAllowed: if null (or empty), no condition)
      */
-    public void setWebConfigId_IsNotNull() {
-        regWebConfigId(CK_ISNN, DOBJ);
+    public void setConfigId_GreaterThan(final String configId) {
+        regConfigId(CK_GT, fRES(configId));
     }
 
-    protected void regWebConfigId(final ConditionKey k, final Object v) {
-        regQ(k, v, getCValueWebConfigId(), "WEB_CONFIG_ID");
-    }
-
-    abstract protected ConditionValue getCValueWebConfigId();
-
     /**
-     * Equal(=). And NullIgnored, OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigId The value of fileConfigId as equal. (NullAllowed: if null, no condition)
+     * LessThan(&lt;). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as lessThan. (NullAllowed: if null (or empty), no condition)
      */
-    public void setFileConfigId_Equal(final Long fileConfigId) {
-        doSetFileConfigId_Equal(fileConfigId);
-    }
-
-    protected void doSetFileConfigId_Equal(final Long fileConfigId) {
-        regFileConfigId(CK_EQ, fileConfigId);
+    public void setConfigId_LessThan(final String configId) {
+        regConfigId(CK_LT, fRES(configId));
     }
 
     /**
-     * NotEqual(&lt;&gt;). And NullIgnored, OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigId The value of fileConfigId as notEqual. (NullAllowed: if null, no condition)
+     * GreaterEqual(&gt;=). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as greaterEqual. (NullAllowed: if null (or empty), no condition)
      */
-    public void setFileConfigId_NotEqual(final Long fileConfigId) {
-        doSetFileConfigId_NotEqual(fileConfigId);
-    }
-
-    protected void doSetFileConfigId_NotEqual(final Long fileConfigId) {
-        regFileConfigId(CK_NES, fileConfigId);
+    public void setConfigId_GreaterEqual(final String configId) {
+        regConfigId(CK_GE, fRES(configId));
     }
 
     /**
-     * GreaterThan(&gt;). And NullIgnored, OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigId The value of fileConfigId as greaterThan. (NullAllowed: if null, no condition)
+     * LessEqual(&lt;=). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as lessEqual. (NullAllowed: if null (or empty), no condition)
      */
-    public void setFileConfigId_GreaterThan(final Long fileConfigId) {
-        regFileConfigId(CK_GT, fileConfigId);
+    public void setConfigId_LessEqual(final String configId) {
+        regConfigId(CK_LE, fRES(configId));
     }
 
     /**
-     * LessThan(&lt;). And NullIgnored, OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigId The value of fileConfigId as lessThan. (NullAllowed: if null, no condition)
+     * InScope {in ('a', 'b')}. And NullOrEmptyIgnored, NullOrEmptyElementIgnored, SeveralRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configIdList The collection of configId as inScope. (NullAllowed: if null (or empty), no condition)
      */
-    public void setFileConfigId_LessThan(final Long fileConfigId) {
-        regFileConfigId(CK_LT, fileConfigId);
+    public void setConfigId_InScope(final Collection<String> configIdList) {
+        doSetConfigId_InScope(configIdList);
     }
 
-    /**
-     * GreaterEqual(&gt;=). And NullIgnored, OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigId The value of fileConfigId as greaterEqual. (NullAllowed: if null, no condition)
-     */
-    public void setFileConfigId_GreaterEqual(final Long fileConfigId) {
-        regFileConfigId(CK_GE, fileConfigId);
+    public void doSetConfigId_InScope(final Collection<String> configIdList) {
+        regINS(CK_INS, cTL(configIdList), getCValueConfigId(), "CONFIG_ID");
     }
 
     /**
-     * LessEqual(&lt;=). And NullIgnored, OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigId The value of fileConfigId as lessEqual. (NullAllowed: if null, no condition)
+     * NotInScope {not in ('a', 'b')}. And NullOrEmptyIgnored, NullOrEmptyElementIgnored, SeveralRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configIdList The collection of configId as notInScope. (NullAllowed: if null (or empty), no condition)
      */
-    public void setFileConfigId_LessEqual(final Long fileConfigId) {
-        regFileConfigId(CK_LE, fileConfigId);
+    public void setConfigId_NotInScope(final Collection<String> configIdList) {
+        doSetConfigId_NotInScope(configIdList);
     }
 
-    /**
-     * RangeOf with various options. (versatile) <br />
-     * {(default) minNumber &lt;= column &lt;= maxNumber} <br />
-     * And NullIgnored, OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param minNumber The min number of fileConfigId. (NullAllowed: if null, no from-condition)
-     * @param maxNumber The max number of fileConfigId. (NullAllowed: if null, no to-condition)
-     * @param rangeOfOption The option of range-of. (NotNull)
-     */
-    public void setFileConfigId_RangeOf(final Long minNumber,
-            final Long maxNumber, final RangeOfOption rangeOfOption) {
-        regROO(minNumber, maxNumber, getCValueFileConfigId(), "FILE_CONFIG_ID",
-                rangeOfOption);
+    public void doSetConfigId_NotInScope(final Collection<String> configIdList) {
+        regINS(CK_NINS, cTL(configIdList), getCValueConfigId(), "CONFIG_ID");
     }
 
     /**
-     * InScope {in (1, 2)}. And NullIgnored, NullElementIgnored, SeveralRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigIdList The collection of fileConfigId as inScope. (NullAllowed: if null (or empty), no condition)
+     * PrefixSearch {like 'xxx%' escape ...}. And NullOrEmptyIgnored, SeveralRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as prefixSearch. (NullAllowed: if null (or empty), no condition)
      */
-    public void setFileConfigId_InScope(final Collection<Long> fileConfigIdList) {
-        doSetFileConfigId_InScope(fileConfigIdList);
-    }
-
-    protected void doSetFileConfigId_InScope(
-            final Collection<Long> fileConfigIdList) {
-        regINS(CK_INS, cTL(fileConfigIdList), getCValueFileConfigId(),
-                "FILE_CONFIG_ID");
+    public void setConfigId_PrefixSearch(final String configId) {
+        setConfigId_LikeSearch(configId, cLSOP());
     }
 
     /**
-     * NotInScope {not in (1, 2)}. And NullIgnored, NullElementIgnored, SeveralRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @param fileConfigIdList The collection of fileConfigId as notInScope. (NullAllowed: if null (or empty), no condition)
+     * LikeSearch with various options. (versatile) {like '%xxx%' escape ...}. And NullOrEmptyIgnored, SeveralRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)} <br />
+     * <pre>e.g. setConfigId_LikeSearch("xxx", new <span style="color: #FD4747">LikeSearchOption</span>().likeContain());</pre>
+     * @param configId The value of configId as likeSearch. (NullAllowed: if null (or empty), no condition)
+     * @param likeSearchOption The option of like-search. (NotNull)
      */
-    public void setFileConfigId_NotInScope(
-            final Collection<Long> fileConfigIdList) {
-        doSetFileConfigId_NotInScope(fileConfigIdList);
-    }
-
-    protected void doSetFileConfigId_NotInScope(
-            final Collection<Long> fileConfigIdList) {
-        regINS(CK_NINS, cTL(fileConfigIdList), getCValueFileConfigId(),
-                "FILE_CONFIG_ID");
+    public void setConfigId_LikeSearch(final String configId,
+            final LikeSearchOption likeSearchOption) {
+        regLSQ(CK_LS, fRES(configId), getCValueConfigId(), "CONFIG_ID",
+                likeSearchOption);
     }
 
     /**
-     * Set up InScopeRelation (sub-query). <br />
-     * {in (select FILE_CONFIG_ID from FILE_CRAWLING_CONFIG where ...)} <br />
-     * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-     * @param subQuery The sub-query of FileCrawlingConfig for 'in-scope'. (NotNull)
+     * NotLikeSearch with various options. (versatile) {not like 'xxx%' escape ...} <br />
+     * And NullOrEmptyIgnored, SeveralRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
+     * @param configId The value of configId as notLikeSearch. (NullAllowed: if null (or empty), no condition)
+     * @param likeSearchOption The option of not-like-search. (NotNull)
      */
-    public void inScopeFileCrawlingConfig(
-            final SubQuery<FileCrawlingConfigCB> subQuery) {
-        assertObjectNotNull("subQuery<FileCrawlingConfigCB>", subQuery);
-        final FileCrawlingConfigCB cb = new FileCrawlingConfigCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepFileConfigId_InScopeRelation_FileCrawlingConfig(cb
-                .query()); // for saving query-value.
-        registerInScopeRelation(cb.query(), "FILE_CONFIG_ID", "ID",
-                subQueryPropertyName, "fileCrawlingConfig");
+    public void setConfigId_NotLikeSearch(final String configId,
+            final LikeSearchOption likeSearchOption) {
+        regLSQ(CK_NLS, fRES(configId), getCValueConfigId(), "CONFIG_ID",
+                likeSearchOption);
     }
 
-    public abstract String keepFileConfigId_InScopeRelation_FileCrawlingConfig(
-            FileCrawlingConfigCQ subQuery);
-
     /**
-     * Set up NotInScopeRelation (sub-query). <br />
-     * {not in (select FILE_CONFIG_ID from FILE_CRAWLING_CONFIG where ...)} <br />
-     * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-     * @param subQuery The sub-query of FileCrawlingConfig for 'not in-scope'. (NotNull)
+     * IsNull {is null}. And OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
      */
-    public void notInScopeFileCrawlingConfig(
-            final SubQuery<FileCrawlingConfigCB> subQuery) {
-        assertObjectNotNull("subQuery<FileCrawlingConfigCB>", subQuery);
-        final FileCrawlingConfigCB cb = new FileCrawlingConfigCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepFileConfigId_NotInScopeRelation_FileCrawlingConfig(cb
-                .query()); // for saving query-value.
-        registerNotInScopeRelation(cb.query(), "FILE_CONFIG_ID", "ID",
-                subQueryPropertyName, "fileCrawlingConfig");
+    public void setConfigId_IsNull() {
+        regConfigId(CK_ISN, DOBJ);
     }
 
-    public abstract String keepFileConfigId_NotInScopeRelation_FileCrawlingConfig(
-            FileCrawlingConfigCQ subQuery);
-
     /**
-     * IsNull {is null}. And OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
+     * IsNullOrEmpty {is null or empty}. And OnlyOnceRegistered. <br />
+     * CONFIG_ID: {IX, VARCHAR(100)}
      */
-    public void setFileConfigId_IsNull() {
-        regFileConfigId(CK_ISN, DOBJ);
+    public void setConfigId_IsNullOrEmpty() {
+        regConfigId(CK_ISNOE, DOBJ);
     }
 
     /**
      * IsNotNull {is not null}. And OnlyOnceRegistered. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
+     * CONFIG_ID: {IX, VARCHAR(100)}
      */
-    public void setFileConfigId_IsNotNull() {
-        regFileConfigId(CK_ISNN, DOBJ);
+    public void setConfigId_IsNotNull() {
+        regConfigId(CK_ISNN, DOBJ);
     }
 
-    protected void regFileConfigId(final ConditionKey k, final Object v) {
-        regQ(k, v, getCValueFileConfigId(), "FILE_CONFIG_ID");
+    protected void regConfigId(final ConditionKey k, final Object v) {
+        regQ(k, v, getCValueConfigId(), "CONFIG_ID");
     }
 
-    abstract protected ConditionValue getCValueFileConfigId();
+    abstract protected ConditionValue getCValueConfigId();
 
     // ===================================================================================
     //                                                                     ScalarCondition

+ 0 - 166
src/main/java/jp/sf/fess/db/cbean/cq/bs/AbstractBsFileCrawlingConfigCQ.java

@@ -19,13 +19,11 @@ package jp.sf.fess.db.cbean.cq.bs;
 import java.util.Collection;
 
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
-import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.FileAuthenticationCB;
 import jp.sf.fess.db.cbean.FileConfigToBrowserTypeMappingCB;
 import jp.sf.fess.db.cbean.FileConfigToLabelTypeMappingCB;
 import jp.sf.fess.db.cbean.FileConfigToRoleTypeMappingCB;
 import jp.sf.fess.db.cbean.FileCrawlingConfigCB;
-import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
 import jp.sf.fess.db.cbean.cq.FileAuthenticationCQ;
 import jp.sf.fess.db.cbean.cq.FileConfigToBrowserTypeMappingCQ;
 import jp.sf.fess.db.cbean.cq.FileConfigToLabelTypeMappingCQ;
@@ -187,33 +185,6 @@ public abstract class AbstractBsFileCrawlingConfigCQ extends
         regINS(CK_NINS, cTL(idList), getCValueId(), "ID");
     }
 
-    /**
-     * Set up ExistsReferrer (co-related sub-query). <br />
-     * {exists (select FILE_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlAsOne'.
-     * <pre>
-     * cb.query().<span style="color: #FD4747">existsFailureUrlList</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-     *     public void query(FileCrawlingConfigCB subCB) {
-     *         subCB.query().setXxx...
-     *     }
-     * });
-     * </pre>
-     * @param subQuery The sub-query of FailureUrlList for 'exists'. (NotNull)
-     */
-    public void existsFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForExistsReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_ExistsReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerExistsReferrer(cb.query(), "ID", "FILE_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_ExistsReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up ExistsReferrer (co-related sub-query). <br />
      * {exists (select FILE_CRAWLING_CONFIG_ID from FILE_AUTHENTICATION where ...)} <br />
@@ -328,33 +299,6 @@ public abstract class AbstractBsFileCrawlingConfigCQ extends
     public abstract String keepId_ExistsReferrer_FileConfigToRoleTypeMappingList(
             FileConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Set up NotExistsReferrer (co-related sub-query). <br />
-     * {not exists (select FILE_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlAsOne'.
-     * <pre>
-     * cb.query().<span style="color: #FD4747">notExistsFailureUrlList</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-     *     public void query(FileCrawlingConfigCB subCB) {
-     *         subCB.query().setXxx...
-     *     }
-     * });
-     * </pre>
-     * @param subQuery The sub-query of Id_NotExistsReferrer_FailureUrlList for 'not exists'. (NotNull)
-     */
-    public void notExistsFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForExistsReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_NotExistsReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerNotExistsReferrer(cb.query(), "ID", "FILE_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_NotExistsReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up NotExistsReferrer (co-related sub-query). <br />
      * {not exists (select FILE_CRAWLING_CONFIG_ID from FILE_AUTHENTICATION where ...)} <br />
@@ -469,26 +413,6 @@ public abstract class AbstractBsFileCrawlingConfigCQ extends
     public abstract String keepId_NotExistsReferrer_FileConfigToRoleTypeMappingList(
             FileConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Set up InScopeRelation (sub-query). <br />
-     * {in (select FILE_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlAsOne'.
-     * @param subQuery The sub-query of FailureUrlList for 'in-scope'. (NotNull)
-     */
-    public void inScopeFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_InScopeRelation_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerInScopeRelation(cb.query(), "ID", "FILE_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_InScopeRelation_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up InScopeRelation (sub-query). <br />
      * {in (select FILE_CRAWLING_CONFIG_ID from FILE_AUTHENTICATION where ...)} <br />
@@ -575,26 +499,6 @@ public abstract class AbstractBsFileCrawlingConfigCQ extends
     public abstract String keepId_InScopeRelation_FileConfigToRoleTypeMappingList(
             FileConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Set up NotInScopeRelation (sub-query). <br />
-     * {not in (select FILE_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlAsOne'.
-     * @param subQuery The sub-query of FailureUrlList for 'not in-scope'. (NotNull)
-     */
-    public void notInScopeFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_NotInScopeRelation_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerNotInScopeRelation(cb.query(), "ID", "FILE_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_NotInScopeRelation_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up NotInScopeRelation (sub-query). <br />
      * {not in (select FILE_CRAWLING_CONFIG_ID from FILE_AUTHENTICATION where ...)} <br />
@@ -681,23 +585,6 @@ public abstract class AbstractBsFileCrawlingConfigCQ extends
     public abstract String keepId_NotInScopeRelation_FileConfigToRoleTypeMappingList(
             FileConfigToRoleTypeMappingCQ subQuery);
 
-    public void xsderiveFailureUrlList(final String function,
-            final SubQuery<FailureUrlCB> subQuery, final String aliasName,
-            final DerivedReferrerOption option) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForDerivedReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_SpecifyDerivedReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerSpecifyDerivedReferrer(function, cb.query(), "ID",
-                "FILE_CONFIG_ID", subQueryPropertyName, "failureUrlList",
-                aliasName, option);
-    }
-
-    public abstract String keepId_SpecifyDerivedReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     public void xsderiveFileAuthenticationList(final String function,
             final SubQuery<FileAuthenticationCB> subQuery,
             final String aliasName, final DerivedReferrerOption option) {
@@ -769,59 +656,6 @@ public abstract class AbstractBsFileCrawlingConfigCQ extends
     public abstract String keepId_SpecifyDerivedReferrer_FileConfigToRoleTypeMappingList(
             FileConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Prepare for (Query)DerivedReferrer. <br />
-     * {FOO &lt;= (select max(BAR) from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by FILE_CONFIG_ID, named 'failureUrlAsOne'.
-     * <pre>
-     * cb.query().<span style="color: #FD4747">derivedFailureUrlList()</span>.<span style="color: #FD4747">max</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-     *     public void query(FailureUrlCB subCB) {
-     *         subCB.specify().<span style="color: #FD4747">columnFoo...</span> <span style="color: #3F7E5E">// derived column by function</span>
-     *         subCB.query().setBar... <span style="color: #3F7E5E">// referrer condition</span>
-     *     }
-     * }).<span style="color: #FD4747">greaterEqual</span>(123); <span style="color: #3F7E5E">// condition to derived column</span>
-     * </pre>
-     * @return The object to set up a function for referrer table. (NotNull)
-     */
-    public HpQDRFunction<FailureUrlCB> derivedFailureUrlList() {
-        return xcreateQDRFunctionFailureUrlList();
-    }
-
-    protected HpQDRFunction<FailureUrlCB> xcreateQDRFunctionFailureUrlList() {
-        return new HpQDRFunction<FailureUrlCB>(
-                new HpQDRSetupper<FailureUrlCB>() {
-                    @Override
-                    public void setup(final String function,
-                            final SubQuery<FailureUrlCB> subQuery,
-                            final String operand, final Object value,
-                            final DerivedReferrerOption option) {
-                        xqderiveFailureUrlList(function, subQuery, operand,
-                                value, option);
-                    }
-                });
-    }
-
-    public void xqderiveFailureUrlList(final String function,
-            final SubQuery<FailureUrlCB> subQuery, final String operand,
-            final Object value, final DerivedReferrerOption option) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForDerivedReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_QueryDerivedReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        final String parameterPropertyName = keepId_QueryDerivedReferrer_FailureUrlListParameter(value);
-        registerQueryDerivedReferrer(function, cb.query(), "ID",
-                "FILE_CONFIG_ID", subQueryPropertyName, "failureUrlList",
-                operand, value, parameterPropertyName, option);
-    }
-
-    public abstract String keepId_QueryDerivedReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
-    public abstract String keepId_QueryDerivedReferrer_FailureUrlListParameter(
-            Object parameterValue);
-
     /**
      * Prepare for (Query)DerivedReferrer. <br />
      * {FOO &lt;= (select max(BAR) from FILE_AUTHENTICATION where ...)} <br />

+ 0 - 166
src/main/java/jp/sf/fess/db/cbean/cq/bs/AbstractBsWebCrawlingConfigCQ.java

@@ -19,14 +19,12 @@ package jp.sf.fess.db.cbean.cq.bs;
 import java.util.Collection;
 
 import jp.sf.fess.db.allcommon.DBMetaInstanceHandler;
-import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.RequestHeaderCB;
 import jp.sf.fess.db.cbean.WebAuthenticationCB;
 import jp.sf.fess.db.cbean.WebConfigToBrowserTypeMappingCB;
 import jp.sf.fess.db.cbean.WebConfigToLabelTypeMappingCB;
 import jp.sf.fess.db.cbean.WebConfigToRoleTypeMappingCB;
 import jp.sf.fess.db.cbean.WebCrawlingConfigCB;
-import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
 import jp.sf.fess.db.cbean.cq.RequestHeaderCQ;
 import jp.sf.fess.db.cbean.cq.WebAuthenticationCQ;
 import jp.sf.fess.db.cbean.cq.WebConfigToBrowserTypeMappingCQ;
@@ -189,33 +187,6 @@ public abstract class AbstractBsWebCrawlingConfigCQ extends
         regINS(CK_NINS, cTL(idList), getCValueId(), "ID");
     }
 
-    /**
-     * Set up ExistsReferrer (co-related sub-query). <br />
-     * {exists (select WEB_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlAsOne'.
-     * <pre>
-     * cb.query().<span style="color: #FD4747">existsFailureUrlList</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-     *     public void query(WebCrawlingConfigCB subCB) {
-     *         subCB.query().setXxx...
-     *     }
-     * });
-     * </pre>
-     * @param subQuery The sub-query of FailureUrlList for 'exists'. (NotNull)
-     */
-    public void existsFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForExistsReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_ExistsReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerExistsReferrer(cb.query(), "ID", "WEB_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_ExistsReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up ExistsReferrer (co-related sub-query). <br />
      * {exists (select WEB_CRAWLING_CONFIG_ID from REQUEST_HEADER where ...)} <br />
@@ -356,33 +327,6 @@ public abstract class AbstractBsWebCrawlingConfigCQ extends
     public abstract String keepId_ExistsReferrer_WebConfigToRoleTypeMappingList(
             WebConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Set up NotExistsReferrer (co-related sub-query). <br />
-     * {not exists (select WEB_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlAsOne'.
-     * <pre>
-     * cb.query().<span style="color: #FD4747">notExistsFailureUrlList</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-     *     public void query(WebCrawlingConfigCB subCB) {
-     *         subCB.query().setXxx...
-     *     }
-     * });
-     * </pre>
-     * @param subQuery The sub-query of Id_NotExistsReferrer_FailureUrlList for 'not exists'. (NotNull)
-     */
-    public void notExistsFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForExistsReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_NotExistsReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerNotExistsReferrer(cb.query(), "ID", "WEB_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_NotExistsReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up NotExistsReferrer (co-related sub-query). <br />
      * {not exists (select WEB_CRAWLING_CONFIG_ID from REQUEST_HEADER where ...)} <br />
@@ -524,26 +468,6 @@ public abstract class AbstractBsWebCrawlingConfigCQ extends
     public abstract String keepId_NotExistsReferrer_WebConfigToRoleTypeMappingList(
             WebConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Set up InScopeRelation (sub-query). <br />
-     * {in (select WEB_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlAsOne'.
-     * @param subQuery The sub-query of FailureUrlList for 'in-scope'. (NotNull)
-     */
-    public void inScopeFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_InScopeRelation_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerInScopeRelation(cb.query(), "ID", "WEB_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_InScopeRelation_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up InScopeRelation (sub-query). <br />
      * {in (select WEB_CRAWLING_CONFIG_ID from REQUEST_HEADER where ...)} <br />
@@ -650,26 +574,6 @@ public abstract class AbstractBsWebCrawlingConfigCQ extends
     public abstract String keepId_InScopeRelation_WebConfigToRoleTypeMappingList(
             WebConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Set up NotInScopeRelation (sub-query). <br />
-     * {not in (select WEB_CONFIG_ID from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlAsOne'.
-     * @param subQuery The sub-query of FailureUrlList for 'not in-scope'. (NotNull)
-     */
-    public void notInScopeFailureUrlList(final SubQuery<FailureUrlCB> subQuery) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForInScopeRelation(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_NotInScopeRelation_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerNotInScopeRelation(cb.query(), "ID", "WEB_CONFIG_ID",
-                subQueryPropertyName, "failureUrlList");
-    }
-
-    public abstract String keepId_NotInScopeRelation_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     /**
      * Set up NotInScopeRelation (sub-query). <br />
      * {not in (select WEB_CRAWLING_CONFIG_ID from REQUEST_HEADER where ...)} <br />
@@ -776,23 +680,6 @@ public abstract class AbstractBsWebCrawlingConfigCQ extends
     public abstract String keepId_NotInScopeRelation_WebConfigToRoleTypeMappingList(
             WebConfigToRoleTypeMappingCQ subQuery);
 
-    public void xsderiveFailureUrlList(final String function,
-            final SubQuery<FailureUrlCB> subQuery, final String aliasName,
-            final DerivedReferrerOption option) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForDerivedReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_SpecifyDerivedReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        registerSpecifyDerivedReferrer(function, cb.query(), "ID",
-                "WEB_CONFIG_ID", subQueryPropertyName, "failureUrlList",
-                aliasName, option);
-    }
-
-    public abstract String keepId_SpecifyDerivedReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
     public void xsderiveRequestHeaderList(final String function,
             final SubQuery<RequestHeaderCB> subQuery, final String aliasName,
             final DerivedReferrerOption option) {
@@ -880,59 +767,6 @@ public abstract class AbstractBsWebCrawlingConfigCQ extends
     public abstract String keepId_SpecifyDerivedReferrer_WebConfigToRoleTypeMappingList(
             WebConfigToRoleTypeMappingCQ subQuery);
 
-    /**
-     * Prepare for (Query)DerivedReferrer. <br />
-     * {FOO &lt;= (select max(BAR) from FAILURE_URL where ...)} <br />
-     * FAILURE_URL by WEB_CONFIG_ID, named 'failureUrlAsOne'.
-     * <pre>
-     * cb.query().<span style="color: #FD4747">derivedFailureUrlList()</span>.<span style="color: #FD4747">max</span>(new SubQuery&lt;FailureUrlCB&gt;() {
-     *     public void query(FailureUrlCB subCB) {
-     *         subCB.specify().<span style="color: #FD4747">columnFoo...</span> <span style="color: #3F7E5E">// derived column by function</span>
-     *         subCB.query().setBar... <span style="color: #3F7E5E">// referrer condition</span>
-     *     }
-     * }).<span style="color: #FD4747">greaterEqual</span>(123); <span style="color: #3F7E5E">// condition to derived column</span>
-     * </pre>
-     * @return The object to set up a function for referrer table. (NotNull)
-     */
-    public HpQDRFunction<FailureUrlCB> derivedFailureUrlList() {
-        return xcreateQDRFunctionFailureUrlList();
-    }
-
-    protected HpQDRFunction<FailureUrlCB> xcreateQDRFunctionFailureUrlList() {
-        return new HpQDRFunction<FailureUrlCB>(
-                new HpQDRSetupper<FailureUrlCB>() {
-                    @Override
-                    public void setup(final String function,
-                            final SubQuery<FailureUrlCB> subQuery,
-                            final String operand, final Object value,
-                            final DerivedReferrerOption option) {
-                        xqderiveFailureUrlList(function, subQuery, operand,
-                                value, option);
-                    }
-                });
-    }
-
-    public void xqderiveFailureUrlList(final String function,
-            final SubQuery<FailureUrlCB> subQuery, final String operand,
-            final Object value, final DerivedReferrerOption option) {
-        assertObjectNotNull("subQuery<FailureUrlCB>", subQuery);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.xsetupForDerivedReferrer(this);
-        subQuery.query(cb);
-        final String subQueryPropertyName = keepId_QueryDerivedReferrer_FailureUrlList(cb
-                .query()); // for saving query-value.
-        final String parameterPropertyName = keepId_QueryDerivedReferrer_FailureUrlListParameter(value);
-        registerQueryDerivedReferrer(function, cb.query(), "ID",
-                "WEB_CONFIG_ID", subQueryPropertyName, "failureUrlList",
-                operand, value, parameterPropertyName, option);
-    }
-
-    public abstract String keepId_QueryDerivedReferrer_FailureUrlList(
-            FailureUrlCQ subQuery);
-
-    public abstract String keepId_QueryDerivedReferrer_FailureUrlListParameter(
-            Object parameterValue);
-
     /**
      * Prepare for (Query)DerivedReferrer. <br />
      * {FOO &lt;= (select max(BAR) from REQUEST_HEADER where ...)} <br />

+ 13 - 219
src/main/java/jp/sf/fess/db/cbean/cq/bs/BsFailureUrlCQ.java

@@ -20,8 +20,6 @@ import java.util.Map;
 
 import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
-import jp.sf.fess.db.cbean.cq.FileCrawlingConfigCQ;
-import jp.sf.fess.db.cbean.cq.WebCrawlingConfigCQ;
 import jp.sf.fess.db.cbean.cq.ciq.FailureUrlCIQ;
 
 import org.seasar.dbflute.cbean.ConditionQuery;
@@ -340,145 +338,37 @@ public class BsFailureUrlCQ extends AbstractBsFailureUrlCQ {
         return this;
     }
 
-    protected ConditionValue _webConfigId;
+    protected ConditionValue _configId;
 
-    public ConditionValue getWebConfigId() {
-        if (_webConfigId == null) {
-            _webConfigId = nCV();
+    public ConditionValue getConfigId() {
+        if (_configId == null) {
+            _configId = nCV();
         }
-        return _webConfigId;
+        return _configId;
     }
 
     @Override
-    protected ConditionValue getCValueWebConfigId() {
-        return getWebConfigId();
-    }
-
-    protected Map<String, WebCrawlingConfigCQ> _webConfigId_InScopeRelation_WebCrawlingConfigMap;
-
-    public Map<String, WebCrawlingConfigCQ> getWebConfigId_InScopeRelation_WebCrawlingConfig() {
-        return _webConfigId_InScopeRelation_WebCrawlingConfigMap;
-    }
-
-    @Override
-    public String keepWebConfigId_InScopeRelation_WebCrawlingConfig(
-            final WebCrawlingConfigCQ subQuery) {
-        if (_webConfigId_InScopeRelation_WebCrawlingConfigMap == null) {
-            _webConfigId_InScopeRelation_WebCrawlingConfigMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_webConfigId_InScopeRelation_WebCrawlingConfigMap.size() + 1);
-        _webConfigId_InScopeRelation_WebCrawlingConfigMap.put(key, subQuery);
-        return "webConfigId_InScopeRelation_WebCrawlingConfig." + key;
-    }
-
-    protected Map<String, WebCrawlingConfigCQ> _webConfigId_NotInScopeRelation_WebCrawlingConfigMap;
-
-    public Map<String, WebCrawlingConfigCQ> getWebConfigId_NotInScopeRelation_WebCrawlingConfig() {
-        return _webConfigId_NotInScopeRelation_WebCrawlingConfigMap;
-    }
-
-    @Override
-    public String keepWebConfigId_NotInScopeRelation_WebCrawlingConfig(
-            final WebCrawlingConfigCQ subQuery) {
-        if (_webConfigId_NotInScopeRelation_WebCrawlingConfigMap == null) {
-            _webConfigId_NotInScopeRelation_WebCrawlingConfigMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_webConfigId_NotInScopeRelation_WebCrawlingConfigMap.size() + 1);
-        _webConfigId_NotInScopeRelation_WebCrawlingConfigMap.put(key, subQuery);
-        return "webConfigId_NotInScopeRelation_WebCrawlingConfig." + key;
+    protected ConditionValue getCValueConfigId() {
+        return getConfigId();
     }
 
     /** 
      * Add order-by as ascend. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
+     * CONFIG_ID: {IX, VARCHAR(100)}
      * @return this. (NotNull)
      */
-    public BsFailureUrlCQ addOrderBy_WebConfigId_Asc() {
-        regOBA("WEB_CONFIG_ID");
+    public BsFailureUrlCQ addOrderBy_ConfigId_Asc() {
+        regOBA("CONFIG_ID");
         return this;
     }
 
     /**
      * Add order-by as descend. <br />
-     * WEB_CONFIG_ID: {IX, BIGINT(19), FK to WEB_CRAWLING_CONFIG}
+     * CONFIG_ID: {IX, VARCHAR(100)}
      * @return this. (NotNull)
      */
-    public BsFailureUrlCQ addOrderBy_WebConfigId_Desc() {
-        regOBD("WEB_CONFIG_ID");
-        return this;
-    }
-
-    protected ConditionValue _fileConfigId;
-
-    public ConditionValue getFileConfigId() {
-        if (_fileConfigId == null) {
-            _fileConfigId = nCV();
-        }
-        return _fileConfigId;
-    }
-
-    @Override
-    protected ConditionValue getCValueFileConfigId() {
-        return getFileConfigId();
-    }
-
-    protected Map<String, FileCrawlingConfigCQ> _fileConfigId_InScopeRelation_FileCrawlingConfigMap;
-
-    public Map<String, FileCrawlingConfigCQ> getFileConfigId_InScopeRelation_FileCrawlingConfig() {
-        return _fileConfigId_InScopeRelation_FileCrawlingConfigMap;
-    }
-
-    @Override
-    public String keepFileConfigId_InScopeRelation_FileCrawlingConfig(
-            final FileCrawlingConfigCQ subQuery) {
-        if (_fileConfigId_InScopeRelation_FileCrawlingConfigMap == null) {
-            _fileConfigId_InScopeRelation_FileCrawlingConfigMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_fileConfigId_InScopeRelation_FileCrawlingConfigMap.size() + 1);
-        _fileConfigId_InScopeRelation_FileCrawlingConfigMap.put(key, subQuery);
-        return "fileConfigId_InScopeRelation_FileCrawlingConfig." + key;
-    }
-
-    protected Map<String, FileCrawlingConfigCQ> _fileConfigId_NotInScopeRelation_FileCrawlingConfigMap;
-
-    public Map<String, FileCrawlingConfigCQ> getFileConfigId_NotInScopeRelation_FileCrawlingConfig() {
-        return _fileConfigId_NotInScopeRelation_FileCrawlingConfigMap;
-    }
-
-    @Override
-    public String keepFileConfigId_NotInScopeRelation_FileCrawlingConfig(
-            final FileCrawlingConfigCQ subQuery) {
-        if (_fileConfigId_NotInScopeRelation_FileCrawlingConfigMap == null) {
-            _fileConfigId_NotInScopeRelation_FileCrawlingConfigMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_fileConfigId_NotInScopeRelation_FileCrawlingConfigMap
-                        .size() + 1);
-        _fileConfigId_NotInScopeRelation_FileCrawlingConfigMap.put(key,
-                subQuery);
-        return "fileConfigId_NotInScopeRelation_FileCrawlingConfig." + key;
-    }
-
-    /** 
-     * Add order-by as ascend. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @return this. (NotNull)
-     */
-    public BsFailureUrlCQ addOrderBy_FileConfigId_Asc() {
-        regOBA("FILE_CONFIG_ID");
-        return this;
-    }
-
-    /**
-     * Add order-by as descend. <br />
-     * FILE_CONFIG_ID: {IX, BIGINT(19), FK to FILE_CRAWLING_CONFIG}
-     * @return this. (NotNull)
-     */
-    public BsFailureUrlCQ addOrderBy_FileConfigId_Desc() {
-        regOBD("FILE_CONFIG_ID");
+    public BsFailureUrlCQ addOrderBy_ConfigId_Desc() {
+        regOBD("CONFIG_ID");
         return this;
     }
 
@@ -530,107 +420,11 @@ public class BsFailureUrlCQ extends AbstractBsFailureUrlCQ {
     protected void reflectRelationOnUnionQuery(
             final ConditionQuery baseQueryAsSuper,
             final ConditionQuery unionQueryAsSuper) {
-        final FailureUrlCQ baseQuery = (FailureUrlCQ) baseQueryAsSuper;
-        final FailureUrlCQ unionQuery = (FailureUrlCQ) unionQueryAsSuper;
-        if (baseQuery.hasConditionQueryFileCrawlingConfig()) {
-            unionQuery.queryFileCrawlingConfig().reflectRelationOnUnionQuery(
-                    baseQuery.queryFileCrawlingConfig(),
-                    unionQuery.queryFileCrawlingConfig());
-        }
-        if (baseQuery.hasConditionQueryWebCrawlingConfig()) {
-            unionQuery.queryWebCrawlingConfig().reflectRelationOnUnionQuery(
-                    baseQuery.queryWebCrawlingConfig(),
-                    unionQuery.queryWebCrawlingConfig());
-        }
     }
 
     // ===================================================================================
     //                                                                       Foreign Query
     //                                                                       =============
-    /**
-     * Get the condition-query for relation table. <br />
-     * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-     * @return The instance of condition-query. (NotNull)
-     */
-    public FileCrawlingConfigCQ queryFileCrawlingConfig() {
-        return getConditionQueryFileCrawlingConfig();
-    }
-
-    protected FileCrawlingConfigCQ _conditionQueryFileCrawlingConfig;
-
-    public FileCrawlingConfigCQ getConditionQueryFileCrawlingConfig() {
-        if (_conditionQueryFileCrawlingConfig == null) {
-            _conditionQueryFileCrawlingConfig = xcreateQueryFileCrawlingConfig();
-            xsetupOuterJoinFileCrawlingConfig();
-        }
-        return _conditionQueryFileCrawlingConfig;
-    }
-
-    protected FileCrawlingConfigCQ xcreateQueryFileCrawlingConfig() {
-        final String nrp = resolveNextRelationPath("FAILURE_URL",
-                "fileCrawlingConfig");
-        final String jan = resolveJoinAliasName(nrp, xgetNextNestLevel());
-        final FileCrawlingConfigCQ cq = new FileCrawlingConfigCQ(this,
-                xgetSqlClause(), jan, xgetNextNestLevel());
-        cq.xsetBaseCB(_baseCB);
-        cq.xsetForeignPropertyName("fileCrawlingConfig");
-        cq.xsetRelationPath(nrp);
-        return cq;
-    }
-
-    protected void xsetupOuterJoinFileCrawlingConfig() {
-        final FileCrawlingConfigCQ cq = getConditionQueryFileCrawlingConfig();
-        final Map<String, String> joinOnMap = newLinkedHashMapSized(4);
-        joinOnMap.put("FILE_CONFIG_ID", "ID");
-        registerOuterJoin(cq, joinOnMap, "fileCrawlingConfig");
-    }
-
-    public boolean hasConditionQueryFileCrawlingConfig() {
-        return _conditionQueryFileCrawlingConfig != null;
-    }
-
-    /**
-     * Get the condition-query for relation table. <br />
-     * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-     * @return The instance of condition-query. (NotNull)
-     */
-    public WebCrawlingConfigCQ queryWebCrawlingConfig() {
-        return getConditionQueryWebCrawlingConfig();
-    }
-
-    protected WebCrawlingConfigCQ _conditionQueryWebCrawlingConfig;
-
-    public WebCrawlingConfigCQ getConditionQueryWebCrawlingConfig() {
-        if (_conditionQueryWebCrawlingConfig == null) {
-            _conditionQueryWebCrawlingConfig = xcreateQueryWebCrawlingConfig();
-            xsetupOuterJoinWebCrawlingConfig();
-        }
-        return _conditionQueryWebCrawlingConfig;
-    }
-
-    protected WebCrawlingConfigCQ xcreateQueryWebCrawlingConfig() {
-        final String nrp = resolveNextRelationPath("FAILURE_URL",
-                "webCrawlingConfig");
-        final String jan = resolveJoinAliasName(nrp, xgetNextNestLevel());
-        final WebCrawlingConfigCQ cq = new WebCrawlingConfigCQ(this,
-                xgetSqlClause(), jan, xgetNextNestLevel());
-        cq.xsetBaseCB(_baseCB);
-        cq.xsetForeignPropertyName("webCrawlingConfig");
-        cq.xsetRelationPath(nrp);
-        return cq;
-    }
-
-    protected void xsetupOuterJoinWebCrawlingConfig() {
-        final WebCrawlingConfigCQ cq = getConditionQueryWebCrawlingConfig();
-        final Map<String, String> joinOnMap = newLinkedHashMapSized(4);
-        joinOnMap.put("WEB_CONFIG_ID", "ID");
-        registerOuterJoin(cq, joinOnMap, "webCrawlingConfig");
-    }
-
-    public boolean hasConditionQueryWebCrawlingConfig() {
-        return _conditionQueryWebCrawlingConfig != null;
-    }
-
     @Override
     protected Map<String, Object> xfindFixedConditionDynamicParameterMap(
             final String property) {

+ 0 - 128
src/main/java/jp/sf/fess/db/cbean/cq/bs/BsFileCrawlingConfigCQ.java

@@ -19,7 +19,6 @@ package jp.sf.fess.db.cbean.cq.bs;
 import java.util.Map;
 
 import jp.sf.fess.db.cbean.FileCrawlingConfigCB;
-import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
 import jp.sf.fess.db.cbean.cq.FileAuthenticationCQ;
 import jp.sf.fess.db.cbean.cq.FileConfigToBrowserTypeMappingCQ;
 import jp.sf.fess.db.cbean.cq.FileConfigToLabelTypeMappingCQ;
@@ -119,24 +118,6 @@ public class BsFileCrawlingConfigCQ extends AbstractBsFileCrawlingConfigCQ {
         return getId();
     }
 
-    protected Map<String, FailureUrlCQ> _id_ExistsReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_ExistsReferrer_FailureUrlList() {
-        return _id_ExistsReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_ExistsReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_ExistsReferrer_FailureUrlListMap == null) {
-            _id_ExistsReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_ExistsReferrer_FailureUrlListMap.size() + 1);
-        _id_ExistsReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_ExistsReferrer_FailureUrlList." + key;
-    }
-
     protected Map<String, FileAuthenticationCQ> _id_ExistsReferrer_FileAuthenticationListMap;
 
     public Map<String, FileAuthenticationCQ> getId_ExistsReferrer_FileAuthenticationList() {
@@ -214,24 +195,6 @@ public class BsFileCrawlingConfigCQ extends AbstractBsFileCrawlingConfigCQ {
         return "id_ExistsReferrer_FileConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_NotExistsReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_NotExistsReferrer_FailureUrlList() {
-        return _id_NotExistsReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_NotExistsReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_NotExistsReferrer_FailureUrlListMap == null) {
-            _id_NotExistsReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_NotExistsReferrer_FailureUrlListMap.size() + 1);
-        _id_NotExistsReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_NotExistsReferrer_FailureUrlList." + key;
-    }
-
     protected Map<String, FileAuthenticationCQ> _id_NotExistsReferrer_FileAuthenticationListMap;
 
     public Map<String, FileAuthenticationCQ> getId_NotExistsReferrer_FileAuthenticationList() {
@@ -310,24 +273,6 @@ public class BsFileCrawlingConfigCQ extends AbstractBsFileCrawlingConfigCQ {
         return "id_NotExistsReferrer_FileConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_SpecifyDerivedReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_SpecifyDerivedReferrer_FailureUrlList() {
-        return _id_SpecifyDerivedReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_SpecifyDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_SpecifyDerivedReferrer_FailureUrlListMap == null) {
-            _id_SpecifyDerivedReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_SpecifyDerivedReferrer_FailureUrlListMap.size() + 1);
-        _id_SpecifyDerivedReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_SpecifyDerivedReferrer_FailureUrlList." + key;
-    }
-
     protected Map<String, FileAuthenticationCQ> _id_SpecifyDerivedReferrer_FileAuthenticationListMap;
 
     public Map<String, FileAuthenticationCQ> getId_SpecifyDerivedReferrer_FileAuthenticationList() {
@@ -409,24 +354,6 @@ public class BsFileCrawlingConfigCQ extends AbstractBsFileCrawlingConfigCQ {
                 + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_InScopeRelation_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_InScopeRelation_FailureUrlList() {
-        return _id_InScopeRelation_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_InScopeRelation_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_InScopeRelation_FailureUrlListMap == null) {
-            _id_InScopeRelation_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_InScopeRelation_FailureUrlListMap.size() + 1);
-        _id_InScopeRelation_FailureUrlListMap.put(key, subQuery);
-        return "id_InScopeRelation_FailureUrlList." + key;
-    }
-
     protected Map<String, FileAuthenticationCQ> _id_InScopeRelation_FileAuthenticationListMap;
 
     public Map<String, FileAuthenticationCQ> getId_InScopeRelation_FileAuthenticationList() {
@@ -505,24 +432,6 @@ public class BsFileCrawlingConfigCQ extends AbstractBsFileCrawlingConfigCQ {
         return "id_InScopeRelation_FileConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_NotInScopeRelation_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_NotInScopeRelation_FailureUrlList() {
-        return _id_NotInScopeRelation_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_NotInScopeRelation_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_NotInScopeRelation_FailureUrlListMap == null) {
-            _id_NotInScopeRelation_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_NotInScopeRelation_FailureUrlListMap.size() + 1);
-        _id_NotInScopeRelation_FailureUrlListMap.put(key, subQuery);
-        return "id_NotInScopeRelation_FailureUrlList." + key;
-    }
-
     protected Map<String, FileAuthenticationCQ> _id_NotInScopeRelation_FileAuthenticationListMap;
 
     public Map<String, FileAuthenticationCQ> getId_NotInScopeRelation_FileAuthenticationList() {
@@ -602,43 +511,6 @@ public class BsFileCrawlingConfigCQ extends AbstractBsFileCrawlingConfigCQ {
         return "id_NotInScopeRelation_FileConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_QueryDerivedReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_QueryDerivedReferrer_FailureUrlList() {
-        return _id_QueryDerivedReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_QueryDerivedReferrer_FailureUrlListMap == null) {
-            _id_QueryDerivedReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_QueryDerivedReferrer_FailureUrlListMap.size() + 1);
-        _id_QueryDerivedReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_QueryDerivedReferrer_FailureUrlList." + key;
-    }
-
-    protected Map<String, Object> _id_QueryDerivedReferrer_FailureUrlListParameterMap;
-
-    public Map<String, Object> getId_QueryDerivedReferrer_FailureUrlListParameter() {
-        return _id_QueryDerivedReferrer_FailureUrlListParameterMap;
-    }
-
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlListParameter(
-            final Object parameterValue) {
-        if (_id_QueryDerivedReferrer_FailureUrlListParameterMap == null) {
-            _id_QueryDerivedReferrer_FailureUrlListParameterMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryParameterKey"
-                + (_id_QueryDerivedReferrer_FailureUrlListParameterMap.size() + 1);
-        _id_QueryDerivedReferrer_FailureUrlListParameterMap.put(key,
-                parameterValue);
-        return "id_QueryDerivedReferrer_FailureUrlListParameter." + key;
-    }
-
     protected Map<String, FileAuthenticationCQ> _id_QueryDerivedReferrer_FileAuthenticationListMap;
 
     public Map<String, FileAuthenticationCQ> getId_QueryDerivedReferrer_FileAuthenticationList() {

+ 0 - 128
src/main/java/jp/sf/fess/db/cbean/cq/bs/BsWebCrawlingConfigCQ.java

@@ -19,7 +19,6 @@ package jp.sf.fess.db.cbean.cq.bs;
 import java.util.Map;
 
 import jp.sf.fess.db.cbean.WebCrawlingConfigCB;
-import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
 import jp.sf.fess.db.cbean.cq.RequestHeaderCQ;
 import jp.sf.fess.db.cbean.cq.WebAuthenticationCQ;
 import jp.sf.fess.db.cbean.cq.WebConfigToBrowserTypeMappingCQ;
@@ -120,24 +119,6 @@ public class BsWebCrawlingConfigCQ extends AbstractBsWebCrawlingConfigCQ {
         return getId();
     }
 
-    protected Map<String, FailureUrlCQ> _id_ExistsReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_ExistsReferrer_FailureUrlList() {
-        return _id_ExistsReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_ExistsReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_ExistsReferrer_FailureUrlListMap == null) {
-            _id_ExistsReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_ExistsReferrer_FailureUrlListMap.size() + 1);
-        _id_ExistsReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_ExistsReferrer_FailureUrlList." + key;
-    }
-
     protected Map<String, RequestHeaderCQ> _id_ExistsReferrer_RequestHeaderListMap;
 
     public Map<String, RequestHeaderCQ> getId_ExistsReferrer_RequestHeaderList() {
@@ -231,24 +212,6 @@ public class BsWebCrawlingConfigCQ extends AbstractBsWebCrawlingConfigCQ {
         return "id_ExistsReferrer_WebConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_NotExistsReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_NotExistsReferrer_FailureUrlList() {
-        return _id_NotExistsReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_NotExistsReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_NotExistsReferrer_FailureUrlListMap == null) {
-            _id_NotExistsReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_NotExistsReferrer_FailureUrlListMap.size() + 1);
-        _id_NotExistsReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_NotExistsReferrer_FailureUrlList." + key;
-    }
-
     protected Map<String, RequestHeaderCQ> _id_NotExistsReferrer_RequestHeaderListMap;
 
     public Map<String, RequestHeaderCQ> getId_NotExistsReferrer_RequestHeaderList() {
@@ -345,24 +308,6 @@ public class BsWebCrawlingConfigCQ extends AbstractBsWebCrawlingConfigCQ {
         return "id_NotExistsReferrer_WebConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_SpecifyDerivedReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_SpecifyDerivedReferrer_FailureUrlList() {
-        return _id_SpecifyDerivedReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_SpecifyDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_SpecifyDerivedReferrer_FailureUrlListMap == null) {
-            _id_SpecifyDerivedReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_SpecifyDerivedReferrer_FailureUrlListMap.size() + 1);
-        _id_SpecifyDerivedReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_SpecifyDerivedReferrer_FailureUrlList." + key;
-    }
-
     protected Map<String, RequestHeaderCQ> _id_SpecifyDerivedReferrer_RequestHeaderListMap;
 
     public Map<String, RequestHeaderCQ> getId_SpecifyDerivedReferrer_RequestHeaderList() {
@@ -462,24 +407,6 @@ public class BsWebCrawlingConfigCQ extends AbstractBsWebCrawlingConfigCQ {
                 + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_InScopeRelation_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_InScopeRelation_FailureUrlList() {
-        return _id_InScopeRelation_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_InScopeRelation_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_InScopeRelation_FailureUrlListMap == null) {
-            _id_InScopeRelation_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_InScopeRelation_FailureUrlListMap.size() + 1);
-        _id_InScopeRelation_FailureUrlListMap.put(key, subQuery);
-        return "id_InScopeRelation_FailureUrlList." + key;
-    }
-
     protected Map<String, RequestHeaderCQ> _id_InScopeRelation_RequestHeaderListMap;
 
     public Map<String, RequestHeaderCQ> getId_InScopeRelation_RequestHeaderList() {
@@ -575,24 +502,6 @@ public class BsWebCrawlingConfigCQ extends AbstractBsWebCrawlingConfigCQ {
         return "id_InScopeRelation_WebConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_NotInScopeRelation_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_NotInScopeRelation_FailureUrlList() {
-        return _id_NotInScopeRelation_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_NotInScopeRelation_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_NotInScopeRelation_FailureUrlListMap == null) {
-            _id_NotInScopeRelation_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_NotInScopeRelation_FailureUrlListMap.size() + 1);
-        _id_NotInScopeRelation_FailureUrlListMap.put(key, subQuery);
-        return "id_NotInScopeRelation_FailureUrlList." + key;
-    }
-
     protected Map<String, RequestHeaderCQ> _id_NotInScopeRelation_RequestHeaderListMap;
 
     public Map<String, RequestHeaderCQ> getId_NotInScopeRelation_RequestHeaderList() {
@@ -689,43 +598,6 @@ public class BsWebCrawlingConfigCQ extends AbstractBsWebCrawlingConfigCQ {
         return "id_NotInScopeRelation_WebConfigToRoleTypeMappingList." + key;
     }
 
-    protected Map<String, FailureUrlCQ> _id_QueryDerivedReferrer_FailureUrlListMap;
-
-    public Map<String, FailureUrlCQ> getId_QueryDerivedReferrer_FailureUrlList() {
-        return _id_QueryDerivedReferrer_FailureUrlListMap;
-    }
-
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ subQuery) {
-        if (_id_QueryDerivedReferrer_FailureUrlListMap == null) {
-            _id_QueryDerivedReferrer_FailureUrlListMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryMapKey"
-                + (_id_QueryDerivedReferrer_FailureUrlListMap.size() + 1);
-        _id_QueryDerivedReferrer_FailureUrlListMap.put(key, subQuery);
-        return "id_QueryDerivedReferrer_FailureUrlList." + key;
-    }
-
-    protected Map<String, Object> _id_QueryDerivedReferrer_FailureUrlListParameterMap;
-
-    public Map<String, Object> getId_QueryDerivedReferrer_FailureUrlListParameter() {
-        return _id_QueryDerivedReferrer_FailureUrlListParameterMap;
-    }
-
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlListParameter(
-            final Object parameterValue) {
-        if (_id_QueryDerivedReferrer_FailureUrlListParameterMap == null) {
-            _id_QueryDerivedReferrer_FailureUrlListParameterMap = newLinkedHashMapSized(4);
-        }
-        final String key = "subQueryParameterKey"
-                + (_id_QueryDerivedReferrer_FailureUrlListParameterMap.size() + 1);
-        _id_QueryDerivedReferrer_FailureUrlListParameterMap.put(key,
-                parameterValue);
-        return "id_QueryDerivedReferrer_FailureUrlListParameter." + key;
-    }
-
     protected Map<String, RequestHeaderCQ> _id_QueryDerivedReferrer_RequestHeaderListMap;
 
     public Map<String, RequestHeaderCQ> getId_QueryDerivedReferrer_RequestHeaderList() {

+ 2 - 33
src/main/java/jp/sf/fess/db/cbean/cq/ciq/FailureUrlCIQ.java

@@ -20,8 +20,6 @@ import java.util.Map;
 
 import jp.sf.fess.db.cbean.FailureUrlCB;
 import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
-import jp.sf.fess.db.cbean.cq.FileCrawlingConfigCQ;
-import jp.sf.fess.db.cbean.cq.WebCrawlingConfigCQ;
 import jp.sf.fess.db.cbean.cq.bs.AbstractBsFailureUrlCQ;
 import jp.sf.fess.db.cbean.cq.bs.BsFailureUrlCQ;
 
@@ -134,37 +132,8 @@ public class FailureUrlCIQ extends AbstractBsFailureUrlCQ {
     }
 
     @Override
-    protected ConditionValue getCValueWebConfigId() {
-        return _myCQ.getWebConfigId();
-    }
-
-    @Override
-    public String keepWebConfigId_InScopeRelation_WebCrawlingConfig(
-            final WebCrawlingConfigCQ sq) {
-        return _myCQ.keepWebConfigId_InScopeRelation_WebCrawlingConfig(sq);
-    }
-
-    @Override
-    public String keepWebConfigId_NotInScopeRelation_WebCrawlingConfig(
-            final WebCrawlingConfigCQ sq) {
-        return _myCQ.keepWebConfigId_NotInScopeRelation_WebCrawlingConfig(sq);
-    }
-
-    @Override
-    protected ConditionValue getCValueFileConfigId() {
-        return _myCQ.getFileConfigId();
-    }
-
-    @Override
-    public String keepFileConfigId_InScopeRelation_FileCrawlingConfig(
-            final FileCrawlingConfigCQ sq) {
-        return _myCQ.keepFileConfigId_InScopeRelation_FileCrawlingConfig(sq);
-    }
-
-    @Override
-    public String keepFileConfigId_NotInScopeRelation_FileCrawlingConfig(
-            final FileCrawlingConfigCQ sq) {
-        return _myCQ.keepFileConfigId_NotInScopeRelation_FileCrawlingConfig(sq);
+    protected ConditionValue getCValueConfigId() {
+        return _myCQ.getConfigId();
     }
 
     @Override

+ 0 - 44
src/main/java/jp/sf/fess/db/cbean/cq/ciq/FileCrawlingConfigCIQ.java

@@ -19,7 +19,6 @@ package jp.sf.fess.db.cbean.cq.ciq;
 import java.util.Map;
 
 import jp.sf.fess.db.cbean.FileCrawlingConfigCB;
-import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
 import jp.sf.fess.db.cbean.cq.FileAuthenticationCQ;
 import jp.sf.fess.db.cbean.cq.FileConfigToBrowserTypeMappingCQ;
 import jp.sf.fess.db.cbean.cq.FileConfigToLabelTypeMappingCQ;
@@ -106,12 +105,6 @@ public class FileCrawlingConfigCIQ extends AbstractBsFileCrawlingConfigCQ {
         return _myCQ.getId();
     }
 
-    @Override
-    public String keepId_ExistsReferrer_FailureUrlList(final FailureUrlCQ sq) {
-        throwIICBOE("ExistsReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_ExistsReferrer_FileAuthenticationList(
             final FileAuthenticationCQ sq) {
@@ -140,12 +133,6 @@ public class FileCrawlingConfigCIQ extends AbstractBsFileCrawlingConfigCQ {
         return null;
     }
 
-    @Override
-    public String keepId_NotExistsReferrer_FailureUrlList(final FailureUrlCQ sq) {
-        throwIICBOE("NotExistsReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_NotExistsReferrer_FileAuthenticationList(
             final FileAuthenticationCQ sq) {
@@ -174,11 +161,6 @@ public class FileCrawlingConfigCIQ extends AbstractBsFileCrawlingConfigCQ {
         return null;
     }
 
-    @Override
-    public String keepId_InScopeRelation_FailureUrlList(final FailureUrlCQ sq) {
-        return _myCQ.keepId_InScopeRelation_FailureUrlList(sq);
-    }
-
     @Override
     public String keepId_InScopeRelation_FileAuthenticationList(
             final FileAuthenticationCQ sq) {
@@ -205,11 +187,6 @@ public class FileCrawlingConfigCIQ extends AbstractBsFileCrawlingConfigCQ {
         return _myCQ.keepId_InScopeRelation_FileConfigToRoleTypeMappingList(sq);
     }
 
-    @Override
-    public String keepId_NotInScopeRelation_FailureUrlList(final FailureUrlCQ sq) {
-        return _myCQ.keepId_NotInScopeRelation_FailureUrlList(sq);
-    }
-
     @Override
     public String keepId_NotInScopeRelation_FileAuthenticationList(
             final FileAuthenticationCQ sq) {
@@ -237,13 +214,6 @@ public class FileCrawlingConfigCIQ extends AbstractBsFileCrawlingConfigCQ {
                 .keepId_NotInScopeRelation_FileConfigToRoleTypeMappingList(sq);
     }
 
-    @Override
-    public String keepId_SpecifyDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ sq) {
-        throwIICBOE("(Specify)DerivedReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_SpecifyDerivedReferrer_FileAuthenticationList(
             final FileAuthenticationCQ sq) {
@@ -272,20 +242,6 @@ public class FileCrawlingConfigCIQ extends AbstractBsFileCrawlingConfigCQ {
         return null;
     }
 
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ sq) {
-        throwIICBOE("(Query)DerivedReferrer");
-        return null;
-    }
-
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlListParameter(
-            final Object pv) {
-        throwIICBOE("(Query)DerivedReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_QueryDerivedReferrer_FileAuthenticationList(
             final FileAuthenticationCQ sq) {

+ 0 - 44
src/main/java/jp/sf/fess/db/cbean/cq/ciq/WebCrawlingConfigCIQ.java

@@ -19,7 +19,6 @@ package jp.sf.fess.db.cbean.cq.ciq;
 import java.util.Map;
 
 import jp.sf.fess.db.cbean.WebCrawlingConfigCB;
-import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
 import jp.sf.fess.db.cbean.cq.RequestHeaderCQ;
 import jp.sf.fess.db.cbean.cq.WebAuthenticationCQ;
 import jp.sf.fess.db.cbean.cq.WebConfigToBrowserTypeMappingCQ;
@@ -107,12 +106,6 @@ public class WebCrawlingConfigCIQ extends AbstractBsWebCrawlingConfigCQ {
         return _myCQ.getId();
     }
 
-    @Override
-    public String keepId_ExistsReferrer_FailureUrlList(final FailureUrlCQ sq) {
-        throwIICBOE("ExistsReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_ExistsReferrer_RequestHeaderList(
             final RequestHeaderCQ sq) {
@@ -148,12 +141,6 @@ public class WebCrawlingConfigCIQ extends AbstractBsWebCrawlingConfigCQ {
         return null;
     }
 
-    @Override
-    public String keepId_NotExistsReferrer_FailureUrlList(final FailureUrlCQ sq) {
-        throwIICBOE("NotExistsReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_NotExistsReferrer_RequestHeaderList(
             final RequestHeaderCQ sq) {
@@ -189,11 +176,6 @@ public class WebCrawlingConfigCIQ extends AbstractBsWebCrawlingConfigCQ {
         return null;
     }
 
-    @Override
-    public String keepId_InScopeRelation_FailureUrlList(final FailureUrlCQ sq) {
-        return _myCQ.keepId_InScopeRelation_FailureUrlList(sq);
-    }
-
     @Override
     public String keepId_InScopeRelation_RequestHeaderList(
             final RequestHeaderCQ sq) {
@@ -225,11 +207,6 @@ public class WebCrawlingConfigCIQ extends AbstractBsWebCrawlingConfigCQ {
         return _myCQ.keepId_InScopeRelation_WebConfigToRoleTypeMappingList(sq);
     }
 
-    @Override
-    public String keepId_NotInScopeRelation_FailureUrlList(final FailureUrlCQ sq) {
-        return _myCQ.keepId_NotInScopeRelation_FailureUrlList(sq);
-    }
-
     @Override
     public String keepId_NotInScopeRelation_RequestHeaderList(
             final RequestHeaderCQ sq) {
@@ -263,13 +240,6 @@ public class WebCrawlingConfigCIQ extends AbstractBsWebCrawlingConfigCQ {
                 .keepId_NotInScopeRelation_WebConfigToRoleTypeMappingList(sq);
     }
 
-    @Override
-    public String keepId_SpecifyDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ sq) {
-        throwIICBOE("(Specify)DerivedReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_SpecifyDerivedReferrer_RequestHeaderList(
             final RequestHeaderCQ sq) {
@@ -305,20 +275,6 @@ public class WebCrawlingConfigCIQ extends AbstractBsWebCrawlingConfigCQ {
         return null;
     }
 
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlList(
-            final FailureUrlCQ sq) {
-        throwIICBOE("(Query)DerivedReferrer");
-        return null;
-    }
-
-    @Override
-    public String keepId_QueryDerivedReferrer_FailureUrlListParameter(
-            final Object pv) {
-        throwIICBOE("(Query)DerivedReferrer");
-        return null;
-    }
-
     @Override
     public String keepId_QueryDerivedReferrer_RequestHeaderList(
             final RequestHeaderCQ sq) {

+ 0 - 31
src/main/java/jp/sf/fess/db/cbean/nss/FailureUrlNss.java

@@ -18,8 +18,6 @@ package jp.sf.fess.db.cbean.nss;
 
 import jp.sf.fess.db.cbean.cq.FailureUrlCQ;
 
-import org.seasar.dbflute.cbean.ConditionQuery;
-
 /**
  * The nest select set-upper of FAILURE_URL.
  * @author DBFlute(AutoGenerator)
@@ -42,34 +40,5 @@ public class FailureUrlNss {
     // ===================================================================================
     //                                                                     Nested Relation
     //                                                                     ===============
-    /**
-     * With nested relation columns to select clause. <br />
-     * FILE_CRAWLING_CONFIG by my FILE_CONFIG_ID, named 'fileCrawlingConfig'.
-     * @return The set-upper of more nested relation. {...with[nested-relation].with[more-nested-relation]} (NotNull)
-     */
-    public FileCrawlingConfigNss withFileCrawlingConfig() {
-        _query.doNss(new FailureUrlCQ.NssCall() {
-            @Override
-            public ConditionQuery qf() {
-                return _query.queryFileCrawlingConfig();
-            }
-        });
-        return new FileCrawlingConfigNss(_query.queryFileCrawlingConfig());
-    }
-
-    /**
-     * With nested relation columns to select clause. <br />
-     * WEB_CRAWLING_CONFIG by my WEB_CONFIG_ID, named 'webCrawlingConfig'.
-     * @return The set-upper of more nested relation. {...with[nested-relation].with[more-nested-relation]} (NotNull)
-     */
-    public WebCrawlingConfigNss withWebCrawlingConfig() {
-        _query.doNss(new FailureUrlCQ.NssCall() {
-            @Override
-            public ConditionQuery qf() {
-                return _query.queryWebCrawlingConfig();
-            }
-        });
-        return new WebCrawlingConfigNss(_query.queryWebCrawlingConfig());
-    }
 
 }

+ 24 - 0
src/main/java/jp/sf/fess/db/exentity/CrawlingConfig.java

@@ -22,6 +22,8 @@ public interface CrawlingConfig {
 
     Long getId();
 
+    String getName();
+
     String[] getBrowserTypeValues();
 
     String[] getRoleTypeValues();
@@ -35,4 +37,26 @@ public interface CrawlingConfig {
     String getConfigId();
 
     void initializeClientFactory(S2RobotClientFactory s2RobotClientFactory);
+
+    public enum ConfigType {
+        WEB("W"), FILE("F"), DATA("D");
+
+        private final String typePrefix;
+
+        ConfigType(final String typePrefix) {
+            this.typePrefix = typePrefix;
+        }
+
+        public String getTypePrefix() {
+            return typePrefix;
+        }
+
+        public String getConfigId(final Long id) {
+            if (id == null) {
+                return null;
+            }
+            return typePrefix + id.toString();
+        }
+    }
+
 }

+ 1 - 4
src/main/java/jp/sf/fess/db/exentity/DataCrawlingConfig.java

@@ -190,10 +190,7 @@ public class DataCrawlingConfig extends BsDataCrawlingConfig implements
 
     @Override
     public String getConfigId() {
-        if (getId() != null) {
-            return Constants.DATA_CONFIG_ID_PREFIX + getId().toString();
-        }
-        return null;
+        return ConfigType.DATA.getConfigId(getId());
     }
 
     public Map<String, String> getHandlerParameterMap() {

+ 25 - 8
src/main/java/jp/sf/fess/db/exentity/FailureUrl.java

@@ -20,6 +20,9 @@ import java.text.SimpleDateFormat;
 
 import jp.sf.fess.Constants;
 import jp.sf.fess.db.bsentity.BsFailureUrl;
+import jp.sf.fess.helper.CrawlingConfigHelper;
+
+import org.seasar.framework.container.SingletonS2Container;
 
 /**
  * The entity of FAILURE_URL.
@@ -44,18 +47,32 @@ public class FailureUrl extends BsFailureUrl {
     }
 
     public String getWebConfigName() {
-        final WebCrawlingConfig webCrawlingConfig = getWebCrawlingConfig();
-        if (webCrawlingConfig != null) {
-            return webCrawlingConfig.getName();
+        final CrawlingConfig crawlingConfig = SingletonS2Container
+                .getComponent(CrawlingConfigHelper.class).getCrawlingConfig(
+                        getConfigId());
+        if (crawlingConfig != null) {
+            return crawlingConfig.getName();
         }
-        return "";
+        return Constants.EMPTY_STRING;
     }
 
     public String getFileConfigName() {
-        final FileCrawlingConfig fileCrawlingConfig = getFileCrawlingConfig();
-        if (fileCrawlingConfig != null) {
-            return fileCrawlingConfig.getName();
+        final CrawlingConfig crawlingConfig = SingletonS2Container
+                .getComponent(CrawlingConfigHelper.class).getCrawlingConfig(
+                        getConfigId());
+        if (crawlingConfig != null) {
+            return crawlingConfig.getName();
+        }
+        return Constants.EMPTY_STRING;
+    }
+
+    public String getDataConfigName() {
+        final CrawlingConfig crawlingConfig = SingletonS2Container
+                .getComponent(CrawlingConfigHelper.class).getCrawlingConfig(
+                        getConfigId());
+        if (crawlingConfig != null) {
+            return crawlingConfig.getName();
         }
-        return "";
+        return Constants.EMPTY_STRING;
     }
 }

+ 1 - 4
src/main/java/jp/sf/fess/db/exentity/FileCrawlingConfig.java

@@ -224,10 +224,7 @@ public class FileCrawlingConfig extends BsFileCrawlingConfig implements
 
     @Override
     public String getConfigId() {
-        if (getId() != null) {
-            return Constants.FILE_CONFIG_ID_PREFIX + getId().toString();
-        }
-        return null;
+        return ConfigType.FILE.getConfigId(getId());
     }
 
     @Override

+ 1 - 4
src/main/java/jp/sf/fess/db/exentity/WebCrawlingConfig.java

@@ -228,10 +228,7 @@ public class WebCrawlingConfig extends BsWebCrawlingConfig implements
 
     @Override
     public String getConfigId() {
-        if (getId() != null) {
-            return Constants.WEB_CONFIG_ID_PREFIX + getId().toString();
-        }
-        return null;
+        return ConfigType.WEB.getConfigId(getId());
     }
 
     @Override

+ 4 - 4
src/main/java/jp/sf/fess/ds/impl/AbstractDataStoreImpl.java

@@ -119,7 +119,7 @@ public abstract class AbstractDataStoreImpl implements DataStore {
         // lastModified
         // id
 
-        storeData(callback, paramMap, configScriptMap, defaultDataMap);
+        storeData(config, callback, paramMap, configScriptMap, defaultDataMap);
 
     }
 
@@ -162,7 +162,7 @@ public abstract class AbstractDataStoreImpl implements DataStore {
         }
     }
 
-    protected abstract void storeData(IndexUpdateCallback callback,
-            Map<String, String> paramMap, Map<String, String> scriptMap,
-            Map<String, Object> defaultDataMap);
+    protected abstract void storeData(DataCrawlingConfig dataConfig,
+            IndexUpdateCallback callback, Map<String, String> paramMap,
+            Map<String, String> scriptMap, Map<String, Object> defaultDataMap);
 }

+ 46 - 6
src/main/java/jp/sf/fess/ds/impl/CsvDataStoreImpl.java

@@ -29,13 +29,18 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 import jp.sf.fess.Constants;
+import jp.sf.fess.db.exentity.DataCrawlingConfig;
 import jp.sf.fess.ds.DataStoreException;
 import jp.sf.fess.ds.IndexUpdateCallback;
+import jp.sf.fess.service.FailureUrlService;
 import jp.sf.orangesignal.csv.CsvConfig;
 import jp.sf.orangesignal.csv.CsvReader;
 
 import org.apache.commons.io.IOUtils;
+import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.util.StringUtil;
+import org.seasar.robot.RobotCrawlAccessException;
+import org.seasar.robot.RobotMultipleCrawlAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -153,7 +158,8 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl {
     }
 
     @Override
-    protected void storeData(final IndexUpdateCallback callback,
+    protected void storeData(final DataCrawlingConfig dataConfig,
+            final IndexUpdateCallback callback,
             final Map<String, String> paramMap,
             final Map<String, String> scriptMap,
             final Map<String, Object> defaultDataMap) {
@@ -171,13 +177,14 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl {
         final CsvConfig csvConfig = buildCsvConfig(paramMap);
 
         for (final File csvFile : csvFileList) {
-            processCsv(callback, paramMap, scriptMap, defaultDataMap,
-                    csvConfig, csvFile, readInterval, csvFileEncoding,
-                    hasHeaderLine);
+            processCsv(dataConfig, callback, paramMap, scriptMap,
+                    defaultDataMap, csvConfig, csvFile, readInterval,
+                    csvFileEncoding, hasHeaderLine);
         }
     }
 
-    protected void processCsv(final IndexUpdateCallback callback,
+    protected void processCsv(final DataCrawlingConfig dataConfig,
+            final IndexUpdateCallback callback,
             final Map<String, String> paramMap,
             final Map<String, String> scriptMap,
             final Map<String, Object> defaultDataMap,
@@ -243,8 +250,41 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl {
 
                 try {
                     loop = callback.store(dataMap);
+                } catch (final RobotCrawlAccessException e) {
+                    Throwable target = e;
+                    if (target instanceof RobotMultipleCrawlAccessException) {
+                        final Throwable[] causes = ((RobotMultipleCrawlAccessException) target)
+                                .getCauses();
+                        if (causes.length > 0) {
+                            target = causes[causes.length - 1];
+                        }
+                    }
+
+                    String errorName;
+                    final Throwable cause = e.getCause();
+                    if (cause != null) {
+                        errorName = cause.getClass().getCanonicalName();
+                    } else {
+                        errorName = e.getClass().getCanonicalName();
+                    }
+
+                    final FailureUrlService failureUrlService = SingletonS2Container
+                            .getComponent(FailureUrlService.class);
+                    failureUrlService.store(
+                            dataConfig,
+                            errorName,
+                            csvFile.getAbsolutePath() + ":"
+                                    + csvReader.getLineNumber(), e);
+
+                    logger.warn("Crawling Access Exception at : " + dataMap, e);
                 } catch (final Exception e) {
-                    logger.warn("Failed to store data: " + dataMap, e);
+                    final FailureUrlService failureUrlService = SingletonS2Container
+                            .getComponent(FailureUrlService.class);
+                    failureUrlService.store(dataConfig, e.getClass()
+                            .getCanonicalName(), csvFile.getAbsolutePath()
+                            + ":" + csvReader.getLineNumber(), e);
+
+                    logger.warn("Crawling Access Exception at : " + dataMap, e);
                 }
 
                 if (readInterval > 0) {

+ 3 - 1
src/main/java/jp/sf/fess/ds/impl/DatabaseDataStoreImpl.java

@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.Set;
 
 import jp.sf.fess.FessSystemException;
+import jp.sf.fess.db.exentity.DataCrawlingConfig;
 import jp.sf.fess.ds.DataStoreException;
 import jp.sf.fess.ds.IndexUpdateCallback;
 
@@ -78,7 +79,8 @@ public class DatabaseDataStoreImpl extends AbstractDataStoreImpl {
     }
 
     @Override
-    protected void storeData(final IndexUpdateCallback callback,
+    protected void storeData(final DataCrawlingConfig config,
+            final IndexUpdateCallback callback,
             final Map<String, String> paramMap,
             final Map<String, String> scriptMap,
             final Map<String, Object> defaultDataMap) {

+ 9 - 7
src/main/java/jp/sf/fess/ds/impl/FileListDataStoreImpl.java

@@ -103,17 +103,19 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl {
     }
 
     @Override
-    protected void storeData(final IndexUpdateCallback callback,
+    protected void storeData(final DataCrawlingConfig dataConfig,
+            final IndexUpdateCallback callback,
             final Map<String, String> paramMap,
             final Map<String, String> scriptMap,
             final Map<String, Object> defaultDataMap) {
 
-        super.storeData(new FileListIndexUpdateCallback(callback), paramMap,
-                scriptMap, defaultDataMap);
+        super.storeData(dataConfig, new FileListIndexUpdateCallback(callback),
+                paramMap, scriptMap, defaultDataMap);
     }
 
     @Override
-    protected void processCsv(final IndexUpdateCallback callback,
+    protected void processCsv(final DataCrawlingConfig dataConfig,
+            final IndexUpdateCallback callback,
             final Map<String, String> paramMap,
             final Map<String, String> scriptMap,
             final Map<String, Object> defaultDataMap,
@@ -121,9 +123,9 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl {
             final long readInterval, final String csvFileEncoding,
             final boolean hasHeaderLine) {
         try {
-            super.processCsv(callback, paramMap, scriptMap, defaultDataMap,
-                    csvConfig, csvFile, readInterval, csvFileEncoding,
-                    hasHeaderLine);
+            super.processCsv(dataConfig, callback, paramMap, scriptMap,
+                    defaultDataMap, csvConfig, csvFile, readInterval,
+                    csvFileEncoding, hasHeaderLine);
 
             // delete csv file
             if (deleteProcessedFile && !csvFile.delete()) {

+ 73 - 13
src/main/java/jp/sf/fess/helper/CrawlingConfigHelper.java

@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import jp.sf.fess.Constants;
 import jp.sf.fess.FessSystemException;
 import jp.sf.fess.db.exentity.CrawlingConfig;
+import jp.sf.fess.db.exentity.CrawlingConfig.ConfigType;
 import jp.sf.fess.helper.UserAgentHelper.UserAgentType;
 import jp.sf.fess.service.DataCrawlingConfigService;
 import jp.sf.fess.service.FileCrawlingConfigService;
@@ -71,6 +72,61 @@ public class CrawlingConfigHelper implements Serializable {
         this.urlField = urlField;
     }
 
+    public ConfigType getConfigType(final String configId) {
+        if (configId == null || configId.length() < 2) {
+            return null;
+        }
+        final String configType = configId.substring(0, 1);
+        if (ConfigType.WEB.getTypePrefix().equals(configType)) {
+            return ConfigType.WEB;
+        } else if (ConfigType.FILE.getTypePrefix().equals(configType)) {
+            return ConfigType.FILE;
+        } else if (ConfigType.DATA.getTypePrefix().equals(configType)) {
+            return ConfigType.DATA;
+        }
+        return null;
+    }
+
+    protected Long getId(final String configId) {
+        if (configId == null || configId.length() < 2) {
+            return null;
+        }
+        try {
+            final String idStr = configId.substring(1);
+            return Long.parseLong(idStr);
+        } catch (final NumberFormatException e) {
+            // ignore
+        }
+        return null;
+    }
+
+    public CrawlingConfig getCrawlingConfig(final String configId) {
+        final ConfigType configType = getConfigType(configId);
+        if (configType == null) {
+            return null;
+        }
+        final Long id = getId(configId);
+        if (id == null) {
+            return null;
+        }
+        switch (configType) {
+        case WEB:
+            final WebCrawlingConfigService webCrawlingConfigService = SingletonS2Container
+                    .getComponent(WebCrawlingConfigService.class);
+            return webCrawlingConfigService.getWebCrawlingConfig(id);
+        case FILE:
+            final FileCrawlingConfigService fileCrawlingConfigService = SingletonS2Container
+                    .getComponent(FileCrawlingConfigService.class);
+            return fileCrawlingConfigService.getFileCrawlingConfig(id);
+        case DATA:
+            final DataCrawlingConfigService dataCrawlingConfigService = SingletonS2Container
+                    .getComponent(DataCrawlingConfigService.class);
+            return dataCrawlingConfigService.getDataCrawlingConfig(id);
+        default:
+            return null;
+        }
+    }
+
     public synchronized String store(final String sessionId,
             final CrawlingConfig crawlingConfig) {
         final String sessionCountId = sessionId + "-" + count;
@@ -100,30 +156,34 @@ public class CrawlingConfigHelper implements Serializable {
             logger.debug("writing the content of: " + doc);
         }
         final Object configIdObj = doc.get(configIdField);
-        if (configIdObj == null || configIdObj.toString().length() < 2) {
+        if (configIdObj == null) {
+            throw new FessSystemException("Invalid configId: " + configIdObj);
+        }
+        final String configId = configIdObj.toString();
+        if (configId.length() < 2) {
             throw new FessSystemException("Invalid configId: " + configIdObj);
         }
-        final String configType = configIdObj.toString().substring(0, 1);
-        final String idStr = configIdObj.toString().substring(1);
+        final ConfigType configType = getConfigType(configId);
         CrawlingConfig config = null;
         if (logger.isDebugEnabled()) {
-            logger.debug("configType: " + configType + ", idStr: " + idStr);
+            logger.debug("configType: " + configType + ", configId: "
+                    + configId);
         }
-        if (Constants.WEB_CONFIG_ID_PREFIX.equals(configType)) {
+        if (ConfigType.WEB == configType) {
             final WebCrawlingConfigService webCrawlingConfigService = SingletonS2Container
                     .getComponent(WebCrawlingConfigService.class);
-            config = webCrawlingConfigService.getWebCrawlingConfig(Long
-                    .parseLong(idStr));
-        } else if (Constants.FILE_CONFIG_ID_PREFIX.equals(configType)) {
+            config = webCrawlingConfigService
+                    .getWebCrawlingConfig(getId(configId));
+        } else if (ConfigType.FILE == configType) {
             final FileCrawlingConfigService fileCrawlingConfigService = SingletonS2Container
                     .getComponent(FileCrawlingConfigService.class);
-            config = fileCrawlingConfigService.getFileCrawlingConfig(Long
-                    .parseLong(idStr));
-        } else if (Constants.DATA_CONFIG_ID_PREFIX.equals(configType)) {
+            config = fileCrawlingConfigService
+                    .getFileCrawlingConfig(getId(configId));
+        } else if (ConfigType.DATA == configType) {
             final DataCrawlingConfigService dataCrawlingConfigService = SingletonS2Container
                     .getComponent(DataCrawlingConfigService.class);
-            config = dataCrawlingConfigService.getDataCrawlingConfig(Long
-                    .parseLong(idStr));
+            config = dataCrawlingConfigService
+                    .getDataCrawlingConfig(getId(configId));
         }
         if (config == null) {
             throw new FessSystemException("No crawlingConfig: " + configIdObj);

+ 5 - 62
src/main/java/jp/sf/fess/helper/RobotLogHelper.java

@@ -16,18 +16,9 @@
 
 package jp.sf.fess.helper;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.sql.Timestamp;
-
-import jp.sf.fess.db.cbean.FailureUrlCB;
-import jp.sf.fess.db.exbhv.FailureUrlBhv;
 import jp.sf.fess.db.exentity.CrawlingConfig;
-import jp.sf.fess.db.exentity.FailureUrl;
-import jp.sf.fess.db.exentity.FileCrawlingConfig;
-import jp.sf.fess.db.exentity.WebCrawlingConfig;
+import jp.sf.fess.service.FailureUrlService;
 
-import org.apache.commons.lang.StringUtils;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.robot.RobotMultipleCrawlAccessException;
 import org.seasar.robot.S2RobotContext;
@@ -41,8 +32,6 @@ public class RobotLogHelper extends LogHelperImpl {
     private static final Logger logger = LoggerFactory // NOPMD
             .getLogger(RobotLogHelper.class);
 
-    public int maxStackTraceLength = 4000;
-
     @Override
     public void log(final LogType key, final Object... objs) {
         try {
@@ -90,52 +79,14 @@ public class RobotLogHelper extends LogHelperImpl {
 
     private void storeFailureUrl(final S2RobotContext robotContext,
             final UrlQueue urlQueue, final String errorName, final Throwable e) {
-        Long webConfigId = null;
-        Long fileConfigId = null;
 
         final CrawlingConfig crawlingConfig = getCrawlingConfig(robotContext
                 .getSessionId());
-        if (crawlingConfig instanceof WebCrawlingConfig) {
-            webConfigId = crawlingConfig.getId();
-        } else if (crawlingConfig instanceof FileCrawlingConfig) {
-            fileConfigId = crawlingConfig.getId();
-        } else {
-            return;
-        }
-
-        final FailureUrlBhv failureUrlBhv = SingletonS2Container
-                .getComponent(FailureUrlBhv.class);
-        final FailureUrlCB cb = new FailureUrlCB();
-        cb.query().setUrl_Equal(urlQueue.getUrl());
-        if (webConfigId != null) {
-            cb.query().setWebConfigId_Equal(webConfigId);
-        }
-        if (fileConfigId != null) {
-            cb.query().setFileConfigId_Equal(fileConfigId);
-        }
-        FailureUrl failureUrl = failureUrlBhv.selectEntity(cb);
+        final String url = urlQueue.getUrl();
 
-        if (failureUrl != null) {
-            failureUrl.setErrorCount(failureUrl.getErrorCount() + 1);
-        } else {
-            // new
-            failureUrl = new FailureUrl();
-            failureUrl.setErrorCount(1);
-            failureUrl.setUrl(urlQueue.getUrl());
-            if (webConfigId != null) {
-                failureUrl.setWebConfigId(webConfigId);
-            }
-            if (fileConfigId != null) {
-                failureUrl.setFileConfigId(fileConfigId);
-            }
-        }
-
-        failureUrl.setErrorName(errorName);
-        failureUrl.setErrorLog(StringUtils.abbreviate(getStackTrace(e), 4000));
-        failureUrl.setLastAccessTime(new Timestamp(System.currentTimeMillis()));
-        failureUrl.setThreadName(Thread.currentThread().getName());
-
-        failureUrlBhv.insertOrUpdate(failureUrl);
+        final FailureUrlService failureUrlService = SingletonS2Container
+                .getComponent(FailureUrlService.class);
+        failureUrlService.store(crawlingConfig, errorName, url, e);
     }
 
     private CrawlingConfig getCrawlingConfig(final String sessionCountId) {
@@ -143,12 +94,4 @@ public class RobotLogHelper extends LogHelperImpl {
                 .get(sessionCountId);
     }
 
-    private String getStackTrace(final Throwable t) {
-        final StringWriter sw = new StringWriter();
-        final PrintWriter pw = new PrintWriter(sw, true);
-        t.printStackTrace(pw);
-        final String str = sw.toString();
-        return str.length() > maxStackTraceLength ? str.substring(0,
-                maxStackTraceLength) : str;
-    }
 }

+ 12 - 2
src/main/java/jp/sf/fess/helper/SystemHelper.java

@@ -111,14 +111,16 @@ public class SystemHelper implements Serializable {
 
     private String launcherFileNamePrefix = "fess-launcher-";
 
+    private int maxTextLength = 4000;
+
+    // readonly
     private String launcherJarPath;
 
+    // readonly
     private String launcherJnlpPath;
 
     private final AtomicBoolean forceStop = new AtomicBoolean(false);
 
-    private final int maxTextLength = 4000;
-
     @InitMethod
     public void init() {
         final File[] files = ResourceUtil.getJarFiles(launcherFileNamePrefix);
@@ -593,6 +595,14 @@ public class SystemHelper implements Serializable {
         return launcherJnlpPath;
     }
 
+    public int getMaxTextLength() {
+        return maxTextLength;
+    }
+
+    public void setMaxTextLength(final int maxTextLength) {
+        this.maxTextLength = maxTextLength;
+    }
+
     public void updateStatus(final SolrGroup solrGroup,
             final QueryType queryType) {
         final StatusPolicy statusPolicy = solrGroup.getStatusPolicy();

+ 2 - 2
src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java

@@ -238,7 +238,7 @@ public class WebFsIndexHelper implements Serializable {
 
             // failure url
             final List<String> excludedUrlList = failureUrlService
-                    .getExcludedUrlList(webCrawlingConfig.getId(), null);
+                    .getExcludedUrlList(webCrawlingConfig.getConfigId());
             if (excludedUrlList != null) {
                 for (final String u : excludedUrlList) {
                     if (StringUtil.isNotBlank(u)) {
@@ -364,7 +364,7 @@ public class WebFsIndexHelper implements Serializable {
 
             // failure url
             final List<String> excludedUrlList = failureUrlService
-                    .getExcludedUrlList(null, fileCrawlingConfig.getId());
+                    .getExcludedUrlList(fileCrawlingConfig.getConfigId());
             if (excludedUrlList != null) {
                 for (final String u : excludedUrlList) {
                     if (StringUtil.isNotBlank(u)) {

+ 16 - 0
src/main/java/jp/sf/fess/helper/impl/SearchLogHelperImpl.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2009-2013 the Fess 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 jp.sf.fess.helper.impl;
 
 import java.sql.Timestamp;

+ 49 - 12
src/main/java/jp/sf/fess/service/FailureUrlService.java

@@ -16,7 +16,10 @@
 
 package jp.sf.fess.service;
 
+import java.io.PrintWriter;
 import java.io.Serializable;
+import java.io.StringWriter;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -27,13 +30,18 @@ import javax.annotation.Resource;
 import jp.sf.fess.Constants;
 import jp.sf.fess.crud.service.BsFailureUrlService;
 import jp.sf.fess.db.cbean.FailureUrlCB;
+import jp.sf.fess.db.exbhv.FailureUrlBhv;
+import jp.sf.fess.db.exentity.CrawlingConfig;
 import jp.sf.fess.db.exentity.FailureUrl;
+import jp.sf.fess.helper.SystemHelper;
 import jp.sf.fess.pager.FailureUrlPager;
 
+import org.apache.commons.lang.StringUtils;
 import org.codelibs.core.util.DynamicProperties;
 import org.seasar.dbflute.bhv.DeleteOption;
 import org.seasar.dbflute.cbean.ListResultBean;
 import org.seasar.dbflute.cbean.coption.LikeSearchOption;
+import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.util.StringUtil;
 
 public class FailureUrlService extends BsFailureUrlService implements
@@ -61,8 +69,6 @@ public class FailureUrlService extends BsFailureUrlService implements
         super.setupEntityCondition(cb, keys);
 
         // setup condition
-        cb.setupSelect_FileCrawlingConfig();
-        cb.setupSelect_WebCrawlingConfig();
 
     }
 
@@ -113,8 +119,7 @@ public class FailureUrlService extends BsFailureUrlService implements
 
     }
 
-    public List<String> getExcludedUrlList(final Long webConfigId,
-            final Long fileConfigId) {
+    public List<String> getExcludedUrlList(final String configId) {
         final String failureCountStr = crawlerProperties.getProperty(
                 Constants.FAILURE_COUNT_THRESHOLD_PROPERTY,
                 Constants.DEFAULT_FAILURE_COUNT);
@@ -133,8 +138,7 @@ public class FailureUrlService extends BsFailureUrlService implements
         }
 
         final FailureUrlCB cb = new FailureUrlCB();
-        cb.query().setWebConfigId_Equal(webConfigId);
-        cb.query().setFileConfigId_Equal(fileConfigId);
+        cb.query().setConfigId_Equal(configId);
         cb.query().setErrorCount_GreaterEqual(failureCount);
         final ListResultBean<FailureUrl> list = failureUrlBhv.selectList(cb);
         if (list.isEmpty()) {
@@ -158,17 +162,50 @@ public class FailureUrlService extends BsFailureUrlService implements
         return urlList;
     }
 
-    public void deleteByFileConfigId(final Long id) {
+    public void deleteByConfigId(final String configId) {
         final FailureUrlCB cb = new FailureUrlCB();
-        cb.query().setFileConfigId_Equal(id);
+        cb.query().setConfigId_Equal(configId);
         failureUrlBhv.varyingQueryDelete(cb,
                 new DeleteOption<FailureUrlCB>().allowNonQueryDelete());
     }
 
-    public void deleteByWebConfigId(final Long id) {
+    public void store(final CrawlingConfig crawlingConfig,
+            final String errorName, final String url, final Throwable e) {
+        final FailureUrlBhv failureUrlBhv = SingletonS2Container
+                .getComponent(FailureUrlBhv.class);
         final FailureUrlCB cb = new FailureUrlCB();
-        cb.query().setWebConfigId_Equal(id);
-        failureUrlBhv.varyingQueryDelete(cb,
-                new DeleteOption<FailureUrlCB>().allowNonQueryDelete());
+        cb.query().setUrl_Equal(url);
+        if (crawlingConfig != null) {
+            cb.query().setConfigId_Equal(crawlingConfig.getConfigId());
+        }
+        FailureUrl failureUrl = failureUrlBhv.selectEntity(cb);
+
+        if (failureUrl != null) {
+            failureUrl.setErrorCount(failureUrl.getErrorCount() + 1);
+        } else {
+            // new
+            failureUrl = new FailureUrl();
+            failureUrl.setErrorCount(1);
+            failureUrl.setUrl(url);
+            if (crawlingConfig != null) {
+                failureUrl.setConfigId(crawlingConfig.getConfigId());
+            }
+        }
+
+        failureUrl.setErrorName(errorName);
+        failureUrl.setErrorLog(StringUtils.abbreviate(getStackTrace(e), 4000));
+        failureUrl.setLastAccessTime(new Timestamp(System.currentTimeMillis()));
+        failureUrl.setThreadName(Thread.currentThread().getName());
+
+        failureUrlBhv.insertOrUpdate(failureUrl);
+    }
+
+    private String getStackTrace(final Throwable t) {
+        final SystemHelper systemHelper = SingletonS2Container
+                .getComponent(SystemHelper.class);
+        final StringWriter sw = new StringWriter();
+        final PrintWriter pw = new PrintWriter(sw, true);
+        t.printStackTrace(pw);
+        return systemHelper.abbreviateLongText(sw.toString());
     }
 }

+ 2 - 0
src/main/java/jp/sf/fess/service/SearchLogService.java

@@ -204,8 +204,10 @@ public class SearchLogService extends BsSearchLogService implements
                     entity.setAccessType(list.get(12));
                     if (list.size() >= 14) {
                         final String jsonStr = list.get(13);
+                        @SuppressWarnings("rawtypes")
                         final List objList = JSON.decode(jsonStr);
                         for (final Object obj : objList) {
+                            @SuppressWarnings("rawtypes")
                             final Map objMap = (Map) obj;
                             entity.addSearchFieldLogValue(
                                     (String) objMap.get(Constants.ITEM_NAME),

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