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

.travis.yml

@@ -7,7 +7,8 @@ install: true
 
 # custom script is used so build and tests are done in one mvn command, separating it (as Travis does by default) leads to problem with ConnId (notably DummyResource)
 # travis_wait is used for integration tests workround as default Travis settings kills build if no message is printed to stdout for 10 mins
-script: travis_wait 120 mvn clean install
+#script: travis_wait 120 mvn clean install
+script: mvn clean install
 
 addons:
   hostname: localhost # workaround for short hostname

build-system/pom.xml

@@ -67,6 +67,7 @@
         <spring.security.version>4.0.4.RELEASE</spring.security.version>
         <testng.version>6.8.8</testng.version>
         <xml.resolver.version>1.2</xml.resolver.version>
+        <xmlunit.version>2.1.1</xmlunit.version>
         <cron4j.version>2.2.3</cron4j.version>
         <hibernate.version>4.3.8.Final</hibernate.version>
         <h2.version>1.3.171</h2.version>
@@ -753,6 +754,16 @@
                 <artifactId>testng</artifactId>
                 <version>${testng.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.xmlunit</groupId>
+                <artifactId>xmlunit-core</artifactId>
+                <version>${xmlunit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.xmlunit</groupId>
+                <artifactId>xmlunit-legacy</artifactId>
+                <version>${xmlunit.version}</version>
+            </dependency>
             <dependency>
                 <groupId>xml-resolver</groupId>
                 <artifactId>xml-resolver</artifactId>

config/sql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql

@@ -1,3 +1,28 @@
+CREATE TABLE m_service (
+  displayOrder  INTEGER,
+  locality_norm VARCHAR(255),
+  locality_orig VARCHAR(255),
+  name_norm     VARCHAR(255),
+  name_orig     VARCHAR(255),
+  oid           VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+CREATE TABLE m_service_type (
+  service_oid VARCHAR(36) NOT NULL,
+  serviceType VARCHAR(255)
+);
+
+ALTER TABLE m_service
+  ADD CONSTRAINT fk_service
+FOREIGN KEY (oid)
+REFERENCES m_abstract_role;
+
+ALTER TABLE m_service_type
+  ADD CONSTRAINT fk_service_type
+FOREIGN KEY (service_oid)
+REFERENCES m_service;
+
 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);

config/sql/midpoint/3.4/mysql/mysql-upgrade-3.3-3.4.sql

@@ -1,3 +1,34 @@
+CREATE TABLE m_service (
+  displayOrder  INTEGER,
+  locality_norm VARCHAR(255),
+  locality_orig VARCHAR(255),
+  name_norm     VARCHAR(255),
+  name_orig     VARCHAR(255),
+  oid           VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
+CREATE TABLE m_service_type (
+  service_oid VARCHAR(36) NOT NULL,
+  serviceType VARCHAR(255)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
+ALTER TABLE m_service
+  ADD CONSTRAINT fk_service
+FOREIGN KEY (oid)
+REFERENCES m_abstract_role (oid);
+
+ALTER TABLE m_service_type
+  ADD CONSTRAINT fk_service_type
+FOREIGN KEY (service_oid)
+REFERENCES m_service (oid);
+
 ALTER TABLE m_task
  ADD wfEndTimestamp           DATETIME(6),
  ADD wfObjectRef_relation     VARCHAR(157),

config/sql/midpoint/3.4/oracle/oracle-upgrade-3.3-3.4.sql

@@ -1,3 +1,28 @@
+CREATE TABLE m_service (
+  displayOrder  NUMBER(10, 0),
+  locality_norm VARCHAR2(255 CHAR),
+  locality_orig VARCHAR2(255 CHAR),
+  name_norm     VARCHAR2(255 CHAR),
+  name_orig     VARCHAR2(255 CHAR),
+  oid           VARCHAR2(36 CHAR) NOT NULL,
+  PRIMARY KEY (oid)
+) INITRANS 30;
+
+CREATE TABLE m_service_type (
+  service_oid VARCHAR2(36 CHAR) NOT NULL,
+  serviceType VARCHAR2(255 CHAR)
+) INITRANS 30;
+
+ALTER TABLE m_service
+  ADD CONSTRAINT fk_service
+FOREIGN KEY (oid)
+REFERENCES m_abstract_role;
+
+ALTER TABLE m_service_type
+  ADD CONSTRAINT fk_service_type
+FOREIGN KEY (service_oid)
+REFERENCES m_service;
+
 ALTER TABLE m_task ADD (
   wfEndTimestamp           TIMESTAMP,
   wfObjectRef_relation     VARCHAR2(157 CHAR),

config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.3-3.4.sql

@@ -1,3 +1,28 @@
+CREATE TABLE m_service (
+  displayOrder  INT4,
+  locality_norm VARCHAR(255),
+  locality_orig VARCHAR(255),
+  name_norm     VARCHAR(255),
+  name_orig     VARCHAR(255),
+  oid           VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+CREATE TABLE m_service_type (
+  service_oid VARCHAR(36) NOT NULL,
+  serviceType VARCHAR(255)
+);
+
+ALTER TABLE m_service
+  ADD CONSTRAINT fk_service
+FOREIGN KEY (oid)
+REFERENCES m_abstract_role;
+
+ALTER TABLE m_service_type
+  ADD CONSTRAINT fk_service_type
+FOREIGN KEY (service_oid)
+REFERENCES m_service;
+
 ALTER TABLE m_task
  ADD wfEndTimestamp           TIMESTAMP,
  ADD wfObjectRef_relation     VARCHAR(157),

config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.3-3.4.sql

@@ -1,3 +1,28 @@
+CREATE TABLE m_service (
+  displayOrder  INT,
+  locality_norm NVARCHAR(255) COLLATE database_default,
+  locality_orig NVARCHAR(255) COLLATE database_default,
+  name_norm     NVARCHAR(255) COLLATE database_default,
+  name_orig     NVARCHAR(255) COLLATE database_default,
+  oid           NVARCHAR(36) COLLATE database_default NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+CREATE TABLE m_service_type (
+  service_oid NVARCHAR(36) COLLATE database_default NOT NULL,
+  serviceType NVARCHAR(255) COLLATE database_default
+);
+
+ALTER TABLE m_service
+  ADD CONSTRAINT fk_service
+FOREIGN KEY (oid)
+REFERENCES m_abstract_role;
+
+ALTER TABLE m_service_type
+  ADD CONSTRAINT fk_service_type
+FOREIGN KEY (service_oid)
+REFERENCES m_service;
+
 ALTER TABLE m_task ADD
   wfEndTimestamp           DATETIME2,
   wfObjectRef_relation     NVARCHAR(157) COLLATE database_default,