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

Conflicts: gui/admin-gui/src/main/resources/localization/Midpoint.properties
Evolveum · Mar 21, 2016 · 98788a1 · 98788a1
2 parents f946d03 + 283fdb5
commit 98788a1
Show file tree

Hide file tree

Showing 276 changed files with 11,601 additions and 9,830 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -74,8 +74,8 @@
         <jdbc.mysql>5.1.31</jdbc.mysql>
         <wicket.version>7.1.0</wicket.version>
         <groovy.version>2.4.0</groovy.version>
-        <activiti-engine.version>5.17.0</activiti-engine.version>
-        <activiti-spring.version>5.17.0</activiti-spring.version>
+        <activiti-engine.version>5.19.0.2</activiti-engine.version>
+        <activiti-spring.version>5.19.0.2</activiti-spring.version>
         <commons-email.version>1.3</commons-email.version>
         <xmlsec.version>2.0.1</xmlsec.version>
         <connid.version>1.4.3.0-SNAPSHOT</connid.version>
@@ -294,6 +294,11 @@
                 <artifactId>commons-pool</artifactId>
                 <version>1.5.6</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains</groupId>
+                <artifactId>annotations-java5</artifactId>
+                <version>15.0</version>
+            </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>
                 <artifactId>jsr250-api</artifactId>

diff --git a/config/sql/midpoint/3.4/h2/h2-3.4.sql b/config/sql/midpoint/3.4/h2/h2-3.4.sql
@@ -621,6 +621,18 @@ CREATE TABLE m_task (
   taskIdentifier         VARCHAR(255),
   threadStopAction       INTEGER,
   waitingReason          INTEGER,
+  wfEndTimestamp           TIMESTAMP,
+  wfObjectRef_relation     VARCHAR(157),
+  wfObjectRef_targetOid    VARCHAR(36),
+  wfObjectRef_type         INTEGER,
+  wfProcessInstanceId      VARCHAR(255),
+  wfRequesterRef_relation  VARCHAR(157),
+  wfRequesterRef_targetOid VARCHAR(36),
+  wfRequesterRef_type      INTEGER,
+  wfStartTimestamp         TIMESTAMP,
+  wfTargetRef_relation     VARCHAR(157),
+  wfTargetRef_targetOid    VARCHAR(36),
+  wfTargetRef_type         INTEGER,
   oid                    VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
@@ -837,6 +849,18 @@ ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm);
 
 CREATE INDEX iParent ON m_task (parent);
 
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
+
 CREATE INDEX iTriggerTimestamp ON m_trigger (timestampValue);
 
 ALTER TABLE m_user

diff --git a/config/sql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql b/config/sql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql
@@ -1,3 +1,28 @@
+ALTER TABLE m_task ADD wfEndTimestamp           TIMESTAMP;
+ALTER TABLE m_task ADD wfObjectRef_relation     VARCHAR(157);
+ALTER TABLE m_task ADD wfObjectRef_targetOid    VARCHAR(36);
+ALTER TABLE m_task ADD wfObjectRef_type         INTEGER;
+ALTER TABLE m_task ADD wfProcessInstanceId      VARCHAR(255);
+ALTER TABLE m_task ADD wfRequesterRef_relation  VARCHAR(157);
+ALTER TABLE m_task ADD wfRequesterRef_targetOid VARCHAR(36);
+ALTER TABLE m_task ADD wfRequesterRef_type      INTEGER;
+ALTER TABLE m_task ADD wfStartTimestamp         TIMESTAMP;
+ALTER TABLE m_task ADD wfTargetRef_relation     VARCHAR(157);
+ALTER TABLE m_task ADD wfTargetRef_targetOid    VARCHAR(36);
+ALTER TABLE m_task ADD wfTargetRef_type         INTEGER;
+
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
+
 ALTER TABLE m_abstract_role ADD ownerRef_relation VARCHAR(157);
 ALTER TABLE m_abstract_role ADD ownerRef_targetOid VARCHAR(36);
 ALTER TABLE m_abstract_role ADD ownerRef_type INTEGER;

diff --git a/config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-3.sql b/config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-3.sql
@@ -0,0 +1,25 @@
+ALTER TABLE m_task ADD wfEndTimestamp           TIMESTAMP;
+ALTER TABLE m_task ADD wfObjectRef_relation     VARCHAR(157);
+ALTER TABLE m_task ADD wfObjectRef_targetOid    VARCHAR(36);
+ALTER TABLE m_task ADD wfObjectRef_type         INTEGER;
+ALTER TABLE m_task ADD wfProcessInstanceId      VARCHAR(255);
+ALTER TABLE m_task ADD wfRequesterRef_relation  VARCHAR(157);
+ALTER TABLE m_task ADD wfRequesterRef_targetOid VARCHAR(36);
+ALTER TABLE m_task ADD wfRequesterRef_type      INTEGER;
+ALTER TABLE m_task ADD wfStartTimestamp         TIMESTAMP;
+ALTER TABLE m_task ADD wfTargetRef_relation     VARCHAR(157);
+ALTER TABLE m_task ADD wfTargetRef_targetOid    VARCHAR(36);
+ALTER TABLE m_task ADD wfTargetRef_type         INTEGER;
+
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
+
diff --git a/config/sql/midpoint/3.4/mysql/mysql-3.4.sql b/config/sql/midpoint/3.4/mysql/mysql-3.4.sql
@@ -775,6 +775,18 @@ CREATE TABLE m_task (
   taskIdentifier         VARCHAR(255),
   threadStopAction       INTEGER,
   waitingReason          INTEGER,
+  wfEndTimestamp           DATETIME(6),
+  wfObjectRef_relation     VARCHAR(157),
+  wfObjectRef_targetOid    VARCHAR(36),
+  wfObjectRef_type         INTEGER,
+  wfProcessInstanceId      VARCHAR(255),
+  wfRequesterRef_relation  VARCHAR(157),
+  wfRequesterRef_targetOid VARCHAR(36),
+  wfRequesterRef_type      INTEGER,
+  wfStartTimestamp         DATETIME(6),
+  wfTargetRef_relation     VARCHAR(157),
+  wfTargetRef_targetOid    VARCHAR(36),
+  wfTargetRef_type         INTEGER,
   oid                    VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -1017,6 +1029,18 @@ ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm);
 
 CREATE INDEX iParent ON m_task (parent);
 
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
+
 CREATE INDEX iTriggerTimestamp ON m_trigger (timestampValue);
 
 ALTER TABLE m_user

diff --git a/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.3-3.4.sql b/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.3-3.4.sql
@@ -1,3 +1,29 @@
+ALTER TABLE m_task
+ ADD wfEndTimestamp           DATETIME(6),
+ ADD wfObjectRef_relation     VARCHAR(157),
+ ADD wfObjectRef_targetOid    VARCHAR(36),
+ ADD wfObjectRef_type         INTEGER,
+ ADD wfProcessInstanceId      VARCHAR(255),
+ ADD wfRequesterRef_relation  VARCHAR(157),
+ ADD wfRequesterRef_targetOid VARCHAR(36),
+ ADD wfRequesterRef_type      INTEGER,
+ ADD wfStartTimestamp         DATETIME(6),
+ ADD wfTargetRef_relation     VARCHAR(157),
+ ADD wfTargetRef_targetOid    VARCHAR(36),
+ ADD wfTargetRef_type         INTEGER;
+
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
+
 ALTER TABLE m_abstract_role
   ADD ownerRef_relation  VARCHAR(157),
   ADD ownerRef_targetOid VARCHAR(36),

diff --git a/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-3.sql b/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-3.sql
@@ -0,0 +1,25 @@
+ALTER TABLE m_task
+ ADD wfEndTimestamp           DATETIME(6),
+ ADD wfObjectRef_relation     VARCHAR(157),
+ ADD wfObjectRef_targetOid    VARCHAR(36),
+ ADD wfObjectRef_type         INTEGER,
+ ADD wfProcessInstanceId      VARCHAR(255),
+ ADD wfRequesterRef_relation  VARCHAR(157),
+ ADD wfRequesterRef_targetOid VARCHAR(36),
+ ADD wfRequesterRef_type      INTEGER,
+ ADD wfStartTimestamp         DATETIME(6),
+ ADD wfTargetRef_relation     VARCHAR(157),
+ ADD wfTargetRef_targetOid    VARCHAR(36),
+ ADD wfTargetRef_type         INTEGER;
+
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
diff --git a/config/sql/midpoint/3.4/oracle/oracle-3.4.sql b/config/sql/midpoint/3.4/oracle/oracle-3.4.sql
@@ -631,6 +631,18 @@ CREATE TABLE m_task (
   taskIdentifier         VARCHAR2(255 CHAR),
   threadStopAction       NUMBER(10, 0),
   waitingReason          NUMBER(10, 0),
+  wfEndTimestamp           TIMESTAMP,
+  wfObjectRef_relation     VARCHAR2(157 CHAR),
+  wfObjectRef_targetOid    VARCHAR2(36 CHAR),
+  wfObjectRef_type         NUMBER(10, 0),
+  wfProcessInstanceId      VARCHAR2(255 CHAR),
+  wfRequesterRef_relation  VARCHAR2(157 CHAR),
+  wfRequesterRef_targetOid VARCHAR2(36 CHAR),
+  wfRequesterRef_type      NUMBER(10, 0),
+  wfStartTimestamp         TIMESTAMP,
+  wfTargetRef_relation     VARCHAR2(157 CHAR),
+  wfTargetRef_targetOid    VARCHAR2(36 CHAR),
+  wfTargetRef_type         NUMBER(10, 0),
   oid                    VARCHAR2(36 CHAR) NOT NULL,
   PRIMARY KEY (oid)
 ) INITRANS 30;
@@ -847,6 +859,18 @@ ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm) INITRANS 30;
 
 CREATE INDEX iParent ON m_task (parent) INITRANS 30;
 
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId) INITRANS 30;
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp) INITRANS 30;
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp) INITRANS 30;
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid) INITRANS 30;
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid) INITRANS 30;
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid) INITRANS 30;
+
 CREATE INDEX iTriggerTimestamp ON m_trigger (timestampValue) INITRANS 30;
 
 ALTER TABLE m_user

diff --git a/config/sql/midpoint/3.4/oracle/oracle-upgrade-3.3-3.4.sql b/config/sql/midpoint/3.4/oracle/oracle-upgrade-3.3-3.4.sql
@@ -1,3 +1,30 @@
+ALTER TABLE m_task ADD (
+  wfEndTimestamp           TIMESTAMP,
+  wfObjectRef_relation     VARCHAR2(157 CHAR),
+  wfObjectRef_targetOid    VARCHAR2(36 CHAR),
+  wfObjectRef_type         NUMBER(10, 0),
+  wfProcessInstanceId      VARCHAR2(255 CHAR),
+  wfRequesterRef_relation  VARCHAR2(157 CHAR),
+  wfRequesterRef_targetOid VARCHAR2(36 CHAR),
+  wfRequesterRef_type      NUMBER(10, 0),
+  wfStartTimestamp         TIMESTAMP,
+  wfTargetRef_relation     VARCHAR2(157 CHAR),
+  wfTargetRef_targetOid    VARCHAR2(36 CHAR),
+  wfTargetRef_type         NUMBER(10, 0)
+);
+
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId) INITRANS 30;
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp) INITRANS 30;
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp) INITRANS 30;
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid) INITRANS 30;
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid) INITRANS 30;
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid) INITRANS 30;
+
 ALTER TABLE m_abstract_role ADD (
   ownerRef_relation  VARCHAR2(157 CHAR),
   ownerRef_targetOid VARCHAR2(36 CHAR),

diff --git a/config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-3.sql b/config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-3.sql
@@ -0,0 +1,26 @@
+ALTER TABLE m_task ADD (
+  wfEndTimestamp           TIMESTAMP,
+  wfObjectRef_relation     VARCHAR2(157 CHAR),
+  wfObjectRef_targetOid    VARCHAR2(36 CHAR),
+  wfObjectRef_type         NUMBER(10, 0),
+  wfProcessInstanceId      VARCHAR2(255 CHAR),
+  wfRequesterRef_relation  VARCHAR2(157 CHAR),
+  wfRequesterRef_targetOid VARCHAR2(36 CHAR),
+  wfRequesterRef_type      NUMBER(10, 0),
+  wfStartTimestamp         TIMESTAMP,
+  wfTargetRef_relation     VARCHAR2(157 CHAR),
+  wfTargetRef_targetOid    VARCHAR2(36 CHAR),
+  wfTargetRef_type         NUMBER(10, 0)
+);
+
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId) INITRANS 30;
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp) INITRANS 30;
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp) INITRANS 30;
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid) INITRANS 30;
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid) INITRANS 30;
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid) INITRANS 30;
diff --git a/config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql b/config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql
@@ -621,6 +621,18 @@ CREATE TABLE m_task (
   taskIdentifier         VARCHAR(255),
   threadStopAction       INT4,
   waitingReason          INT4,
+  wfEndTimestamp           TIMESTAMP,
+  wfObjectRef_relation     VARCHAR(157),
+  wfObjectRef_targetOid    VARCHAR(36),
+  wfObjectRef_type         INT4,
+  wfProcessInstanceId      VARCHAR(255),
+  wfRequesterRef_relation  VARCHAR(157),
+  wfRequesterRef_targetOid VARCHAR(36),
+  wfRequesterRef_type      INT4,
+  wfStartTimestamp         TIMESTAMP,
+  wfTargetRef_relation     VARCHAR(157),
+  wfTargetRef_targetOid    VARCHAR(36),
+  wfTargetRef_type         INT4,
   oid                    VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
@@ -837,6 +849,18 @@ ADD CONSTRAINT uc_system_configuration_name UNIQUE (name_norm);
 
 CREATE INDEX iParent ON m_task (parent);
 
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
+
 CREATE INDEX iTriggerTimestamp ON m_trigger (timestampValue);
 
 ALTER TABLE m_user

diff --git a/config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.3-3.4.sql b/config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.3-3.4.sql
@@ -1,3 +1,29 @@
+ALTER TABLE m_task
+ ADD wfEndTimestamp           TIMESTAMP,
+ ADD wfObjectRef_relation     VARCHAR(157),
+ ADD wfObjectRef_targetOid    VARCHAR(36),
+ ADD wfObjectRef_type         INT4,
+ ADD wfProcessInstanceId      VARCHAR(255),
+ ADD wfRequesterRef_relation  VARCHAR(157),
+ ADD wfRequesterRef_targetOid VARCHAR(36),
+ ADD wfRequesterRef_type      INT4,
+ ADD wfStartTimestamp         TIMESTAMP,
+ ADD wfTargetRef_relation     VARCHAR(157),
+ ADD wfTargetRef_targetOid    VARCHAR(36),
+ ADD wfTargetRef_type         INT4;
+
+CREATE INDEX iTaskWfProcessInstanceId ON m_task (wfProcessInstanceId);
+
+CREATE INDEX iTaskWfStartTimestamp ON m_task (wfStartTimestamp);
+
+CREATE INDEX iTaskWfEndTimestamp ON m_task (wfEndTimestamp);
+
+CREATE INDEX iTaskWfRequesterOid ON m_task (wfRequesterRef_targetOid);
+
+CREATE INDEX iTaskWfObjectOid ON m_task (wfObjectRef_targetOid);
+
+CREATE INDEX iTaskWfTargetOid ON m_task (wfTargetRef_targetOid);
+
 ALTER TABLE m_abstract_role
   ADD ownerRef_relation VARCHAR(157),
   ADD ownerRef_targetOid VARCHAR(36),