Merge branch 'master' into CAS-auth

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+
+[midpoint.admin-gui]
+file_filter = gui/admin-gui/src/main/resources/localization/Midpoint_<lang>.properties
+source_file = gui/admin-gui/src/main/resources/localization/Midpoint.properties
+source_lang = en
+type = UNICODEPROPERTIES
+

build-system/pom.xml

@@ -68,7 +68,7 @@
         <h2.version>1.3.171</h2.version>
         <jdbc.postgres>9.3-1102-jdbc41</jdbc.postgres>
         <jdbc.mysql>5.1.31</jdbc.mysql>
-        <wicket.version>6.17.0</wicket.version>
+        <wicket.version>6.20.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>

config/sql/_all/h2-upgrade-3.2-3.3.sql

@@ -0,0 +1,40 @@
+create table m_sequence (
+    name_norm varchar(255),
+    name_orig varchar(255),
+    oid varchar(36) not null,
+    primary key (oid)
+);
+
+alter table m_sequence
+    add constraint uc_sequence_name unique (name_norm);
+
+alter table m_sequence
+    add constraint fk_sequence
+    foreign key (oid)
+    references m_object;
+
+alter table m_user_photo
+    drop constraint fk_user_photo;
+
+alter table m_user_photo rename to m_focus_photo;
+
+alter table m_focus_photo
+    add constraint fk_focus_photo
+    foreign key (owner_oid)
+    references m_focus;
+
+
+alter table m_focus add hasPhoto boolean not null default false after validityStatus;
+
+update m_focus set hasPhoto = false;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+    where m_focus.oid in (select oid from m_user);
+
+-- don't know how to drop default value, leaving it there
+
+alter table m_user drop column hasPhoto;
+
+
+
+
+

config/sql/_all/mysql-upgrade-3.2-3.3.sql

@@ -0,0 +1,37 @@
+create table m_sequence (
+    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;
+
+alter table m_sequence
+    add constraint uc_sequence_name  unique (name_norm);
+
+alter table m_sequence
+    add constraint fk_sequence
+    foreign key (oid)
+    references m_object (oid);
+
+rename table m_user_photo to m_focus_photo;
+
+alter table m_focus add hasPhoto bit not null default 0;
+
+update m_focus set hasPhoto = 0;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+where m_focus.oid in (select oid from m_user);
+
+alter table m_focus alter column hasPhoto drop default;
+
+alter table m_user drop column hasPhoto;
+
+alter table m_focus_photo
+  drop foreign key fk_user_photo;
+
+alter table m_focus_photo
+  add constraint fk_focus_photo
+  foreign key (owner_oid)
+  references m_focus (oid);
+

config/sql/_all/oracle-upgrade-3.2-3.3.sql

@@ -0,0 +1,34 @@
+create table m_sequence (
+    name_norm varchar2(255 char),
+    name_orig varchar2(255 char),
+    oid varchar2(36 char) not null,
+    primary key (oid)
+);
+
+alter table m_sequence
+    add constraint uc_sequence_name  unique (name_norm);
+
+alter table m_sequence
+    add constraint fk_sequence
+    foreign key (oid)
+    references m_object;
+
+
+
+alter table m_user_photo
+    drop constraint fk_user_photo;
+
+rename m_user_photo to m_focus_photo;
+
+alter table m_focus_photo
+    add constraint fk_focus_photo
+    foreign key (owner_oid)
+    references m_focus;
+
+alter table m_focus add hasPhoto number(1,0) default 0 not null;
+update m_focus set hasPhoto = 0;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+    where m_focus.oid in (select oid from m_user);
+alter table m_focus modify hasPhoto default null;
+
+alter table m_user drop column hasPhoto;

config/sql/_all/postgresql-upgrade-3.2-3.3.sql

@@ -0,0 +1,38 @@
+create table m_sequence (
+    name_norm varchar(255),
+    name_orig varchar(255),
+    oid varchar(36) not null,
+    primary key (oid)
+);
+
+alter table m_sequence
+    add constraint uc_sequence_name  unique (name_norm);
+
+alter table m_sequence
+    add constraint fk_sequence
+    foreign key (oid)
+    references m_object;
+
+alter table m_user_photo rename to m_focus_photo;
+
+alter table m_focus add hasPhoto boolean not null default FALSE;
+update m_focus set hasPhoto = false;
+update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+  where m_focus.oid in (select oid from m_user);
+alter table m_focus alter column hasPhoto drop default;
+
+alter table m_focus_photo
+  drop constraint m_user_photo_pkey;
+
+alter table m_focus_photo
+  add constraint m_focus_photo_pkey primary key(owner_oid);
+
+alter table m_focus_photo
+  drop constraint fk_user_photo;
+
+alter table m_focus_photo
+  add constraint fk_focus_photo
+  foreign key (owner_oid)
+  references m_focus;
+
+alter table m_user drop column hasPhoto;

config/sql/_all/sqlserver-upgrade-3.2-3.3.sql

@@ -0,0 +1,35 @@
+create table m_sequence (
+    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)
+);
+
+alter table m_sequence
+    add constraint uc_sequence_name  unique (name_norm);
+
+alter table m_sequence
+    add constraint fk_sequence
+    foreign key (oid)
+    references m_object;
+
+exec sp_rename m_user_photo, m_focus_photo;
+
+alter table m_focus add hasPhoto bit not null constraint default_constraint default 0;
+
+update m_focus set hasPhoto = 0;
+    update m_focus set hasPhoto = (select hasPhoto from m_user where m_user.oid = m_focus.oid)
+    where m_focus.oid in (select oid from m_user);
+
+alter table m_focus drop constraint default_constraint;
+
+alter table m_user drop column hasPhoto;
+
+alter table m_focus_photo
+    drop constraint fk_user_photo;
+
+alter table m_focus_photo
+    add constraint fk_focus_photo
+    foreign key (owner_oid)
+    references m_focus;
+