[midPoint-git] [Evolveum/midpoint] ef7c0a: When applyingDefinition to a container, definition...

Pavol Mederly mederly at evolveum.com
Sat Jun 20 11:55:59 CEST 2015 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: ef7c0a3ccdec239e32f7f2e6b80aae40f9811fde
      https://github.com/Evolveum/midpoint/commit/ef7c0a3ccdec239e32f7f2e6b80aae40f9811fde
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java

  Log Message:
  -----------
  When applyingDefinition to a container, definitions for dynamically-defined items are looked for as well.


  Commit: cf7082454f826a501a14ae531f7accefb784280f
      https://github.com/Evolveum/midpoint/commit/cf7082454f826a501a14ae531f7accefb784280f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  COMPAT mode extended to PrismBeanConvertor as well. (At least partially.)


  Commit: 75624ea3f6f43c0980dfb333ea67fc95583c4602
      https://github.com/Evolveum/midpoint/commit/75624ea3f6f43c0980dfb333ea67fc95583c4602
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-06-20 (Sat, 20 Jun 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    A infra/schema/src/test/resources/object-template/wrong-template.xml

  Log Message:
  -----------
  Forbidding mixing differently-named JAXB elements in one multivalued attribute.


  Commit: 762b305497836dcf38475794c70e0bd5788795c1
      https://github.com/Evolveum/midpoint/commit/762b305497836dcf38475794c70e0bd5788795c1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-06-20 (Sat, 20 Jun 2015)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageAdminCertification.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
    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/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageAdminHome.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAdminReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageAdminRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageAdminTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageAdminUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.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/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAdminWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesAll.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedBy.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedFor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsClaimable.java
    A 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/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/ResourceShadowDiscriminator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.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/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/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/schema/src/main/resources/xml/ns/standard/XMLSchema.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceEventListener.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContextFactory.java
    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/ResourceEventListenerImpl.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/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/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.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/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.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/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/TestDummyNegative.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/impl/TestOpenDJNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/mock/SynchornizationServiceMock.java
    R provisioning/provisioning-impl/src/test/resources/impl/account-change-description.xml
    R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete-repo.xml
    R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-change.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-repo.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack.xml
    R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-repo.xml
    R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify.xml
    R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton-change.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow-repo.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-will.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/query-filter-all-accounts.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/query-vanhelgen.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/vanhelgen.ldif
    R provisioning/provisioning-impl/src/test/resources/impl/query-filter-all-accounts.xml
    M provisioning/provisioning-impl/src/test/resources/logback-test.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

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


  Commit: 4026864abae1e4dcb34c77b7c26f4041c8327c5a
      https://github.com/Evolveum/midpoint/commit/4026864abae1e4dcb34c77b7c26f4041c8327c5a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-06-20 (Sat, 20 Jun 2015)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    A model/model-common/src/test/resources/mapping/mapping-script-custom-enum.xml
    M model/model-common/src/test/resources/schema/extension.xsd

  Log Message:
  -----------
  Fixing MID-2399.


Compare: https://github.com/Evolveum/midpoint/compare/0672d88354f5...4026864abae1

More information about the midPoint-svn mailing list