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

Evolveum · Feb 17, 2017 · 7e15409 · 7e15409
2 parents a346dd7 + d49d1f4
commit 7e15409
Show file tree

Hide file tree

Showing 310 changed files with 10,472 additions and 3,772 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -160,11 +160,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.wicketstuff</groupId>
-                <artifactId>wicketstuff-serializer-fast2</artifactId>
-                <version>${wicket.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-email</artifactId>
@@ -1156,7 +1151,7 @@
 	        <dependency>
 	            <groupId>org.webjars.bower</groupId>
 	            <artifactId>adminlte</artifactId>
-	            <version>2.3.0</version>
+	            <version>2.3.11</version>
 	        </dependency>
 	        <dependency>
 	            <groupId>org.webjars</groupId>
@@ -1171,12 +1166,12 @@
 	        <dependency>
 	            <groupId>org.webjars</groupId>
 	            <artifactId>font-awesome</artifactId>
-	            <version>4.3.0-2</version>
+	            <version>4.7.0</version>
 	        </dependency>
 	        <dependency>
-	            <groupId>org.webjars</groupId>
+	            <groupId>org.webjars.npm</groupId>
 	            <artifactId>ionicons</artifactId>
-	            <version>2.0.1</version>
+	            <version>3.0.0</version>
 	        </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/config/sql/midpoint/3.6/h2/h2-3.6.sql b/config/sql/midpoint/3.6/h2/h2-3.6.sql
@@ -295,6 +295,25 @@ CREATE TABLE m_audit_item (
   PRIMARY KEY (changedItemPath, record_id)
 );
 
+CREATE TABLE m_audit_prop_value (
+  id        BIGINT NOT NULL,
+  name      VARCHAR(255),
+  record_id BIGINT,
+  value     VARCHAR(1024),
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE m_audit_ref_value (
+  id              BIGINT NOT NULL,
+  name            VARCHAR(255),
+  oid             VARCHAR(255),
+  record_id       BIGINT,
+  targetName_norm VARCHAR(255),
+  targetName_orig VARCHAR(255),
+  type            VARCHAR(255),
+  PRIMARY KEY (id)
+);
+
 CREATE TABLE m_connector (
   connectorBundle            VARCHAR(255),
   connectorHostRef_relation  VARCHAR(157),
@@ -802,6 +821,12 @@ CREATE INDEX iTimestampValue ON m_audit_event (timestampValue);
 
 CREATE INDEX iChangedItemPath ON m_audit_item (changedItemPath);
 
+CREATE INDEX iAuditPropValRecordId
+  ON m_audit_prop_value (record_id);
+
+CREATE INDEX iAuditRefValRecordId
+  ON m_audit_ref_value (record_id);
+
 ALTER TABLE m_connector_host
 ADD CONSTRAINT uc_connector_host_name UNIQUE (name_norm);
 
@@ -1015,6 +1040,16 @@ ALTER TABLE m_audit_item
 FOREIGN KEY (record_id)
 REFERENCES m_audit_event;
 
+ALTER TABLE m_audit_prop_value
+  ADD CONSTRAINT fk_audit_prop_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
+ALTER TABLE m_audit_ref_value
+  ADD CONSTRAINT fk_audit_ref_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
 ALTER TABLE m_connector
 ADD CONSTRAINT fk_connector
 FOREIGN KEY (oid)

diff --git a/config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
@@ -13,3 +13,38 @@ ALTER TABLE m_form
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+CREATE TABLE m_audit_prop_value (
+  id        BIGINT NOT NULL,
+  name      VARCHAR(255),
+  record_id BIGINT,
+  value     VARCHAR(1024),
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE m_audit_ref_value (
+  id              BIGINT NOT NULL,
+  name            VARCHAR(255),
+  oid             VARCHAR(255),
+  record_id       BIGINT,
+  targetName_norm VARCHAR(255),
+  targetName_orig VARCHAR(255),
+  type            VARCHAR(255),
+  PRIMARY KEY (id)
+);
+
+CREATE INDEX iAuditPropValRecordId
+  ON m_audit_prop_value (record_id);
+
+CREATE INDEX iAuditRefValRecordId
+  ON m_audit_ref_value (record_id);
+
+ALTER TABLE m_audit_prop_value
+  ADD CONSTRAINT fk_audit_prop_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
+ALTER TABLE m_audit_ref_value
+  ADD CONSTRAINT fk_audit_ref_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
diff --git a/config/sql/midpoint/3.6/mysql/mysql-3.6.sql b/config/sql/midpoint/3.6/mysql/mysql-3.6.sql
@@ -365,6 +365,31 @@ CREATE TABLE m_audit_item (
   COLLATE utf8_bin
   ENGINE = InnoDB;
 
+CREATE TABLE m_audit_prop_value (
+  id        BIGINT NOT NULL,
+  name      VARCHAR(255),
+  record_id BIGINT,
+  value     VARCHAR(1024),
+  PRIMARY KEY (id)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
+CREATE TABLE m_audit_ref_value (
+  id              BIGINT NOT NULL,
+  name            VARCHAR(255),
+  oid             VARCHAR(255),
+  record_id       BIGINT,
+  targetName_norm VARCHAR(255),
+  targetName_orig VARCHAR(255),
+  type            VARCHAR(255),
+  PRIMARY KEY (id)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
 CREATE TABLE m_connector (
   connectorBundle            VARCHAR(255),
   connectorHostRef_relation  VARCHAR(157),
@@ -998,6 +1023,12 @@ CREATE INDEX iTimestampValue ON m_audit_event (timestampValue);
 
 CREATE INDEX iChangedItemPath ON m_audit_item (changedItemPath);
 
+CREATE INDEX iAuditPropValRecordId
+  ON m_audit_prop_value (record_id);
+
+CREATE INDEX iAuditRefValRecordId
+  ON m_audit_ref_value (record_id);
+
 ALTER TABLE m_connector_host
 ADD CONSTRAINT uc_connector_host_name UNIQUE (name_norm);
 
@@ -1213,6 +1244,16 @@ ALTER TABLE m_audit_item
 FOREIGN KEY (record_id)
 REFERENCES m_audit_event (id);
 
+ALTER TABLE m_audit_prop_value
+  ADD CONSTRAINT fk_audit_prop_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event (id);
+
+ALTER TABLE m_audit_ref_value
+  ADD CONSTRAINT fk_audit_ref_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event (id);
+
 ALTER TABLE m_connector
 ADD CONSTRAINT fk_connector
 FOREIGN KEY (oid)

diff --git a/config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
@@ -15,3 +15,45 @@ ALTER TABLE m_form
   ADD CONSTRAINT fk_form
 FOREIGN KEY (oid)
 REFERENCES m_object (oid);
+
+CREATE TABLE m_audit_prop_value (
+  id        BIGINT NOT NULL,
+  name      VARCHAR(255),
+  record_id BIGINT,
+  value     VARCHAR(1024),
+  PRIMARY KEY (id)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
+CREATE TABLE m_audit_ref_value (
+  id              BIGINT NOT NULL,
+  name            VARCHAR(255),
+  oid             VARCHAR(255),
+  record_id       BIGINT,
+  targetName_norm VARCHAR(255),
+  targetName_orig VARCHAR(255),
+  type            VARCHAR(255),
+  PRIMARY KEY (id)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
+CREATE INDEX iAuditPropValRecordId
+  ON m_audit_prop_value (record_id);
+
+CREATE INDEX iAuditRefValRecordId
+  ON m_audit_ref_value (record_id);
+
+ALTER TABLE m_audit_prop_value
+  ADD CONSTRAINT fk_audit_prop_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event (id);
+
+ALTER TABLE m_audit_ref_value
+  ADD CONSTRAINT fk_audit_ref_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event (id);
+
diff --git a/config/sql/midpoint/3.6/oracle/oracle-3.6.sql b/config/sql/midpoint/3.6/oracle/oracle-3.6.sql
@@ -298,6 +298,25 @@ CREATE TABLE m_audit_item (
   PRIMARY KEY (changedItemPath, record_id)
 ) INITRANS 30;
 
+CREATE TABLE m_audit_prop_value (
+  id        NUMBER(19, 0) NOT NULL,
+  name      VARCHAR2(255 CHAR),
+  record_id NUMBER(19, 0),
+  value     VARCHAR2(1024 CHAR),
+  PRIMARY KEY (id)
+) INITRANS 30;
+
+CREATE TABLE m_audit_ref_value (
+  id              NUMBER(19, 0) NOT NULL,
+  name            VARCHAR2(255 CHAR),
+  oid             VARCHAR2(255 CHAR),
+  record_id       NUMBER(19, 0),
+  targetName_norm VARCHAR2(255 CHAR),
+  targetName_orig VARCHAR2(255 CHAR),
+  type            VARCHAR2(255 CHAR),
+  PRIMARY KEY (id)
+) INITRANS 30;
+
 CREATE TABLE m_connector (
   connectorBundle            VARCHAR2(255 CHAR),
   connectorHostRef_relation  VARCHAR2(157 CHAR),
@@ -812,6 +831,12 @@ CREATE INDEX iTimestampValue ON m_audit_event (timestampValue) INITRANS 30;
 
 CREATE INDEX iChangedItemPath ON m_audit_item (changedItemPath) INITRANS 30;
 
+CREATE INDEX iAuditPropValRecordId
+  ON m_audit_prop_value (record_id) INITRANS 30;
+
+CREATE INDEX iAuditRefValRecordId
+  ON m_audit_ref_value (record_id) INITRANS 30;
+
 ALTER TABLE m_connector_host
 ADD CONSTRAINT uc_connector_host_name UNIQUE (name_norm) INITRANS 30;
 
@@ -1025,6 +1050,16 @@ ALTER TABLE m_audit_item
 FOREIGN KEY (record_id)
 REFERENCES m_audit_event;
 
+ALTER TABLE m_audit_prop_value
+  ADD CONSTRAINT fk_audit_prop_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
+ALTER TABLE m_audit_ref_value
+  ADD CONSTRAINT fk_audit_ref_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
 ALTER TABLE m_connector
 ADD CONSTRAINT fk_connector
 FOREIGN KEY (oid)

diff --git a/config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
@@ -13,3 +13,38 @@ ALTER TABLE m_form
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+CREATE TABLE m_audit_prop_value (
+  id        NUMBER(19, 0) NOT NULL,
+  name      VARCHAR2(255 CHAR),
+  record_id NUMBER(19, 0),
+  value     VARCHAR2(1024 CHAR),
+  PRIMARY KEY (id)
+) INITRANS 30;
+
+CREATE TABLE m_audit_ref_value (
+  id              NUMBER(19, 0) NOT NULL,
+  name            VARCHAR2(255 CHAR),
+  oid             VARCHAR2(255 CHAR),
+  record_id       NUMBER(19, 0),
+  targetName_norm VARCHAR2(255 CHAR),
+  targetName_orig VARCHAR2(255 CHAR),
+  type            VARCHAR2(255 CHAR),
+  PRIMARY KEY (id)
+) INITRANS 30;
+
+CREATE INDEX iAuditPropValRecordId
+  ON m_audit_prop_value (record_id) INITRANS 30;
+
+CREATE INDEX iAuditRefValRecordId
+  ON m_audit_ref_value (record_id) INITRANS 30;
+
+
+ALTER TABLE m_audit_prop_value
+  ADD CONSTRAINT fk_audit_prop_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
+ALTER TABLE m_audit_ref_value
+  ADD CONSTRAINT fk_audit_ref_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
diff --git a/config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql b/config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
@@ -295,6 +295,25 @@ CREATE TABLE m_audit_item (
   PRIMARY KEY (changedItemPath, record_id)
 );
 
+CREATE TABLE m_audit_prop_value (
+  id        INT8 NOT NULL,
+  name      VARCHAR(255),
+  record_id INT8,
+  value     VARCHAR(1024),
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE m_audit_ref_value (
+  id              INT8 NOT NULL,
+  name            VARCHAR(255),
+  oid             VARCHAR(255),
+  record_id       INT8,
+  targetName_norm VARCHAR(255),
+  targetName_orig VARCHAR(255),
+  type            VARCHAR(255),
+  PRIMARY KEY (id)
+);
+
 CREATE TABLE m_connector (
   connectorBundle            VARCHAR(255),
   connectorHostRef_relation  VARCHAR(157),
@@ -802,6 +821,12 @@ CREATE INDEX iTimestampValue ON m_audit_event (timestampValue);
 
 CREATE INDEX iChangedItemPath ON m_audit_item (changedItemPath);
 
+CREATE INDEX iAuditPropValRecordId
+  ON m_audit_prop_value (record_id);
+
+CREATE INDEX iAuditRefValRecordId
+  ON m_audit_ref_value (record_id);
+
 ALTER TABLE m_connector_host
 ADD CONSTRAINT uc_connector_host_name UNIQUE (name_norm);
 
@@ -1015,6 +1040,16 @@ ALTER TABLE m_audit_item
 FOREIGN KEY (record_id)
 REFERENCES m_audit_event;
 
+ALTER TABLE m_audit_prop_value
+  ADD CONSTRAINT fk_audit_prop_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
+ALTER TABLE m_audit_ref_value
+  ADD CONSTRAINT fk_audit_ref_value
+FOREIGN KEY (record_id)
+REFERENCES m_audit_event;
+
 ALTER TABLE m_connector
 ADD CONSTRAINT fk_connector
 FOREIGN KEY (oid)