[midPoint-git] [Evolveum/midpoint] 7d33d0: small imporvements for authetication cofiguration

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7d33d05bf82caa703ee251b3eab0f48c9030b4f6
      https://github.com/Evolveum/midpoint/commit/7d33d05bf82caa703ee251b3eab0f48c9030b4f6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-08-08 (Mon, 08 Aug 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/midpoint-config.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  small imporvements for authetication cofiguration


  Commit: f73586ca173b6ea540dfe589fd2627605293baa6
      https://github.com/Evolveum/midpoint/commit/f73586ca173b6ea540dfe589fd2627605293baa6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-08-08 (Mon, 08 Aug 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPolyString.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/f31607db89c8...f73586ca173b