[midPoint-git] [Evolveum/midpoint] 37739b: adding new test case - MID-1854 (removing associac...
Katarina Valalikova
k.valalikova at evolveum.com
Tue May 6 16:21:30 CEST 2014
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 37739bae63bef4b19c7e9f10c06def5b0f5748f3
https://github.com/Evolveum/midpoint/commit/37739bae63bef4b19c7e9f10c06def5b0f5748f3
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-05-02 (Fri, 02 May 2014)
Changed paths:
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
Log Message:
-----------
adding new test case - MID-1854 (removing associaction from user)
Commit: 26fdc25f3e708fb367629fdc2966e3a344e5d2c1
https://github.com/Evolveum/midpoint/commit/26fdc25f3e708fb367629fdc2966e3a344e5d2c1
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-05-02 (Fri, 02 May 2014)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTableDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ResourceListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TypedCacheKey.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ContainerValueDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/DeltaDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/PrismPropertyModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorHostTypeComparator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorTypeComparator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.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/PageAdmin.properties
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/PageDebugList.java
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/PageSystemConfiguration.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AEPlevel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ClassLogger.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ComponentLogger.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/DebugObjectItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FileAppenderConfig.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FilterConfiguration.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FilterValidator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LevelValidator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggerConfiguration.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggerValidator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggingDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ProfilingLevel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLogger.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/dto/ObjectViewDto.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/PageMyPasswords.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/MyWorkItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/SimpleAssignmentDto.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/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/reports/component/AuditPopupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditReportDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReconciliationReportDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDeleteDialogDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportOutputSearchDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/UserReportDto.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/PageContentEntitlements.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/resources/content/dto/AccountContentDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceController.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDto.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/PageRoleOld.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/roles/dto/RoleDto.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/server/dto/NodeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/OperationResultStatusIcon.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoExecutionStatus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoExecutionStatusFilter.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TsaValidator.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/users/component/AssignablePopupContent.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitAddDeletePopup.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTableDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTreeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.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/PageWorkItem.html
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/PageWorkItem.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsClaimable.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsClaimable.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDetailedDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedLogoutHandler.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthWebSession.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
M gui/admin-gui/src/main/resources/initial-objects/010-value-policy.xml
M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
M gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
M gui/admin-gui/src/main/resources/initial-objects/050-user-administrator.xml
M gui/admin-gui/src/main/resources/initial-objects/060-task-cleanup.xml
M gui/admin-gui/src/main/resources/initial-objects/070-task-validity.xml
M gui/admin-gui/src/main/resources/initial-objects/080-task-trigger.xml
M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java
M gui/admin-gui/src/test/resources/wrapper/user.xml
M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
M infra/common/src/main/java/com/evolveum/midpoint/common/ResourceObjectPattern.java
M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.java
M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
M infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java
M infra/common/src/main/java/com/evolveum/midpoint/common/policy/StringPolicyUtils.java
M infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.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/LayerRefinedResourceSchema.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/PropertyLimitations.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedConnectorSchema.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/common/src/main/java/com/evolveum/midpoint/common/refinery/ShadowDiscriminatorObjectDelta.java
M infra/common/src/main/java/com/evolveum/midpoint/common/validator/EventHandler.java
M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
M infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputer.java
M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
M infra/common/src/test/java/com/evolveum/midpoint/common/test/PasswordPolicyValidatorTest.java
M infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java
M infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-111111111111.xml
M infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-111111111112.xml
M infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999111111122.xml
M infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml
M infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111112.xml
M infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml
M infra/common/src/test/resources/policy/password-policy-complex.xml
M infra/common/src/test/resources/policy/password-policy-long.xml
M infra/common/src/test/resources/policy/password-policy-minimal.xml
M infra/common/src/test/resources/policy/password-policy-numeric.xml
M infra/common/src/test/resources/policy/value-policy-generate.xml
M infra/common/src/test/resources/policy/value-policy-must-be-first.xml
M infra/common/src/test/resources/policy/value-policy-random-pin.xml
M infra/common/src/test/resources/refinery/account-jack.xml
M infra/common/src/test/resources/refinery/resource-complex-deprecated.xml
M infra/common/src/test/resources/refinery/resource-complex.xml
M infra/common/src/test/resources/refinery/resource-simple.xml
M infra/common/src/test/resources/schema/extension.xsd
M infra/common/src/test/resources/validator/no-name.xml
M infra/common/src/test/resources/validator/not-well-formed.xml
M infra/common/src/test/resources/validator/resource-1-valid.xml
M infra/common/src/test/resources/validator/three-objects.xml
M infra/common/src/test/resources/validator/three-users-schema-violation.xml
M infra/common/src/test/resources/validator/undeclared-prefix.xml
M infra/prism/pom.xml
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Objectable.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/BaseProtector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/ProtectedData.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/Protector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ChangeType.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/PolyStringNormMatchingRule.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/PolyStringOrigMatchingRule.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/PolyStringStrictMatchingRule.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.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/QueryConvertor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/ItemPathTypeDeserializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/util/XNodeProcessorUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PagingConvertor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaToDomProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismValidate.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/JaxbTypeConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/AccessAnnotationType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/ObjectFactory.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/package-info.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/AccessAnnotationType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/ObjectFactory.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_3/package-info.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/FilterClauseType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/LogicalOperatorFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/NAryLogicalOperatorFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/OrderDirectionType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PagingType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyComplexValueFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyNoValueFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertySimpleValueFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UnaryLogicalOperatorFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UriFilterType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ValueType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/package-info.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/FilterClauseType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/LogicalOperatorFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/NAryLogicalOperatorFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/ObjectFactory.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/OrderDirectionType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/PagingType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/PropertyComplexValueFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/PropertyNoValueFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/PropertySimpleValueFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/QueryType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/UnaryLogicalOperatorFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/UriFilterType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/ValueType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/package-info.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ChangeTypeType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/CipherDataType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptedDataType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptionMethodType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/Extension.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/KeyInfoType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ModificationTypeType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectReferenceType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/PolyStringType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedByteArrayType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedStringType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ChangeTypeType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/CipherDataType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/EncryptedDataType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/EncryptionMethodType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/Extension.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemDeltaType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemPathType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/KeyInfoType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ModificationTypeType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectDeltaType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectFactory.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectReferenceType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ObjectType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedByteArrayType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedDataType.java
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedStringType.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: b471208ddee1f21268e1c7237ec1b2a115b93d57
https://github.com/Evolveum/midpoint/commit/b471208ddee1f21268e1c7237ec1b2a115b93d57
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-05-05 (Mon, 05 May 2014)
Changed paths:
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.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/component/AsyncDashboardPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AccountCallableResult.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/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
M gui/admin-gui/src/main/resources/initial-objects/060-task-cleanup.xml
M gui/admin-gui/src/main/resources/initial-objects/070-task-validity.xml
M gui/admin-gui/src/main/resources/initial-objects/080-task-trigger.xml
M gui/admin-gui/src/test/resources/wrapper/user.xml
M infra/common/src/test/resources/refinery/resource-complex-deprecated.xml
M infra/common/src/test/resources/refinery/resource-complex.xml
M infra/schema/.gitignore
M infra/schema/src/main/resources/META-INF/catalog.xml
M infra/schema/src/test/resources/common/resource-opendj.xml
M infra/schema/src/test/resources/deltaconverter/task-new.xml
M infra/schema/src/test/resources/deltaconverter/task-old.xml
M infra/schema/src/test/resources/diff/task-after.xml
M infra/schema/src/test/resources/diff/task-before.xml
M model/model-client/src/compile/resources/catalog.xml
M model/model-client/src/main/resources/META-INF/catalog.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/cleanup/CleanUpTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelOperationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ImportConstants.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ImportObjectsFromFileTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ScriptExecutionTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/trigger/RecomputeTriggerHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/trigger/TriggerScannerTaskHandler.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/TestModelExpressions.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/ActionManagerImplTest.java
M model/model-impl/src/test/resources/common/resource-dummy-deprecated.xml
M model/model-impl/src/test/resources/common/resource-dummy.xml
M model/model-impl/src/test/resources/common/role-superuser.xml
M model/model-impl/src/test/resources/common/task-reconcile-dummy.xml
M model/model-impl/src/test/resources/controller/modify/account.xml
M model/model-impl/src/test/resources/expr/orgstruct.xml
M model/model-impl/src/test/resources/migrator/after/resource.xml
M model/model-impl/src/test/resources/migrator/before/resource.xml
M model/model-impl/src/test/resources/sync/action/account/group-change.xml
M model/model-impl/src/test/resources/sync/action/user/existing-user-change.xml
M model/model-impl/src/test/resources/sync/change-correct.xml
M model/model-impl/src/test/resources/sync/change-without-object.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/MockTaskHandler.java
M model/model-intest/src/test/resources/common/org-monkey-island.xml
M model/model-intest/src/test/resources/common/resource-dummy-black.xml
M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-green.xml
M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/common/resource-opendj.xml
M model/model-intest/src/test/resources/common/role-superuser.xml
M model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
M model/model-intest/src/test/resources/common/task-dumy-green-livesync.xml
M model/model-intest/src/test/resources/common/task-dumy-livesync.xml
M model/model-intest/src/test/resources/common/task-mock-jack.xml
M model/model-intest/src/test/resources/common/task-reconcile-dummy-blue.xml
M model/model-intest/src/test/resources/common/task-reconcile-dummy-green.xml
M model/model-intest/src/test/resources/common/task-reconcile-dummy.xml
M model/model-intest/src/test/resources/common/task-trigger-scanner.xml
M model/model-intest/src/test/resources/common/task-validity-scanner.xml
M model/model-intest/src/test/resources/common/user-template-complex.xml
M model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
M model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
M model/model-intest/src/test/resources/scripthooks/org-top.xml
M model/model-intest/src/test/resources/scripthooks/resource-dummy-hook.xml
M model/model-intest/src/test/resources/security/role-filter-object-caribbean.xml
M model/model-intest/src/test/resources/security/role-filter-object-modify-caribbean.xml
M model/model-intest/src/test/resources/security/role-org-master-ministry-of-rum.xml
M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some.xml
M model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-req-exec.xml
M model/model-intest/src/test/resources/security/role-prop-read-some-modify-some.xml
M model/model-intest/src/test/resources/security/role-readonly-exec.xml
M model/model-intest/src/test/resources/security/role-readonly-req-exec.xml
M model/model-intest/src/test/resources/security/role-readonly-req.xml
M model/model-intest/src/test/resources/security/role-readonly.xml
M model/model-intest/src/test/resources/security/role-self-accounts-partial-control.xml
M model/model-intest/src/test/resources/security/role-self-accounts-read-write.xml
M model/model-intest/src/test/resources/security/role-self-accounts-read.xml
M model/model-intest/src/test/resources/security/role-self-req.xml
M model/model-intest/src/test/resources/security/role-self.xml
M model/model-intest/src/test/resources/sync/resource-dummy-azure-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml
M model/model-intest/src/test/resources/sync/resource-dummy-emerald-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-emerald.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
M model/model-intest/src/test/resources/sync/task-dummy-emerald-livesync.xml
M model/model-intest/src/test/resources/sync/task-dummy-emerald-recon.xml
M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
M model/model-intest/src/test/resources/sync/task-reconcile-dummy-lime.xml
M model/model-intest/src/test/resources/sync/task-reconcile-dummy-single.xml
M model/model-intest/src/test/resources/sync/task-user-recompute-captain.xml
M model/model-intest/src/test/resources/sync/task-user-recompute.xml
M model/report-impl/src/test/resources/common/role-superuser.xml
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/WfProcessInstanceShadowTaskHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/WfPrepareChildOperationTaskHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/WfPrepareRootOperationTaskHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.java
M model/workflow-impl/src/test/resources/common/resource-dummy.xml
M model/workflow-impl/src/test/resources/common/role-superuser.xml
M model/workflow-impl/src/test/resources/task.xml
M provisioning/provisioning-impl/src/test/resources/impl/sync-task-example.xml
M repo/repo-sql-impl-test/src/test/resources/basic/import-overwrite.xml
M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
M repo/repo-sql-impl-test/src/test/resources/basic/tasks.xml
M repo/repo-sql-impl-test/src/test/resources/basic/user-big.xml
M repo/repo-sql-impl-test/src/test/resources/delete/shadow.xml
M repo/repo-sql-impl-test/src/test/resources/modify/resource-csv.xml
M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
M repo/repo-sql-impl-test/src/test/resources/modify/role-modify.xml
M repo/repo-sql-impl-test/src/test/resources/orgstruct/org-monkey-island-incorrect.xml
M repo/repo-sql-impl-test/src/test/resources/orgstruct/org-monkey-island.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/TaskManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForSubtasksByPollingTaskHandler.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/WaitForTasksTaskHandler.java
M repo/task-quartz-impl/src/test/resources/repo/tasks-for-cleanup.xml
M samples/demo/hr.xml
M samples/demo/opendj.xml
M samples/demo/org.xml
M samples/org/org-monkey-island-complex.xml
M samples/org/org-monkey-island-simple.xml
M samples/resources/ad/ad-resource-advanced-sync.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
M samples/resources/csvfile/localhost-csvfile-resource-import.xml
M samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
M samples/resources/dsee/odsee-localhost-advanced-sync.xml
M samples/resources/opendj/opendj-localhost-medium.xml
M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
M samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml
M samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml
M samples/rest/opendj-resource-sync.xml
M samples/roles/approvals-complete.xml
M samples/roles/authorization-roles.xml
M samples/roles/users-for-approval-processes.xml
M samples/tasks/recon-task-csv-dry-run.xml
M samples/tasks/recon-task-csv.xml
M samples/tasks/recon-task-opendj-test.xml
M samples/tasks/recon-task-opendj.xml
M samples/tasks/task-user-recompute.xml
M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
M testing/consistency-mechanism/src/test/resources/repo/role-superuser.xml
M testing/consistency-mechanism/src/test/resources/repo/task-derby-reconciliation.xml
M testing/consistency-mechanism/src/test/resources/repo/task-opendj-reconciliation.xml
M testing/consistency-mechanism/src/test/resources/repo/task-opendj-sync.xml
M testing/consistency-mechanism/src/test/resources/repo/task-user-recompute.xml
M testing/consistency-mechanism/src/test/resources/request/resource-modify-synchronization.xml
M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
M testing/longtest/src/test/resources/common/resource-opendj.xml
M testing/longtest/src/test/resources/common/role-superuser.xml
M testing/rest/src/test/resources/repo/resource-opendj.xml
M testing/sanity/src/test/resources/repo/resource-dummy.xml
M testing/sanity/src/test/resources/repo/resource-opendj.xml
M testing/sanity/src/test/resources/repo/role-superuser.xml
M testing/sanity/src/test/resources/repo/task-derby-reconciliation.xml
M testing/sanity/src/test/resources/repo/task-opendj-reconciliation.xml
M testing/sanity/src/test/resources/repo/task-opendj-sync.xml
M testing/sanity/src/test/resources/repo/task-user-recompute.xml
M testing/story/src/test/resources/common/role-superuser.xml
M testing/story/src/test/resources/common/task-trigger-scanner.xml
M testing/story/src/test/resources/common/task-validity-scanner.xml
M testing/story/src/test/resources/orgsync/org-top.xml
M testing/story/src/test/resources/orgsync/resource-dummy-hr.xml
M testing/story/src/test/resources/orgsync/resource-opendj.xml
M testing/story/src/test/resources/orgsync/task-dumy-hr-livesync.xml
M testing/story/src/test/resources/trafo/resource-dummy-ad.xml
M testing/story/src/test/resources/trafo/resource-dummy-mail.xml
M testing/story/src/test/resources/village/orgs.xml
M testing/story/src/test/resources/village/resource-dummy-source.xml
M testing/story/src/test/resources/village/resource-opendj.xml
M testing/story/src/test/resources/village/task-dumy-source-livesync.xml
M testing/systest/src/test/resources/xml/resource-ldap1-dc=example.xml
M tools/repo-ninja/src/test/resources/objects.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 69e186d8d3d38270e59ca7480011541c09191ac3
https://github.com/Evolveum/midpoint/commit/69e186d8d3d38270e59ca7480011541c09191ac3
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-05-06 (Tue, 06 May 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ObjectTemplateProcessor.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/ShadowCache.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
A testing/story/src/test/resources/village/role-account-construction.xml
Log Message:
-----------
fixing MID-1854 (Unassigning role that associates an entitlement (group) with the user does not remove the association (group) from the user)
Commit: f9d715828109ccd0db040dba31d25db54998b67f
https://github.com/Evolveum/midpoint/commit/f9d715828109ccd0db040dba31d25db54998b67f
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-05-06 (Tue, 06 May 2014)
Changed paths:
M config/sql/midpoint/2.3/h2/h2-2.3.sql
M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
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/server/dto/TaskDtoExecutionStatus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoExecutionStatusFilter.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
M infra/common/src/main/java/com/evolveum/midpoint/common/ResourceObjectPattern.java
M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/common/src/test/java/com/evolveum/midpoint/common/TestStaticValues.java
M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
R infra/common/src/test/resources/refinery/resource-complex-deprecated.xml
M infra/common/src/test/resources/refinery/resource-complex.xml
M infra/common/testng.xml
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedDataType.java
M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectDeltaOperation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
M infra/schema/src/test/resources/common/model-context-1.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
A model/workflow-impl/src/test/resources/model-context.obsolete.xml
R model/workflow-impl/src/test/resources/model-context.xml
M model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml
A model/workflow-impl/src/test/resources/task.obsolete.xml
R model/workflow-impl/src/test/resources/task.xml
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/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/Slf4jConnectorLogger.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
M provisioning/provisioning-impl/src/test/resources/impl/dummy-case-ignore/resource-dummy.xml
M provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/resource-dummy.xml
M provisioning/provisioning-impl/src/test/resources/impl/dummy-no-activation/resource-dummy.xml
M provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/resource-dummy.xml
M provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid/resource-dummy.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-dummy.xml
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
M samples/model-client-sample/pom.xml
M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
M samples/model-client-sample/src/main/resources/user-lechuck.xml
M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
M testing/longtest/src/test/resources/common/resource-opendj.xml
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/ModelClientUtil.java
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
M testing/story/src/test/resources/trafo/resource-dummy-ad.xml
M testing/story/src/test/resources/trafo/resource-dummy-mail.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Compare: https://github.com/Evolveum/midpoint/compare/3d7bfc990c3d...f9d715828109
More information about the midPoint-svn
mailing list