0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#10 add available flag.

Browse source
This commit is contained in:
Shinsuke Sugaya 2013-10-05 15:24:57 +09:00
parent 3277dbee67
commit 2f27e57838
53 changed files with 364 additions and 4674 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/config/h2/fess.ddl
View file

@ -138,6 +138,7 @@ CREATE TABLE SCHEDULED_JOB(
SCRIPT_DATA VARCHAR(4000),
CRAWLER VARCHAR(1) NOT NULL,
JOB_LOGGING VARCHAR(1) NOT NULL,
AVAILABLE VARCHAR(1) NOT NULL,
SORT_ORDER INTEGER NOT NULL,
CREATED_BY VARCHAR(255) NOT NULL,
CREATED_TIME TIMESTAMP NOT NULL,
@ -553,9 +554,9 @@ INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME,
INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME, VERSION_NO) VALUES (3, 'au', 'au', 3, 'admin', '2000-01-01 00:00:00', 1);
INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME, VERSION_NO) VALUES (4, 'Softbank', 'softbank', 4, 'admin', '2000-01-01 00:00:00', 1);
INSERT INTO PUBLIC.SCHEDULED_JOB(ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETED_BY, DELETED_TIME, VERSION_NO) VALUES
(1, 'Crawler', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("crawlJob").execute(executor);', 'T', 'T', 0, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0),
(2, 'Minutely', 'all', '0 * * * * ?', 'groovy', 'return container.getComponent("minutelyJob").execute();', 'F', 'F', 10, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0),
(3, 'Hourly', 'all', '0 0 * * * ?', 'groovy', 'return container.getComponent("houryJob").execute();', 'F', 'F', 20, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0),
(4, 'Daily', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("dailyJob").execute();', 'F', 'F', 30, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0);
INSERT INTO PUBLIC.SCHEDULED_JOB(ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETED_BY, DELETED_TIME, VERSION_NO) VALUES
(1, 'Crawler', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("crawlJob").execute(executor);', 'T', 'T', 'T', 0, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0),
(2, 'Minutely Tasks', 'all', '0 * * * * ?', 'groovy', 'return container.getComponent("minutelyJob").execute();', 'F', 'F', 'T', 10, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0),
(3, 'Hourly Tasks', 'all', '0 0 * * * ?', 'groovy', 'return container.getComponent("houryJob").execute();', 'F', 'F', 'T', 20, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0),
(4, 'Daily Tasks', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("dailyJob").execute();', 'F', 'F', 'T', 30, 'system', TIMESTAMP '2013-01-01 00:00:00.000', 'system', TIMESTAMP '2013-01-01 00:00:00.000', NULL, NULL, 0);

4599
src/main/config/h2/fess.erd
View file

File diff suppressed because it is too large Load diff

9
src/main/config/mysql/fess.ddl
View file

@ -138,6 +138,7 @@ CREATE TABLE SCHEDULED_JOB(
SCRIPT_DATA TEXT,
CRAWLER VARCHAR(1) NOT NULL,
JOB_LOGGING VARCHAR(1) NOT NULL,
AVAILABLE VARCHAR(1) NOT NULL,
SORT_ORDER INTEGER NOT NULL,
CREATED_BY VARCHAR(255) NOT NULL,
CREATED_TIME TIMESTAMP NOT NULL,
@ -553,8 +554,8 @@ INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME,
INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME, VERSION_NO) VALUES (3, 'au', 'au', 3, 'system', '2000-01-01 00:00:00', 1);
INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME, VERSION_NO) VALUES (4, 'Softbank', 'softbank', 4, 'system', '2000-01-01 00:00:00', 1);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (1, 'Crawler', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("crawlJob").execute(executor);', 'T', 'T', 0, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (2, 'Minutely', 'all', '0 * * * * ?', 'groovy', 'return container.getComponent("minutelyJob").execute();', 'F', 'F', 10, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (3, 'Hourly', 'all', '0 0 * * * ?', 'groovy', 'return container.getComponent("houryJob").execute();', 'F', 'F', 20, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (4, 'Daily', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("dailyJob").execute();', 'F', 'F', 30, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (1, 'Crawler', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("crawlJob").execute(executor);', 'T', 'T', 'T', 0, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (2, 'Minutely Tasks', 'all', '0 * * * * ?', 'groovy', 'return container.getComponent("minutelyJob").execute();', 'F', 'F', 'T', 10, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (3, 'Hourly Tasks', 'all', '0 0 * * * ?', 'groovy', 'return container.getComponent("houryJob").execute();', 'F', 'F', 'T', 20, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (4, 'Daily Tasks', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("dailyJob").execute();', 'F', 'F', 'T', 30, 'system', '2000-01-01 00:00:00', 'system', '2000-01-01 00:00:00', 0);

9
src/main/config/oracle/fess.ddl
View file

@ -162,6 +162,7 @@ CREATE TABLE "SCHEDULED_JOB"(
"SCRIPT_DATA" VARCHAR2(4000),
"CRAWLER" VARCHAR2(1) NOT NULL,
"JOB_LOGGING" VARCHAR2(1) NOT NULL,
"AVAILABLE" VARCHAR2(1) NOT NULL,
"SORT_ORDER" NUMBER(9,0) NOT NULL,
"CREATED_BY" VARCHAR2(255) NOT NULL,
"CREATED_TIME" TIMESTAMP NOT NULL,
@ -586,8 +587,8 @@ INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME,
INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME, VERSION_NO) VALUES (3, 'au', 'au', 3, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 1);
INSERT INTO BROWSER_TYPE (ID, NAME, VALUE, SORT_ORDER, CREATED_BY, CREATED_TIME, VERSION_NO) VALUES (4, 'Softbank', 'softbank', 4, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 1);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (1, 'Crawler', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("crawlJob").execute(executor);', 'T', 'T', 0, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (2, 'Minutely', 'all', '0 * * * * ?', 'groovy', 'return container.getComponent("minutelyJob").execute();', 'F', 'F', 10, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (3, 'Hourly', 'all', '0 0 * * * ?', 'groovy', 'return container.getComponent("houryJob").execute();', 'F', 'F', 20, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (4, 'Daily', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("dailyJob").execute();', 'F', 'F', 30, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (1, 'Crawler', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("crawlJob").execute(executor);', 'T', 'T', 'T', 0, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (2, 'Minutely Tasks', 'all', '0 * * * * ?', 'groovy', 'return container.getComponent("minutelyJob").execute();', 'F', 'F', 'T', 10, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (3, 'Hourly Tasks', 'all', '0 0 * * * ?', 'groovy', 'return container.getComponent("houryJob").execute();', 'F', 'F', 'T', 20, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);
INSERT INTO SCHEDULED_JOB (ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, VERSION_NO) VALUES (4, 'Daily Tasks', 'all', '0 0 0 * * ?', 'groovy', 'return container.getComponent("dailyJob").execute();', 'F', 'F', 'T', 30, 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 'system', to_date('2000-01-01', 'yyyy-MM-dd'), 0);

12
src/main/config/tablemeta.properties
View file

@ -1985,6 +1985,18 @@ scheduledJob.jobLogging.floatTypeParam=
scheduledJob.jobLogging.doubleTypeParam=
scheduledJob.jobLogging.dateTypeParam=
scheduledJob.jobLogging.defaultValue=
scheduledJob.available.requiredParam=
scheduledJob.available.additionalAnnotation=
scheduledJob.available.annotation=// ignore
scheduledJob.available.enableJavaType=true
scheduledJob.available.longTypeParam=
scheduledJob.available.integerTypeParam=
scheduledJob.available.shortTypeParam=
scheduledJob.available.byteTypeParam=
scheduledJob.available.floatTypeParam=
scheduledJob.available.doubleTypeParam=
scheduledJob.available.dateTypeParam=
scheduledJob.available.defaultValue=
scheduledJob.sortOrder.requiredParam=
scheduledJob.sortOrder.additionalAnnotation=@IntRange(min = 0, max = 2147483647)
scheduledJob.sortOrder.annotation=

5
src/main/java/jp/sf/fess/action/admin/ScheduledJobAction.java
View file

@ -73,6 +73,8 @@ public class ScheduledJobAction extends BsScheduledJobAction {
: null;
scheduledJobForm.crawler = scheduledJob.isCrawlerJob() ? Constants.ON
: null;
scheduledJobForm.available = scheduledJob.isEnabled() ? Constants.ON
: null;
}
@Override
@ -103,6 +105,9 @@ public class ScheduledJobAction extends BsScheduledJobAction {
scheduledJob
.setCrawler(Constants.ON.equals(scheduledJobForm.crawler) ? Constants.T
: Constants.F);
scheduledJob
.setAvailable(Constants.ON.equals(scheduledJobForm.available) ? Constants.T
: Constants.F);
return scheduledJob;
}

4
src/main/java/jp/sf/fess/crud/form/admin/BsScheduledJobForm.java
View file

@ -72,6 +72,9 @@ public abstract class BsScheduledJobForm {
// ignore
public String jobLogging;
// ignore
public String available;
@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
@IntegerType
@IntRange(min = 0, max = 2147483647)
@ -108,6 +111,7 @@ public abstract class BsScheduledJobForm {
scriptData = null;
crawler = null;
jobLogging = null;
available = null;
sortOrder = null;
createdBy = null;
createdTime = null;

3
src/main/java/jp/sf/fess/crud/pager/BsScheduledJobPager.java
View file

@ -54,6 +54,8 @@ public abstract class BsScheduledJobPager implements Serializable {
public String jobLogging;
public String available;
public String sortOrder;
public String createdBy;
@ -73,6 +75,7 @@ public abstract class BsScheduledJobPager implements Serializable {
scriptType = null;
crawler = null;
jobLogging = null;
available = null;
sortOrder = null;
createdBy = null;
createdTime = null;

2
src/main/java/jp/sf/fess/db/bsbhv/BsScheduledJobBhv.java
View file

@ -44,7 +44,7 @@ import org.seasar.dbflute.outsidesql.executor.OutsideSqlBasicExecutor;
* ID
*
* [column]
* ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETED_BY, DELETED_TIME, VERSION_NO
* ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETED_BY, DELETED_TIME, VERSION_NO
*
* [sequence]
*

25
src/main/java/jp/sf/fess/db/bsentity/BsScheduledJob.java
View file

@ -34,7 +34,7 @@ import org.seasar.dbflute.dbmeta.DBMeta;
* ID
*
* [column]
* ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETED_BY, DELETED_TIME, VERSION_NO
* ID, NAME, TARGET, CRON_EXPRESSION, SCRIPT_TYPE, SCRIPT_DATA, CRAWLER, JOB_LOGGING, AVAILABLE, SORT_ORDER, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETED_BY, DELETED_TIME, VERSION_NO
*
* [sequence]
*
@ -67,6 +67,7 @@ import org.seasar.dbflute.dbmeta.DBMeta;
* String scriptData = entity.getScriptData();
* String crawler = entity.getCrawler();
* String jobLogging = entity.getJobLogging();
* String available = entity.getAvailable();
* Integer sortOrder = entity.getSortOrder();
* String createdBy = entity.getCreatedBy();
* java.sql.Timestamp createdTime = entity.getCreatedTime();
@ -83,6 +84,7 @@ import org.seasar.dbflute.dbmeta.DBMeta;
* entity.setScriptData(scriptData);
* entity.setCrawler(crawler);
* entity.setJobLogging(jobLogging);
* entity.setAvailable(available);
* entity.setSortOrder(sortOrder);
* entity.setCreatedBy(createdBy);
* entity.setCreatedTime(createdTime);
@ -133,6 +135,9 @@ public abstract class BsScheduledJob implements Entity, Serializable, Cloneable
/** JOB_LOGGING: {NotNull, VARCHAR(1)} */
protected String _jobLogging;
/** AVAILABLE: {NotNull, VARCHAR(1)} */
protected String _available;
/** SORT_ORDER: {NotNull, INTEGER(10)} */
protected Integer _sortOrder;
@ -347,6 +352,7 @@ public abstract class BsScheduledJob implements Entity, Serializable, Cloneable
sb.append(delimiter).append(getScriptData());
sb.append(delimiter).append(getCrawler());
sb.append(delimiter).append(getJobLogging());
sb.append(delimiter).append(getAvailable());
sb.append(delimiter).append(getSortOrder());
sb.append(delimiter).append(getCreatedBy());
sb.append(delimiter).append(getCreatedTime());
@ -519,6 +525,23 @@ public abstract class BsScheduledJob implements Entity, Serializable, Cloneable
_jobLogging = jobLogging;
}
/**
* [get] AVAILABLE: {NotNull, VARCHAR(1)} <br />
* @return The value of the column 'AVAILABLE'. (basically NotNull if selected: for the constraint)
*/
public String getAvailable() {
return _available;
}
/**
* [set] AVAILABLE: {NotNull, VARCHAR(1)} <br />
* @param available The value of the column 'AVAILABLE'. (basically NotNull if update: for the constraint)
*/
public void setAvailable(final String available) {
__modifiedProperties.addPropertyName("available");
_available = available;
}
/**
* [get] SORT_ORDER: {NotNull, INTEGER(10)} <br />
* @return The value of the column 'SORT_ORDER'. (basically NotNull if selected: for the constraint)

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/BrowserTypeDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/ClickLogDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/CrawlingSessionDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/CrawlingSessionInfoDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToBrowserTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToLabelTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataConfigToRoleTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/DataCrawlingConfigDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FailureUrlDbm.java
View file

@ -232,7 +232,7 @@ public class FailureUrlDbm extends AbstractDBMeta {
"BIGINT",
19,
0,
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3DCFE27_7719_4B2E_A29F_AF845E251EC1",
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A515E1CD_6561_45F0_A877_3ADC11B158C7",
false, null, null, null, null, null);
protected final ColumnInfo _columnUrl = cci("URL", "URL", null, null, true,

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FavoriteLogDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileAuthenticationDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToBrowserTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToLabelTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileConfigToRoleTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/FileCrawlingConfigDbm.java
View file

@ -401,7 +401,7 @@ public class FileCrawlingConfigDbm extends AbstractDBMeta {
"BIGINT",
19,
0,
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_09028F6B_6A9E_45FE_8673_AD297EA85046",
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C2495BF5_5986_4ADF_82C0_5AFA214CE90F",
false,
null,
null,

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/JobLogDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/LabelTypeDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/LabelTypeToRoleTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/OverlappingHostDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/PathMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/RequestHeaderDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/RoleTypeDbm.java
View file

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

24
src/main/java/jp/sf/fess/db/bsentity/dbmeta/ScheduledJobDbm.java
View file

@ -70,6 +70,7 @@ public class ScheduledJobDbm extends AbstractDBMeta {
setupEpg(_epgMap, new EpgScriptData(), "scriptData");
setupEpg(_epgMap, new EpgCrawler(), "crawler");
setupEpg(_epgMap, new EpgJobLogging(), "jobLogging");
setupEpg(_epgMap, new EpgAvailable(), "available");
setupEpg(_epgMap, new EpgSortOrder(), "sortOrder");
setupEpg(_epgMap, new EpgCreatedBy(), "createdBy");
setupEpg(_epgMap, new EpgCreatedTime(), "createdTime");
@ -181,6 +182,18 @@ public class ScheduledJobDbm extends AbstractDBMeta {
}
}
public static class EpgAvailable implements PropertyGateway {
@Override
public Object read(final Entity e) {
return ((ScheduledJob) e).getAvailable();
}
@Override
public void write(final Entity e, final Object v) {
((ScheduledJob) e).setAvailable((String) v);
}
}
public static class EpgSortOrder implements PropertyGateway {
@Override
public Object read(final Entity e) {
@ -322,7 +335,7 @@ public class ScheduledJobDbm extends AbstractDBMeta {
"BIGINT",
19,
0,
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D6F9129E_73D7_4058_B2B1_ABC852F6C6F9",
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_DE6BB1F9_9750_40AE_A9B6_72DBBB66E240",
false, null, null, null, null, null);
protected final ColumnInfo _columnName = cci("NAME", "NAME", null, null,
@ -355,6 +368,10 @@ public class ScheduledJobDbm extends AbstractDBMeta {
"JOB_LOGGING", null, null, true, "jobLogging", String.class, false,
false, "VARCHAR", 1, 0, null, false, null, null, null, null, null);
protected final ColumnInfo _columnAvailable = cci("AVAILABLE", "AVAILABLE",
null, null, true, "available", String.class, false, false,
"VARCHAR", 1, 0, null, false, null, null, null, null, null);
protected final ColumnInfo _columnSortOrder = cci("SORT_ORDER",
"SORT_ORDER", null, null, true, "sortOrder", Integer.class, false,
false, "INTEGER", 10, 0, null, false, null, null, null, null, null);
@ -423,6 +440,10 @@ public class ScheduledJobDbm extends AbstractDBMeta {
return _columnJobLogging;
}
public ColumnInfo columnAvailable() {
return _columnAvailable;
}
public ColumnInfo columnSortOrder() {
return _columnSortOrder;
}
@ -466,6 +487,7 @@ public class ScheduledJobDbm extends AbstractDBMeta {
ls.add(columnScriptData());
ls.add(columnCrawler());
ls.add(columnJobLogging());
ls.add(columnAvailable());
ls.add(columnSortOrder());
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/SearchFieldLogDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/SearchLogDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/UserInfoDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebAuthenticationDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToBrowserTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToLabelTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebConfigToRoleTypeMappingDbm.java
View file

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

2
src/main/java/jp/sf/fess/db/bsentity/dbmeta/WebCrawlingConfigDbm.java
View file

@ -414,7 +414,7 @@ public class WebCrawlingConfigDbm extends AbstractDBMeta {
"BIGINT",
19,
0,
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_40BBAD79_C3C3_48B7_8110_6F6177D7FAB6",
"NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_05B91638_28D1_4204_BE8E_55C7BEAFE3E3",
false,
null,
null,

8
src/main/java/jp/sf/fess/db/cbean/bs/BsScheduledJobCB.java
View file

@ -415,6 +415,14 @@ public class BsScheduledJobCB extends AbstractConditionBean {
return doColumn("JOB_LOGGING");
}
/**
* AVAILABLE: {NotNull, VARCHAR(1)}
* @return The information object of specified column. (NotNull)
*/
public HpSpecifiedColumn columnAvailable() {
return doColumn("AVAILABLE");
}
/**
* SORT_ORDER: {NotNull, INTEGER(10)}
* @return The information object of specified column. (NotNull)

129
src/main/java/jp/sf/fess/db/cbean/cq/bs/AbstractBsScheduledJobCQ.java
View file

@ -1138,6 +1138,135 @@ public abstract class AbstractBsScheduledJobCQ extends AbstractConditionQuery {
abstract protected ConditionValue getCValueJobLogging();
/**
* Equal(=). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as equal. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_Equal(final String available) {
doSetAvailable_Equal(fRES(available));
}
protected void doSetAvailable_Equal(final String available) {
regAvailable(CK_EQ, available);
}
/**
* NotEqual(&lt;&gt;). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as notEqual. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_NotEqual(final String available) {
doSetAvailable_NotEqual(fRES(available));
}
protected void doSetAvailable_NotEqual(final String available) {
regAvailable(CK_NES, available);
}
/**
* GreaterThan(&gt;). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as greaterThan. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_GreaterThan(final String available) {
regAvailable(CK_GT, fRES(available));
}
/**
* LessThan(&lt;). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as lessThan. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_LessThan(final String available) {
regAvailable(CK_LT, fRES(available));
}
/**
* GreaterEqual(&gt;=). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as greaterEqual. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_GreaterEqual(final String available) {
regAvailable(CK_GE, fRES(available));
}
/**
* LessEqual(&lt;=). And NullOrEmptyIgnored, OnlyOnceRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as lessEqual. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_LessEqual(final String available) {
regAvailable(CK_LE, fRES(available));
}
/**
* InScope {in ('a', 'b')}. And NullOrEmptyIgnored, NullOrEmptyElementIgnored, SeveralRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param availableList The collection of available as inScope. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_InScope(final Collection<String> availableList) {
doSetAvailable_InScope(availableList);
}
public void doSetAvailable_InScope(final Collection<String> availableList) {
regINS(CK_INS, cTL(availableList), getCValueAvailable(), "AVAILABLE");
}
/**
* NotInScope {not in ('a', 'b')}. And NullOrEmptyIgnored, NullOrEmptyElementIgnored, SeveralRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param availableList The collection of available as notInScope. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_NotInScope(final Collection<String> availableList) {
doSetAvailable_NotInScope(availableList);
}
public void doSetAvailable_NotInScope(final Collection<String> availableList) {
regINS(CK_NINS, cTL(availableList), getCValueAvailable(), "AVAILABLE");
}
/**
* PrefixSearch {like 'xxx%' escape ...}. And NullOrEmptyIgnored, SeveralRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as prefixSearch. (NullAllowed: if null (or empty), no condition)
*/
public void setAvailable_PrefixSearch(final String available) {
setAvailable_LikeSearch(available, cLSOP());
}
/**
* LikeSearch with various options. (versatile) {like '%xxx%' escape ...}. And NullOrEmptyIgnored, SeveralRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)} <br />
* <pre>e.g. setAvailable_LikeSearch("xxx", new <span style="color: #FD4747">LikeSearchOption</span>().likeContain());</pre>
* @param available The value of available as likeSearch. (NullAllowed: if null (or empty), no condition)
* @param likeSearchOption The option of like-search. (NotNull)
*/
public void setAvailable_LikeSearch(final String available,
final LikeSearchOption likeSearchOption) {
regLSQ(CK_LS, fRES(available), getCValueAvailable(), "AVAILABLE",
likeSearchOption);
}
/**
* NotLikeSearch with various options. (versatile) {not like 'xxx%' escape ...} <br />
* And NullOrEmptyIgnored, SeveralRegistered. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @param available The value of available as notLikeSearch. (NullAllowed: if null (or empty), no condition)
* @param likeSearchOption The option of not-like-search. (NotNull)
*/
public void setAvailable_NotLikeSearch(final String available,
final LikeSearchOption likeSearchOption) {
regLSQ(CK_NLS, fRES(available), getCValueAvailable(), "AVAILABLE",
likeSearchOption);
}
protected void regAvailable(final ConditionKey k, final Object v) {
regQ(k, v, getCValueAvailable(), "AVAILABLE");
}
abstract protected ConditionValue getCValueAvailable();
/**
* Equal(=). And NullIgnored, OnlyOnceRegistered. <br />
* SORT_ORDER: {NotNull, INTEGER(10)}

34
src/main/java/jp/sf/fess/db/cbean/cq/bs/BsScheduledJobCQ.java
View file

@ -372,6 +372,40 @@ public class BsScheduledJobCQ extends AbstractBsScheduledJobCQ {
return this;
}
protected ConditionValue _available;
public ConditionValue getAvailable() {
if (_available == null) {
_available = nCV();
}
return _available;
}
@Override
protected ConditionValue getCValueAvailable() {
return getAvailable();
}
/**
* Add order-by as ascend. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @return this. (NotNull)
*/
public BsScheduledJobCQ addOrderBy_Available_Asc() {
regOBA("AVAILABLE");
return this;
}
/**
* Add order-by as descend. <br />
* AVAILABLE: {NotNull, VARCHAR(1)}
* @return this. (NotNull)
*/
public BsScheduledJobCQ addOrderBy_Available_Desc() {
regOBD("AVAILABLE");
return this;
}
protected ConditionValue _sortOrder;
public ConditionValue getSortOrder() {

5
src/main/java/jp/sf/fess/db/cbean/cq/ciq/ScheduledJobCIQ.java
View file

@ -136,6 +136,11 @@ public class ScheduledJobCIQ extends AbstractBsScheduledJobCQ {
return _myCQ.getJobLogging();
}
@Override
protected ConditionValue getCValueAvailable() {
return _myCQ.getAvailable();
}
@Override
protected ConditionValue getCValueSortOrder() {
return _myCQ.getSortOrder();

4
src/main/java/jp/sf/fess/db/exentity/ScheduledJob.java
View file

@ -43,6 +43,10 @@ public class ScheduledJob extends BsScheduledJob {
return Constants.T.equals(getCrawler());
}
public boolean isEnabled() {
return Constants.T.equals(getAvailable());
}
public boolean isRunning() {
return SingletonS2Container.getComponent(SystemHelper.class)
.isRunningJobExecutoer(getId());

74
src/main/java/jp/sf/fess/job/JobScheduler.java
View file

@ -37,9 +37,11 @@ import org.quartz.SchedulerException;
import org.quartz.SchedulerFactory;
import org.quartz.Trigger;
import org.quartz.impl.StdSchedulerFactory;
import org.seasar.dbflute.cbean.EntityRowHandler;
import org.seasar.framework.container.SingletonS2Container;
import org.seasar.framework.container.annotation.tiger.DestroyMethod;
import org.seasar.framework.container.annotation.tiger.InitMethod;
import org.seasar.framework.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -53,7 +55,7 @@ public class JobScheduler {
public Class<? extends Job> jobClass = TriggeredJob.class;
public List<String> targetList;
public List<String> targetList = new ArrayList<String>();
@InitMethod
public void init() {
@ -65,23 +67,18 @@ public class JobScheduler {
throw new ScheduledJobException("Failed to start a scheduler.", e);
}
final List<String> list = new ArrayList<String>();
list.add(Constants.DEFAULT_JOB_TARGET);
if (targetList != null) {
list.addAll(targetList);
}
final ScheduledJobCB cb = new ScheduledJobCB();
if (targetList != null) {
cb.query().setTarget_InScope(targetList);
}
cb.query().setAvailable_Equal(Constants.T);
cb.query().setDeletedBy_IsNull();
cb.query().addOrderBy_SortOrder_Asc();
cb.query().addOrderBy_Name_Asc();
final List<ScheduledJob> scheduledJobList = SingletonS2Container
.getComponent(ScheduledJobBhv.class).selectList(cb);
for (final ScheduledJob scheduledJob : scheduledJobList) {
register(scheduledJob);
}
SingletonS2Container.getComponent(ScheduledJobBhv.class).selectCursor(
cb, new EntityRowHandler<ScheduledJob>() {
@Override
public void handle(final ScheduledJob scheduledJob) {
register(scheduledJob);
}
});
}
@DestroyMethod
@ -98,20 +95,23 @@ public class JobScheduler {
throw new ScheduledJobException("No job.");
}
if (!Constants.T.equals(scheduledJob.getAvailable())) {
logger.info("Inactive Job " + scheduledJob.getId() + ":"
+ scheduledJob.getName());
try {
unregister(scheduledJob);
} catch (final Exception e) {
// ignore
}
return;
}
final String target = scheduledJob.getTarget();
if (targetList != null) {
if (!Constants.DEFAULT_JOB_TARGET.equals(target)
&& !targetList.contains(target)) {
logger.warn("Ignore Job " + scheduledJob.getId()
+ " because of not target: " + scheduledJob.getTarget());
return;
}
} else {
if (!Constants.DEFAULT_JOB_TARGET.equals(target)) {
logger.warn("Ignore Job " + scheduledJob.getId()
+ " because of not target: " + scheduledJob.getTarget());
return;
}
if (!isTarget(target)) {
logger.info("Ignore Job " + scheduledJob.getId() + ":"
+ scheduledJob.getName() + " because of not target: "
+ scheduledJob.getTarget());
return;
}
String scriptType = scheduledJob.getScriptType();
@ -139,6 +139,10 @@ public class JobScheduler {
throw new ScheduledJobException("Failed to add Job: "
+ scheduledJob, e);
}
logger.info("Starting Job " + scheduledJob.getId() + ":"
+ scheduledJob.getName());
}
public void unregister(final ScheduledJob scheduledJob) {
@ -150,4 +154,20 @@ public class JobScheduler {
+ scheduledJob, e);
}
}
protected boolean isTarget(final String target) {
if (StringUtil.isBlank(target)) {
return true;
}
final String[] targets = target.split(",");
for (String name : targets) {
name = name.trim();
if (Constants.DEFAULT_JOB_TARGET.equals(name)
|| targetList.contains(name)) {
return true;
}
}
return false;
}
}

3
src/main/resources/application.properties
View file

@ -1261,7 +1261,8 @@ labels.scheduledjob_scriptData=Script
labels.scheduledjob_jobLogging=Logging
labels.scheduledjob_crawler=Crawler Job
labels.scheduledjob_running=Running
labels.scheduledjob_nojob=None
labels.scheduledjob_active=Active
labels.scheduledjob_nojob=-
# view/admin/ScheduledJob/confirm.jsp
labels.scheduledjob_title_confirm=Confirm Job

1
src/main/resources/application_ja.properties
View file

@ -1259,6 +1259,7 @@ labels.scheduledjob_scriptData=\u30b9\u30af\u30ea\u30d7\u30c8
labels.scheduledjob_jobLogging=\u30ed\u30b0
labels.scheduledjob_crawler=\u30af\u30ed\u30fc\u30eb\u30b8\u30e7\u30d6
labels.scheduledjob_running=\u5b9f\u884c\u4e2d
labels.scheduledjob_active=\u6709\u52b9
labels.scheduledjob_nojob=-
# view/admin/ScheduledJob/confirm.jsp

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

Binary file not shown.

8
src/main/webapp/WEB-INF/view/admin/scheduledJob/confirm.jsp
View file

@ -95,6 +95,14 @@
<html:hidden property="crawler" />
</td>
</tr>
<tr>
<th><bean:message key="labels.scheduledjob_status" /></th>
<td>
<c:if test="${available=='on'}"><bean:message key="labels.enabled"/></c:if>
<c:if test="${available!='on'}"><bean:message key="labels.disabled"/></c:if>
<html:hidden property="available" />
</td>
</tr>
<tr>
<th><bean:message key="labels.sortOrder" /></th>
<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>

4
src/main/webapp/WEB-INF/view/admin/scheduledJob/edit.jsp
View file

@ -87,6 +87,10 @@
<th><bean:message key="labels.scheduledjob_crawler" /></th>
<td><html:checkbox property="crawler"/><bean:message key="labels.enabled"/></td>
</tr>
<tr>
<th><bean:message key="labels.scheduledjob_status" /></th>
<td><html:checkbox property="available"/><bean:message key="labels.enabled"/></td>
</tr>
<tr>
<th><bean:message key="labels.sortOrder" /></th>
<td><html:text property="sortOrder" styleClass="xlarge"/></td>

5
src/main/webapp/WEB-INF/view/admin/scheduledJob/index.jsp
View file

@ -58,7 +58,10 @@
<td>${f:h(data.name)}</td>
<td style="text-align: center;">
<c:if test="${data.running}"><bean:message key="labels.scheduledjob_running" /></c:if>
<c:if test="${!data.running}"><bean:message key="labels.scheduledjob_nojob" /></c:if>
<c:if test="${!data.running}">
<c:if test="${data.available=='T'}"><bean:message key="labels.scheduledjob_active" /></c:if>
<c:if test="${data.available!='T'}"><bean:message key="labels.scheduledjob_nojob" /></c:if>
</c:if>
</td>
<td style="text-align: center;">${f:h(data.target)}</td>
<td style="text-align: center;">${f:h(data.cronExpression)}</td>