[midPoint-git] [Evolveum/midpoint] 152c47: fix XML

[gpalos]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 152c473bf696ff24c2bfd86d7aa4707fac2ae59a
      https://github.com/Evolveum/midpoint/commit/152c473bf696ff24c2bfd86d7aa4707fac2ae59a
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M samples/demo/orgs-objectType.xml
    M samples/demo/projects-objectType.xml

  Log Message:
  -----------
  fix XML


  Commit: 37b3f2f156da86e9013cb10529e9c858abb58dc6
      https://github.com/Evolveum/midpoint/commit/37b3f2f156da86e9013cb10529e9c858abb58dc6
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/login/PageLogin_en_US.utf8.properties
    M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword_tr_TR.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/match/DistinguishedNameMatchingRule.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistryFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectDiscriminator.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectOperations.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.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/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M testing/longtest/src/test/resources/common/resource-opendj.xml
    M testing/story/src/test/resources/orgsync/resource-opendj.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/47b3f5e65e6e...37b3f2f156da