[midPoint-git] [Evolveum/midpoint] ef5160: Extended TestEntitlement to multi-intent associati...

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: ef51608f59b4c275499aa56898f9a2f4599788a7
      https://github.com/Evolveum/midpoint/commit/ef51608f59b4c275499aa56898f9a2f4599788a7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    A model/model-intest/src/test/resources/entitlements/role-brute.xml
    A model/model-intest/src/test/resources/entitlements/role-thug.xml

  Log Message:
  -----------
  Extended TestEntitlement to multi-intent association.


  Commit: f6f5a446d915394a90ef55894cf4d9976c739ddc
      https://github.com/Evolveum/midpoint/commit/f6f5a446d915394a90ef55894cf4d9976c739ddc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M dist/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/SchemaDocMojo.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    R infra/prism/src/main/resources/META-INF/catalog-runtime.xml
    A infra/prism/src/main/resources/META-INF/catalog-test.xml
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/schema/pom.xml
    A infra/schema/src/compile/resources/jax-ws-catalog.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    R infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/catalog-runtime.xml
    A infra/schema/src/main/resources/META-INF/catalog-schema-dist.xml
    R infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    R infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    R infra/schema/src/main/resources/META-INF/jax-ws-catalog-report.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog.xml
    A infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
    R infra/schema/src/main/resources/xml/ns/private/fake/fake-1-model-context.wsdl
    R infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
    R infra/schema/src/main/resources/xml/ns/private/fake/fake-1.wsdl
    R infra/schema/src/main/resources/xml/ns/private/fake/fakeWrapper-model-context.wsdl
    R infra/schema/src/main/resources/xml/ns/private/fake/fakeWrapper-report.wsdl
    R infra/schema/src/main/resources/xml/ns/private/fake/fakeWrapper.wsdl
    R infra/schema/src/main/resources/xml/ns/private/model/modelWrapper.wsdl
    R infra/schema/src/main/resources/xml/ns/private/report/reportWrapper.wsdl
    A infra/schema/src/main/resources/xml/ns/private/webservice/modelService.wsdl
    A infra/schema/src/main/resources/xml/ns/private/webservice/reportService.wsdl
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    R infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/extension-3.xsd
    M infra/schema/src/main/resources/xml/ns/standard/XMLSchema.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseModelContext.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-client/pom.xml
    R model/model-client/src/compile/resources/catalog.xml
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    R model/model-client/src/main/resources/META-INF/catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensObjectDeltaOperation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ObjectDeltaWaves.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/report-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/Job.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/testng-integration.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M tools/schema-dist-maven-plugin/src/main/java/com/evolveum/midpoint/tools/schemadist/ArtifactItem.java
    M tools/schema-dist-maven-plugin/src/main/java/com/evolveum/midpoint/tools/schemadist/SchemaDistMojo.java

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


Compare: https://github.com/Evolveum/midpoint/compare/83533be5cb0d...f6f5a446d915