Merge branch 'master' of https://github.com/Evolveum/midpoint

Conflicts: gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ListMultipleChoiceTransferPanel.java gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageAssignmentRequest.java
Evolveum · Feb 15, 2016 · 58e6f28 · 58e6f28
2 parents 7eef797 + 3188c22
commit 58e6f28
Show file tree

Hide file tree

Showing 365 changed files with 5,493 additions and 3,878 deletions.
diff --git a/config/sql/midpoint/3.3/h2/h2-upgrade-3.2-3.3.sql b/config/sql/midpoint/3.3/h2/h2-upgrade-3.2-3.3.sql
diff --git a/config/sql/midpoint/3.3/mysql/mysql-upgrade-3.2-3.3.sql b/config/sql/midpoint/3.3/mysql/mysql-upgrade-3.2-3.3.sql
diff --git a/config/sql/midpoint/3.3/oracle/oracle-upgrade-3.2-3.3.sql b/config/sql/midpoint/3.3/oracle/oracle-upgrade-3.2-3.3.sql
diff --git a/config/sql/midpoint/3.3/postgresql/postgresql-upgrade-3.2-3.3.sql b/config/sql/midpoint/3.3/postgresql/postgresql-upgrade-3.2-3.3.sql
diff --git a/config/sql/midpoint/3.3/sqlserver/sqlserver-upgrade-3.2-3.3.sql b/config/sql/midpoint/3.3/sqlserver/sqlserver-upgrade-3.2-3.3.sql
diff --git a/config/sql/midpoint/3.3/h2/h2-3.4.sql → config/sql/midpoint/3.4/h2/h2-3.4.sql b/config/sql/midpoint/3.3/h2/h2-3.4.sql → config/sql/midpoint/3.4/h2/h2-3.4.sql
@@ -36,15 +36,16 @@ CREATE TABLE m_acc_cert_case (
   validTo                  TIMESTAMP,
   validityChangeTimestamp  TIMESTAMP,
   validityStatus           INTEGER,
-  currentResponse          INTEGER,
   currentStageNumber       INTEGER,
+  currentStageOutcome      INTEGER,
   fullObject               BLOB,
   objectRef_relation       VARCHAR(157),
   objectRef_targetOid      VARCHAR(36),
   objectRef_type           INTEGER,
   orgRef_relation          VARCHAR(157),
   orgRef_targetOid         VARCHAR(36),
   orgRef_type              INTEGER,
+  overallOutcome           INTEGER,
   remediedTimestamp        TIMESTAMP,
   reviewDeadline           TIMESTAMP,
   reviewRequestedTimestamp TIMESTAMP,

diff --git a/...ql/midpoint/3.3/h2/h2-upgrade-3.3-3.4.sql → ...ql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql b/...ql/midpoint/3.3/h2/h2-upgrade-3.3-3.4.sql → ...ql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql
@@ -27,15 +27,16 @@ CREATE TABLE m_acc_cert_case (
   validTo                  TIMESTAMP,
   validityChangeTimestamp  TIMESTAMP,
   validityStatus           INTEGER,
-  currentResponse          INTEGER,
   currentStageNumber       INTEGER,
+  currentStageOutcome      INTEGER,
   fullObject               BLOB,
   objectRef_relation       VARCHAR(157),
   objectRef_targetOid      VARCHAR(36),
   objectRef_type           INTEGER,
   orgRef_relation          VARCHAR(157),
   orgRef_targetOid         VARCHAR(36),
   orgRef_type              INTEGER,
+  overallOutcome           INTEGER,
   remediedTimestamp        TIMESTAMP,
   reviewDeadline           TIMESTAMP,
   reviewRequestedTimestamp TIMESTAMP,

diff --git a/config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT.sql b/config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT.sql
@@ -0,0 +1,2 @@
+ALTER TABLE m_acc_cert_case ADD overallOutcome INTEGER;
+ALTER TABLE m_acc_cert_case ALTER COLUMN currentResponse RENAME TO currentStageOutcome;
diff --git a/config/sql/midpoint/3.3/mysql/mysql-3.4.sql → config/sql/midpoint/3.4/mysql/mysql-3.4.sql b/config/sql/midpoint/3.3/mysql/mysql-3.4.sql → config/sql/midpoint/3.4/mysql/mysql-3.4.sql
@@ -55,15 +55,16 @@ CREATE TABLE m_acc_cert_case (
   validTo                  DATETIME(6),
   validityChangeTimestamp  DATETIME(6),
   validityStatus           INTEGER,
-  currentResponse          INTEGER,
   currentStageNumber       INTEGER,
+  currentStageOutcome      INTEGER,
   fullObject               LONGBLOB,
   objectRef_relation       VARCHAR(157),
   objectRef_targetOid      VARCHAR(36),
   objectRef_type           INTEGER,
   orgRef_relation          VARCHAR(157),
   orgRef_targetOid         VARCHAR(36),
   orgRef_type              INTEGER,
+  overallOutcome           INTEGER,
   remediedTimestamp        DATETIME(6),
   reviewDeadline           DATETIME(6),
   reviewRequestedTimestamp DATETIME(6),

diff --git a/...point/3.3/mysql/mysql-upgrade-3.3-3.4.sql → ...point/3.4/mysql/mysql-upgrade-3.3-3.4.sql b/...point/3.3/mysql/mysql-upgrade-3.3-3.4.sql → ...point/3.4/mysql/mysql-upgrade-3.3-3.4.sql
@@ -29,15 +29,16 @@ CREATE TABLE m_acc_cert_case (
   validTo                  DATETIME(6),
   validityChangeTimestamp  DATETIME(6),
   validityStatus           INTEGER,
-  currentResponse          INTEGER,
   currentStageNumber       INTEGER,
+  currentStageOutcome      INTEGER,
   fullObject               LONGBLOB,
   objectRef_relation       VARCHAR(157),
   objectRef_targetOid      VARCHAR(36),
   objectRef_type           INTEGER,
   orgRef_relation          VARCHAR(157),
   orgRef_targetOid         VARCHAR(36),
   orgRef_type              INTEGER,
+  overallOutcome           INTEGER,
   remediedTimestamp        DATETIME(6),
   reviewDeadline           DATETIME(6),
   reviewRequestedTimestamp DATETIME(6),

diff --git a/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT.sql b/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT.sql
@@ -0,0 +1,2 @@
+ALTER TABLE m_acc_cert_case ADD overallOutcome INTEGER;
+ALTER TABLE m_acc_cert_case CHANGE currentResponse currentStageOutcome INTEGER;