Merge remote-tracking branch 'origin/master' into feature/gui-config

config/sql/h2-upgrade-4.0-4.4.sql

@@ -68,6 +68,7 @@ ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
 ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
 
 -- 4.4+ Changes
+-- MID-7173
 ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
 ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
 ALTER TABLE m_node ADD COLUMN operationalState INTEGER;

config/sql/mysql-4.3-all-utf8mb4.sql → config/sql/mysql-4.4-all-utf8mb4.sql

@@ -598,6 +598,8 @@ CREATE TABLE m_task (
   taskIdentifier           VARCHAR(191),
   threadStopAction         INTEGER,
   waitingReason            INTEGER,
+  schedulingState          INTEGER,
+  autoScalingMode          INTEGER,
   oid                      VARCHAR(36)  CHARSET utf8 COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -810,6 +812,7 @@ CREATE TABLE m_node (
   name_norm      VARCHAR(191),
   name_orig      VARCHAR(191),
   nodeIdentifier VARCHAR(255),
+  operationalState INTEGER,
   oid            VARCHAR(36)  CHARSET utf8 COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -1414,7 +1417,7 @@ ALTER TABLE m_user
 ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object (oid);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.3');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
 
 -- By: Ron Cordell - roncordell
 -- I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz

config/sql/mysql-4.3-all.sql → config/sql/mysql-4.4-all.sql

@@ -597,6 +597,8 @@ CREATE TABLE m_task (
   taskIdentifier           VARCHAR(255),
   threadStopAction         INTEGER,
   waitingReason            INTEGER,
+  schedulingState          INTEGER,
+  autoScalingMode          INTEGER,
   oid                      VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -809,6 +811,7 @@ CREATE TABLE m_node (
   name_norm      VARCHAR(255),
   name_orig      VARCHAR(255),
   nodeIdentifier VARCHAR(255),
+  operationalState INTEGER,
   oid            VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -1414,7 +1417,7 @@ ALTER TABLE m_user
 ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object (oid);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.3');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
 
 -- By: Ron Cordell - roncordell
 -- I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz

config/sql/mysql-upgrade-4.0-4.4-utf8mb4.sql

@@ -3,8 +3,6 @@
 CREATE INDEX iOpExecTimestampValue
   ON m_operation_execution (timestampValue);
 
-UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
-
 -- 2020-06-25 11:35
 
 ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;
@@ -60,15 +58,22 @@ ALTER TABLE m_object_policy_situation
   ADD CONSTRAINT fk_object_policy_situation FOREIGN KEY (object_oid) REFERENCES m_object (oid);
 
 COMMIT;
+
 -- 4.3+ Changes
 -- MID-6417
 ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
 
 -- MID-3669
 ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
 
+-- 4.4+ Changes
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
+
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/mysql-upgrade-4.0-4.4.sql

@@ -3,8 +3,6 @@
 CREATE INDEX iOpExecTimestampValue
   ON m_operation_execution (timestampValue);
 
-UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
-
 -- 2020-06-25 11:35
 
 ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;
@@ -62,15 +60,22 @@ ALTER TABLE m_object_policy_situation
   ADD CONSTRAINT fk_object_policy_situation FOREIGN KEY (object_oid) REFERENCES m_object (oid);
 
 COMMIT;
+
 -- 4.3+ Changes
 -- MID-6417
 ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
 
 -- MID-3669
 ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
 
+-- 4.4+ Changes
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
+
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql → config/sql/mysql-upgrade-4.3-4.4-utf8mb4.sql

@@ -1,11 +1,10 @@
--- MID-6417
-ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
-
--- MID-3669
-ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
 
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/mysql-upgrade-4.2-4.3.sql → config/sql/mysql-upgrade-4.3-4.4.sql

@@ -1,11 +1,10 @@
--- MID-6417
-ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
-
--- MID-3669
-ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
 
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/oracle-4.3-all.sql → config/sql/oracle-4.4-all.sql

@@ -1216,7 +1216,7 @@ CREATE INDEX iOrgOrgTypeOid ON M_ORG_ORG_TYPE(ORG_OID) INITRANS 30;
 CREATE INDEX iServiceTypeOid ON M_SERVICE_TYPE(SERVICE_OID) INITRANS 30;
 CREATE INDEX iTaskDependentOid ON M_TASK_DEPENDENT(TASK_OID) INITRANS 30;
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.3');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
 
 --
 -- A hint submitted by a user: Oracle DB MUST be created as "shared" and the

config/sql/oracle-upgrade-4.0-4.4.sql

@@ -3,8 +3,6 @@
 CREATE INDEX iOpExecTimestampValue
   ON m_operation_execution (timestampValue) INITRANS 30;
 
-UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
-
 -- 2020-06-25 11:35
 
 ALTER TABLE m_acc_cert_campaign RENAME COLUMN definitionRef_type TO definitionRef_targetType;
@@ -69,8 +67,14 @@ ALTER TABLE m_operation_execution ADD recordType NUMBER(10, 0);
 -- MID-3669
 ALTER TABLE m_focus ADD lockoutStatus NUMBER(10, 0);
 
+-- 4.4+ Changes
+-- MID-7173
+ALTER TABLE m_task ADD schedulingState NUMBER(10, 0);
+ALTER TABLE m_task ADD autoScalingMode NUMBER(10, 0);
+ALTER TABLE m_node ADD operationalState NUMBER(10, 0);
+
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE qrtz_job_details SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/postgresql-upgrade-4.2-4.3.sql → config/sql/oracle-upgrade-4.3-4.4.sql

@@ -1,11 +1,10 @@
--- MID-6417
-ALTER TABLE m_operation_execution ADD COLUMN recordType INT4;
-
--- MID-3669
-ALTER TABLE m_focus ADD COLUMN lockoutStatus INT4;
+-- MID-7173
+ALTER TABLE m_task ADD schedulingState NUMBER(10, 0);
+ALTER TABLE m_task ADD autoScalingMode NUMBER(10, 0);
+ALTER TABLE m_node ADD operationalState NUMBER(10, 0);
 
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE qrtz_job_details SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/postgresql-4.3-all.sql → config/sql/postgresql-4.4-all.sql

@@ -469,6 +469,8 @@ CREATE TABLE m_task (
   taskIdentifier           VARCHAR(255),
   threadStopAction         INT4,
   waitingReason            INT4,
+  schedulingState          INT4,
+  autoScalingMode          INT4,
   oid                      VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
@@ -627,6 +629,7 @@ CREATE TABLE m_node (
   name_norm      VARCHAR(255),
   name_orig      VARCHAR(255),
   nodeIdentifier VARCHAR(255),
+  operationalState INT4,
   oid            VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
@@ -1211,7 +1214,7 @@ CREATE INDEX iOrgOrgTypeOid ON M_ORG_ORG_TYPE(ORG_OID);
 CREATE INDEX iServiceTypeOid ON M_SERVICE_TYPE(SERVICE_OID);
 CREATE INDEX iTaskDependentOid ON M_TASK_DEPENDENT(TASK_OID);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.3');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
 
 -- Thanks to Patrick Lightbody for submitting this...
 --

config/sql/postgresql-upgrade-4.0-4.4.sql

@@ -3,8 +3,6 @@
 CREATE INDEX iOpExecTimestampValue
   ON m_operation_execution (timestampValue);
 
-UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
-
 -- 2020-06-25 11:35
 
 ALTER TABLE m_acc_cert_campaign RENAME COLUMN definitionRef_type TO definitionRef_targetType;
@@ -61,15 +59,22 @@ ALTER TABLE m_object_policy_situation
 ALTER INDEX iFocusPolicySituationOid RENAME TO iObjectPolicySituationOid;
 
 COMMIT;
+
 -- 4.3+ Changes
 -- MID-6417
 ALTER TABLE m_operation_execution ADD COLUMN recordType INT4;
 
 -- MID-3669
 ALTER TABLE m_focus ADD COLUMN lockoutStatus INT4;
 
+-- 4.4+ Changes
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INT4;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INT4;
+ALTER TABLE m_node ADD COLUMN operationalState INT4;
+
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE qrtz_job_details SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/oracle-upgrade-4.2-4.3.sql → config/sql/postgresql-upgrade-4.3-4.4.sql

@@ -1,11 +1,10 @@
--- MID-6417
-ALTER TABLE m_operation_execution ADD recordType NUMBER(10, 0);
-
--- MID-3669
-ALTER TABLE m_focus ADD lockoutStatus NUMBER(10, 0);
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INT4;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INT4;
+ALTER TABLE m_node ADD COLUMN operationalState INT4;
 
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE qrtz_job_details SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/sqlserver-4.3-all.sql → config/sql/sqlserver-4.4-all.sql

@@ -469,6 +469,8 @@ CREATE TABLE m_task (
   taskIdentifier           NVARCHAR(255) COLLATE database_default,
   threadStopAction         INT,
   waitingReason            INT,
+  schedulingState          INT,
+  autoScalingMode          INT,
   oid                      NVARCHAR(36) COLLATE database_default NOT NULL,
   PRIMARY KEY (oid)
 );
@@ -627,6 +629,7 @@ CREATE TABLE m_node (
   name_norm      NVARCHAR(255) COLLATE database_default,
   name_orig      NVARCHAR(255) COLLATE database_default,
   nodeIdentifier NVARCHAR(255) COLLATE database_default,
+  operationalState INT,
   oid            NVARCHAR(36) COLLATE database_default NOT NULL,
   PRIMARY KEY (oid)
 );
@@ -1215,7 +1218,7 @@ CREATE INDEX iServiceTypeOid ON m_service_type(service_oid);
 CREATE INDEX iTaskDependentOid ON m_task_dependent(task_oid);
 
 BEGIN TRANSACTION
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.3');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
 COMMIT;
 
 --# thanks to George Papastamatopoulos for submitting this ... and Marko Lahma for

config/sql/sqlserver-upgrade-4.0-4.4.sql

@@ -3,7 +3,6 @@
 CREATE INDEX iOpExecTimestampValue
   ON m_operation_execution (timestampValue);
 
-UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
 GO
 
 -- 2020-06-25 11:35
@@ -108,9 +107,16 @@ ALTER TABLE m_operation_execution ADD recordType INT;
 -- MID-3669
 ALTER TABLE m_focus ADD lockoutStatus INT;
 
+-- 4.4+ Changes
+
+-- MID-7173
+ALTER TABLE m_task ADD schedulingState INT;
+ALTER TABLE m_task ADD autoScalingMode INT;
+ALTER TABLE m_node ADD operationalState INT;
+
 -- WRITE CHANGES ABOVE ^^
 GO
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/sqlserver-upgrade-4.2-4.3.sql → config/sql/sqlserver-upgrade-4.3-4.4.sql

@@ -1,14 +1,13 @@
 -- Never mix DDL (CREATE/UPDATE/ALTER) with sp_rename and other functions, put GO in between + end.
 
--- MID-6417
-ALTER TABLE m_operation_execution ADD recordType INT;
-
--- MID-3669
-ALTER TABLE m_focus ADD lockoutStatus INT;
+-- MID-7173
+ALTER TABLE m_task ADD schedulingState INT;
+ALTER TABLE m_task ADD autoScalingMode INT;
+ALTER TABLE m_node ADD operationalState INT;
 
 -- WRITE CHANGES ABOVE ^^
 GO
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

gui/admin-gui/pom.xml

@@ -668,6 +668,11 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <!-- TEST -->
         <dependency>
             <groupId>org.springframework.boot</groupId>