[midPoint-git] midPoint branch master updated. v2.3devel-1242-g874e769

[Erik Suta]

Project "midPoint" branch master has been updated
       via  874e76918149c547ba4716ba0f9cf26ab60dbcaa (commit) v2.3devel-1242-g874e769
       via  d3411e459b18aaff257da9e3da352bbd90f3a28c (commit) v2.3devel-1241-gd3411e4
       via  84eed53f9886f2df5ede5f87b153827981c65ccf (commit) v2.3devel-1239-g84eed53
       via  cbdeb8f455a6c12ec938ade1cccc471a998c4387 (commit) v2.3devel-1238-gcbdeb8f
      from  4d4a68e137bb421a9b8d6984d4112d5dbbd06383 (commit) v2.3devel-1238-g4d4a68e

- Log -----------------------------------------------------------------
commit 874e76918149c547ba4716ba0f9cf26ab60dbcaa
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Mar 14 15:44:32 2014 +0100

    MID-1767 - Role Editor implementation iteration - added editors for assignments and inducements. Still many bugs and TODOs. Work in progress.

commit d3411e459b18aaff257da9e3da352bbd90f3a28c
Merge: 84eed53 4d4a68e
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Mar 14 12:00:58 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

commit 84eed53f9886f2df5ede5f87b153827981c65ccf
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Mar 14 12:00:44 2014 +0100

    MID-1767 - Role implementation. Renaming old page with XML editor, fixing redirections.

commit cbdeb8f455a6c12ec938ade1cccc471a998c4387
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Mar 14 11:58:51 2014 +0100

    MID-1767 - Role Editor implementation. Work in progress.

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../midpoint/web/page/admin/PageAdmin.java         |    2 -
 .../midpoint/web/page/admin/roles/PageRole.html    |   64 +++-
 .../midpoint/web/page/admin/roles/PageRole.java    |  394 ++++++++++++++------
 .../web/page/admin/roles/PageRole.properties       |   20 +-
 .../roles/{PageRole.html => PageRoleOld.html}      |    0
 .../roles/{PageRole.java => PageRoleOld.java}      |   12 +-
 ...{PageRole.properties => PageRoleOld.properties} |    0
 .../midpoint/web/page/admin/roles/PageRoles.java   |    1 -
 .../midpoint/web/page/admin/roles/dto/RoleDto.java |  138 +++++++
 9 files changed, 495 insertions(+), 136 deletions(-)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/{PageRole.html => PageRoleOld.html} (100%)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/{PageRole.java => PageRoleOld.java} (95%)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/{PageRole.properties => PageRoleOld.properties} (100%)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RoleDto.java


hooks/post-receive
-- 
midPoint