[midPoint-git] [Evolveum/midpoint] cc9e44: UserPhoto -> FocusPhoto (no db scripts yet)

[Katarina Valalikova]

  Branch: refs/heads/feature/focus-pages
  Home:   https://github.com/Evolveum/midpoint
  Commit: cc9e44687865a564f6061a26b25b1ff5c46a0762
      https://github.com/Evolveum/midpoint/commit/cc9e44687865a564f6061a26b25b1ff5c46a0762
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SelectorOptionsTest.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgPhotoTest.java
    A repo/repo-sql-impl-test/src/test/resources/photo/org.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t101-add-org-type.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t102-remove-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t103-re-add-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t104-change-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t105-add-photo-by-add.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t106-add-photo-by-add-other.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t107-remove-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t108-remove-other-photo-by-delete.xml
    M repo/repo-sql-impl-test/src/test/resources/photo/user.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocusPhoto.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUserPhoto.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RFocusPhotoId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RUserPhotoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/EntityStateInterceptor.java

  Log Message:
  -----------
  UserPhoto -> FocusPhoto (no db scripts yet)


  Commit: 0f4f38e086250742c15e7f77ee5f4a61ce4dfb6c
      https://github.com/Evolveum/midpoint/commit/0f4f38e086250742c15e7f77ee5f4a61ce4dfb6c
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SelectorOptionsTest.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgPhotoTest.java
    A repo/repo-sql-impl-test/src/test/resources/photo/org.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t101-add-org-type.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t102-remove-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t103-re-add-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t104-change-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t105-add-photo-by-add.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t106-add-photo-by-add-other.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t107-remove-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t108-remove-other-photo-by-delete.xml
    M repo/repo-sql-impl-test/src/test/resources/photo/user.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocusPhoto.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUserPhoto.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RFocusPhotoId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RUserPhotoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/EntityStateInterceptor.java

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


  Commit: d13ca2b4d2b795988f53c37ff90dacefd5c20d5f
      https://github.com/Evolveum/midpoint/commit/d13ca2b4d2b795988f53c37ff90dacefd5c20d5f
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SelectorOptionsTest.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgPhotoTest.java
    A repo/repo-sql-impl-test/src/test/resources/photo/org.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t101-add-org-type.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t102-remove-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t103-re-add-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t104-change-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t105-add-photo-by-add.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t106-add-photo-by-add-other.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t107-remove-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t108-remove-other-photo-by-delete.xml
    M repo/repo-sql-impl-test/src/test/resources/photo/user.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocusPhoto.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUserPhoto.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RFocusPhotoId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RUserPhotoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/EntityStateInterceptor.java

  Log Message:
  -----------
  Merge branch 'master' into feature/focus-pages

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java


  Commit: 63c9180547e2a21a2136aa3f0c35657e3e1b48a2
      https://github.com/Evolveum/midpoint/commit/63c9180547e2a21a2136aa3f0c35657e3e1b48a2
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  fix for photo


Compare: https://github.com/Evolveum/midpoint/compare/4fbf14fab746...63c9180547e2