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

Evolveum · Mar 10, 2016 · 2669bfd · 2669bfd
2 parents 161f98e + d344356
commit 2669bfd
Show file tree

Hide file tree

Showing 226 changed files with 11,777 additions and 1,805 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,2 +1,2 @@
 language: java
-script: "mvn verify"
+script: "travis_wait 70 mvn clean install"
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -41,6 +41,10 @@
         <ansi.color>true</ansi.color>
         <verbose.jaxb2>false</verbose.jaxb2>
         <verbose.jaxws>false</verbose.jaxws>
+
+        <git.describe>${describe}</git.describe>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>EEE, d MMM yyyy HH:mm:ss Z</maven.build.timestamp.format>
         <!-- Dependencies global versions -->
         <aspectj.version>1.7.3</aspectj.version>
         <commons.io.version>2.0.1</commons.io.version>
@@ -1017,7 +1021,7 @@
                             <archive>
                                 <manifestEntries>
                                     <Version-Number>${project.version}</Version-Number>
-                                    <SCM-Revision>${describe}</SCM-Revision>
+                                    <SCM-Revision>${git.describe}</SCM-Revision>
                                     <Organization>Evolveum</Organization>
                                     <Organization-URL>http://www.evolveum.com</Organization-URL>
                                     <Bugtracking-System>http://jira.evolveum.com</Bugtracking-System>
@@ -1035,7 +1039,7 @@
                             <archive>
                                 <manifestEntries>
                                     <Version-Number>${project.version}</Version-Number>
-                                    <SCM-Revision>${describe}</SCM-Revision>
+                                    <SCM-Revision>${git.describe}</SCM-Revision>
                                     <Organization>Evolveum</Organization>
                                     <Organization-URL>http://www.evolveum.com</Organization-URL>
                                     <Bugtracking-System>http://jira.evolveum.com</Bugtracking-System>

diff --git a/config/sql/midpoint/3.4/h2/h2-3.4.sql b/config/sql/midpoint/3.4/h2/h2-3.4.sql
@@ -1,7 +1,10 @@
 CREATE TABLE m_abstract_role (
-  approvalProcess VARCHAR(255),
-  requestable     BOOLEAN,
-  oid             VARCHAR(36) NOT NULL,
+  approvalProcess    VARCHAR(255),
+  ownerRef_relation  VARCHAR(157),
+  ownerRef_targetOid VARCHAR(36),
+  ownerRef_type      INTEGER,
+  requestable        BOOLEAN,
+  oid                VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
 

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,7 @@
+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;
+
 ALTER TABLE m_acc_cert_campaign ADD endTimestamp TIMESTAMP;
 ALTER TABLE m_acc_cert_campaign ADD handlerUri VARCHAR(255);
 ALTER TABLE m_acc_cert_campaign ADD ownerRef_relation VARCHAR(157);

diff --git a/config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-2.sql b/config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-2.sql
@@ -0,0 +1,4 @@
+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/mysql/mysql-3.4.sql b/config/sql/midpoint/3.4/mysql/mysql-3.4.sql
@@ -12,9 +12,12 @@
 # remove iAncestor and iDescendant index, they are the same as FK for that fields
 
 CREATE TABLE m_abstract_role (
-  approvalProcess VARCHAR(255),
-  requestable     BIT,
-  oid             VARCHAR(36) NOT NULL,
+  approvalProcess    VARCHAR(255),
+  ownerRef_relation  VARCHAR(157),
+  ownerRef_targetOid VARCHAR(36),
+  ownerRef_type      INTEGER,
+  requestable        BIT,
+  oid                VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 )
   DEFAULT CHARACTER SET utf8

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,8 @@
+ALTER TABLE m_abstract_role
+  ADD ownerRef_relation  VARCHAR(157),
+  ADD ownerRef_targetOid VARCHAR(36),
+  ADD ownerRef_type      INTEGER;
+
 ALTER TABLE m_acc_cert_campaign
 ADD endTimestamp DATETIME(6),
 ADD handlerUri VARCHAR(255),

diff --git a/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-2.sql b/config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-2.sql
@@ -0,0 +1,5 @@
+ALTER TABLE m_abstract_role
+  ADD ownerRef_relation  VARCHAR(157),
+  ADD ownerRef_targetOid VARCHAR(36),
+  ADD ownerRef_type      INTEGER;
+
diff --git a/config/sql/midpoint/3.4/oracle/oracle-3.4.sql b/config/sql/midpoint/3.4/oracle/oracle-3.4.sql
@@ -2,9 +2,12 @@
 -- replace ");" with ") INITRANS 30;"
 
 CREATE TABLE m_abstract_role (
-  approvalProcess VARCHAR2(255 CHAR),
-  requestable     NUMBER(1, 0),
-  oid             VARCHAR2(36 CHAR) NOT NULL,
+  approvalProcess    VARCHAR2(255 CHAR),
+  ownerRef_relation  VARCHAR2(157 CHAR),
+  ownerRef_targetOid VARCHAR2(36 CHAR),
+  ownerRef_type      NUMBER(10, 0),
+  requestable        NUMBER(1, 0),
+  oid                VARCHAR2(36 CHAR) NOT NULL,
   PRIMARY KEY (oid)
 ) INITRANS 30;
 

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,9 @@
+ALTER TABLE m_abstract_role ADD (
+  ownerRef_relation  VARCHAR2(157 CHAR),
+  ownerRef_targetOid VARCHAR2(36 CHAR),
+  ownerRef_type      NUMBER(10, 0)
+);
+
 ALTER TABLE m_acc_cert_campaign ADD (
 endTimestamp TIMESTAMP,
 handlerUri VARCHAR2(255 CHAR),

diff --git a/config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-2.sql b/config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-2.sql
@@ -0,0 +1,6 @@
+ALTER TABLE m_abstract_role ADD (
+  ownerRef_relation  VARCHAR2(157 CHAR),
+  ownerRef_targetOid VARCHAR2(36 CHAR),
+  ownerRef_type      NUMBER(10, 0)
+);
+
diff --git a/config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql b/config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql
@@ -1,7 +1,10 @@
 CREATE TABLE m_abstract_role (
-  approvalProcess VARCHAR(255),
-  requestable     BOOLEAN,
-  oid             VARCHAR(36) NOT NULL,
+  approvalProcess    VARCHAR(255),
+  ownerRef_relation  VARCHAR(157),
+  ownerRef_targetOid VARCHAR(36),
+  ownerRef_type      INT4,
+  requestable        BOOLEAN,
+  oid                VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 );
 

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,8 @@
+ALTER TABLE m_abstract_role
+  ADD ownerRef_relation VARCHAR(157),
+  ADD ownerRef_targetOid VARCHAR(36),
+  ADD ownerRef_type INT4;
+
 ALTER TABLE m_acc_cert_campaign
 ADD endTimestamp TIMESTAMP,
 ADD handlerUri VARCHAR(255),

diff --git a/config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-2.sql b/config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-2.sql
@@ -0,0 +1,5 @@
+ALTER TABLE m_abstract_role 
+  ADD ownerRef_relation VARCHAR(157),
+  ADD ownerRef_targetOid VARCHAR(36),
+  ADD ownerRef_type INT4;
+
diff --git a/config/sql/midpoint/3.4/sqlserver/sqlserver-3.4.sql b/config/sql/midpoint/3.4/sqlserver/sqlserver-3.4.sql
@@ -1,7 +1,10 @@
 CREATE TABLE m_abstract_role (
-  approvalProcess NVARCHAR(255) COLLATE database_default,
-  requestable     BIT,
-  oid             NVARCHAR(36) COLLATE database_default NOT NULL,
+  approvalProcess    NVARCHAR(255) COLLATE database_default,
+  ownerRef_relation  NVARCHAR(157) COLLATE database_default,
+  ownerRef_targetOid NVARCHAR(36) COLLATE database_default,
+  ownerRef_type      INT,
+  requestable        BIT,
+  oid                NVARCHAR(36) COLLATE database_default NOT NULL,
   PRIMARY KEY (oid)
 );
 

diff --git a/config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.3-3.4.sql b/config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.3-3.4.sql
@@ -1,3 +1,8 @@
+ALTER TABLE m_abstract_role ADD
+  ownerRef_relation  NVARCHAR(157) COLLATE database_default,
+  ownerRef_targetOid NVARCHAR(36) COLLATE database_default,
+  ownerRef_type      INT;
+
 ALTER TABLE m_acc_cert_campaign ADD
 endTimestamp            DATETIME2,
 handlerUri              NVARCHAR(255) COLLATE database_default,

diff --git a/config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-2.sql b/config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-2.sql
@@ -0,0 +1,5 @@
+ALTER TABLE m_abstract_role ADD
+  ownerRef_relation  NVARCHAR(157) COLLATE database_default,
+  ownerRef_targetOid NVARCHAR(36) COLLATE database_default,
+  ownerRef_type      INT;
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -130,21 +130,20 @@
                 <div class="navbar-title" wicket:id="pageTitleContainer">
 	                <span class="page-title" wicket:id="pageTitle">
 	                    <span wicket:id="pageTitleReal"></span>
-	                    <small wicket:id="pageSubtitle"></small>
-	                    <img id="ajax_busy" src="img/ajax-loader.gif"/>
 	                </span>
-	                <ol class="breadcrumb">
-	                    <li wicket:id="breadcrumb">
-	                        <a wicket:id="bcLink">
-	                            <i wicket:id="bcIcon"></i>&nbsp;
-	                            <span wicket:id="bcName"/>
-	                        </a>
-	                    </li>
-	                </ol>
+                    <img id="ajax_busy" src="img/ajax-loader.gif"/>
 	            </div>
 
                 <!-- Navbar Right Menu -->
                 <div class="navbar-custom-menu">
+                    <ol class="breadcrumb">
+                        <li wicket:id="breadcrumb">
+                            <a wicket:id="bcLink">
+                                <i wicket:id="bcIcon"></i>&nbsp;
+                                <span wicket:id="bcName"/>
+                            </a>
+                        </li>
+                    </ol>
                     <ul class="nav navbar-nav">
                         <!-- User Account: style can be found in dropdown.less -->
                         <li class="dropdown user user-menu" wicket:id="rightMenu"/>
@@ -165,24 +164,6 @@
             </aside>
         </wicket:enclosure>
         <div class="content-wrapper" style="min-height: 916px;">
-
-            <!-- Content Header (Page header) -->
-<!--             <section class="content-header" wicket:id="pageTitleContainer">
-                <h1 wicket:id="pageTitle">
-                    <span wicket:id="pageTitleReal"></span>
-                    <small wicket:id="pageSubtitle"></small>
-                    <img id="ajax_busy" src="img/ajax-loader.gif"/>
-                </h1>
-                <ol class="breadcrumb">
-                    <li wicket:id="breadcrumb">
-                        <a wicket:id="bcLink">
-                            <i wicket:id="bcIcon"></i>&nbsp;
-                            <span wicket:id="bcName"/>
-                        </a>
-                    </li>
-                </ol>
-            </section> -->
-
             <!-- Main content -->
             <section class="content">
                 <div wicket:id="feedbackContainer" class="feedbackContainer">