[midPoint-git] [Evolveum/midpoint] f449bb: fix for MID-1749 + MID-1731.

[Erik Suta]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: f449bb9a77c590ca2df0b5652ae49c3e86412c19
      https://github.com/Evolveum/midpoint/commit/f449bb9a77c590ca2df0b5652ae49c3e86412c19
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    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/page/admin/users/dto/SimpleUserResourceProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UserAccountDto.java

  Log Message:
  -----------
  fix for MID-1749 + MID-1731.


  Commit: 113110a4580dcaf912456caa644f49f14a340ef0
      https://github.com/Evolveum/midpoint/commit/113110a4580dcaf912456caa644f49f14a340ef0
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ComparativeFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LogicalFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NaryLogicalFilter.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NoneFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectPaging.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/UnaryLogicalFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerListObjectsTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
    M model/model-impl/testng.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/security/role-filter-object-caribbean.xml
    A model/model-intest/src/test/resources/security/role-filter-object-modify-caribbean.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/WfTaskUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/LogicalOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    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/query/restriction/AndRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NaryLogicalRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ItemSecurityConstraints.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ObjectSecurityConstraints.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M samples/resources/opendj/opendj-localhost-basic.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/3e22b4ba2492...113110a4580d