[midPoint-git] [Evolveum/midpoint] 296bae: Fixing TestSecurity

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 296baec6ec387d9d8f8c28a5e3968bdae85d5690
      https://github.com/Evolveum/midpoint/commit/296baec6ec387d9d8f8c28a5e3968bdae85d5690
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M model/model-intest/src/test/resources/security/campaigns.xml

  Log Message:
  -----------
  Fixing TestSecurity


  Commit: 5e10c4edb0007cc218e4ed301a5525cba39758d0
      https://github.com/Evolveum/midpoint/commit/5e10c4edb0007cc218e4ed301a5525cba39758d0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    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/ResourceObjectReferenceResolver.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/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDJTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/group-specialists.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    M testing/story/src/test/resources/unix/resource-opendj.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/dfd65093c3e9...5e10c4edb000