[midPoint-git] [Evolveum/midpoint] 2c1c02: Fixing MID-2045 (add changes text formatter for ge...
Viliam Repan
vilo.repan at evolveum.com
Sun Oct 12 15:10:44 CEST 2014
Branch: refs/heads/bootstrap-upgrade
Home: https://github.com/Evolveum/midpoint
Commit: 2c1c0203126956d68ac8fb8e9107eb748b4d30fc
https://github.com/Evolveum/midpoint/commit/2c1c0203126956d68ac8fb8e9107eb748b4d30fc
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
Log Message:
-----------
Fixing MID-2045 (add changes text formatter for generalNotifier).
Commit: d8c0fcbeff82064c9cfe1adfc8d7de28a31fd8df
https://github.com/Evolveum/midpoint/commit/d8c0fcbeff82064c9cfe1adfc8d7de28a31fd8df
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into bootstrap-upgrade
Commit: a20ecdb7e7c199885517b8cecb276aaf2fa911dd
https://github.com/Evolveum/midpoint/commit/a20ecdb7e7c199885517b8cecb276aaf2fa911dd
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/FocusTypeFilterHelper.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleUserNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
Log Message:
-----------
SimpleFocalObjectNotifier and FocusType filter (MID-2044).
Commit: 1daa59654ac59646a50aa73d7c58fd08b49cc2f7
https://github.com/Evolveum/midpoint/commit/1daa59654ac59646a50aa73d7c58fd08b49cc2f7
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
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/input/ExpressionEditorPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
Log Message:
-----------
Resource Wizard update:
- Fixed bug with incorrect <inbound/> and <outbound/> mapping handling
- improving getting information label for mappings in wizard
- small fix for condition labels in correlation editor
Commit: ebd4500ef7be52f3ba9d98f335f5dcbd5eafa67a
https://github.com/Evolveum/midpoint/commit/ebd4500ef7be52f3ba9d98f335f5dcbd5eafa67a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleResourceObjectNotifier.java
M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
M model/notifications-impl/src/test/resources/changes/user-jack-modification.xml
M model/notifications-impl/src/test/resources/objects/user-jack.xml
Log Message:
-----------
MID-2047 (identifying changed container values). Fixed useless delete+add of tenantRef. Added a couple of display names to schema.
Commit: f49e31101b9edc8a667f9e0f009bc8dd146bf31b
https://github.com/Evolveum/midpoint/commit/f49e31101b9edc8a667f9e0f009bc8dd146bf31b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
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/input/ExpressionEditorPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: dbb0f1e12bb5a4bf4d37858b558e15956efbb6b2
https://github.com/Evolveum/midpoint/commit/dbb0f1e12bb5a4bf4d37858b558e15956efbb6b2
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
Log Message:
-----------
Small fix.
Commit: f26ed43d28bf32e104d8148653a6b3ad55648c21
https://github.com/Evolveum/midpoint/commit/f26ed43d28bf32e104d8148653a6b3ad55648c21
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/SearchFilterTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties
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/component/schemahandling/ResourceProtectedEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
Log Message:
-----------
Resource Wizard update:
- Fix for bug when correlation filter expression was not saved
- Added filterClause editor to resource protected accounts editor
- Better handling for validators - when error occurs, error message is displazed immidiatel
- fix for bug, when deleting expression or filterClause would not be handled
Commit: e35365cb3fbca94c157ff48388dfd27003744a3a
https://github.com/Evolveum/midpoint/commit/e35365cb3fbca94c157ff48388dfd27003744a3a
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
Log Message:
-----------
Fix for ChooseTypePanel - when assigning multiple roles, the deletion of tenant attribute in one role cause next assignment to crash.
Commit: 05abb27bf0b4020d2fb0efbe247be9a70137cf63
https://github.com/Evolveum/midpoint/commit/05abb27bf0b4020d2fb0efbe247be9a70137cf63
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-04 (Sat, 04 Oct 2014)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
Log Message:
-----------
added possibility to override resource schema and set secondary identifier - imporved consistency mechanism..
Commit: 799844a0527aee85fca1f2979273e7614980b672
https://github.com/Evolveum/midpoint/commit/799844a0527aee85fca1f2979273e7614980b672
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-04 (Sat, 04 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/SearchFilterTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties
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/component/schemahandling/ResourceProtectedEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.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/util/ExpressionUtil.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 51e280e68bbfa3bb693042c9dfe69502b10ec0f9
https://github.com/Evolveum/midpoint/commit/51e280e68bbfa3bb693042c9dfe69502b10ec0f9
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-04 (Sat, 04 Oct 2014)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
Log Message:
-----------
fixing build..sorry.
Commit: fd5b9f9ea5faabccdcbaf52a5ceab8103b863895
https://github.com/Evolveum/midpoint/commit/fd5b9f9ea5faabccdcbaf52a5ceab8103b863895
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-05 (Sun, 05 Oct 2014)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.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/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
Log Message:
-----------
new model execute option - limitPropagation
* improved compensation mechanism for already exits situation - propagate changes related only to the conflicting shadow
* configurable changes propagation - can be propagated only to the source resource
* skipping some steps while computing changes - if specified to propagate changes only for source resource
Commit: bdd71866f3b74a8de6210c84c01b6851230ada67
https://github.com/Evolveum/midpoint/commit/bdd71866f3b74a8de6210c84c01b6851230ada67
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-05 (Sun, 05 Oct 2014)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
Log Message:
-----------
allow limit propagation only for already exists sitaution
Commit: 02accc61f98e76498f9ccbbc4e4560c53c21213c
https://github.com/Evolveum/midpoint/commit/02accc61f98e76498f9ccbbc4e4560c53c21213c
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-06 (Mon, 06 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReportActivityDto.java
Log Message:
-----------
Attempt to correctly show model contexts with null ResourceShadowDiscriminator.
Commit: 53a13c11adb1b645db08a8bd70eabd68352971e7
https://github.com/Evolveum/midpoint/commit/53a13c11adb1b645db08a8bd70eabd68352971e7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-06 (Mon, 06 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/SearchFilterTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties
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/component/schemahandling/ResourceProtectedEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.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/util/ExpressionUtil.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/RefinedObjectClassDefinition.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.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/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: d7ee796d424c36c0dfacc23584c17021c24ad4b9
https://github.com/Evolveum/midpoint/commit/d7ee796d424c36c0dfacc23584c17021c24ad4b9
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)
Changed paths:
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/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
Log Message:
-----------
fixing resource wizard - connector configuration step..
Commit: d1d24f95ecd06ffb2b4c9142c01e9773a5aa1e61
https://github.com/Evolveum/midpoint/commit/d1d24f95ecd06ffb2b4c9142c01e9773a5aa1e61
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2014-10-07 (Tue, 07 Oct 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
Log Message:
-----------
Improved error reporting (for longtest)
Commit: 4be17288cfe4737fb70c9151372a2dad14639de0
https://github.com/Evolveum/midpoint/commit/4be17288cfe4737fb70c9151372a2dad14639de0
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
M model/model-intest/testng.xml
Log Message:
-----------
Refactoring the tests
Commit: db6faed0255edc5451ac26ce7cbba808b0d1a821
https://github.com/Evolveum/midpoint/commit/db6faed0255edc5451ac26ce7cbba808b0d1a821
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
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/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
M model/model-intest/testng.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 58537f3b7ad00fdeba47594f494f215ef791d9cc
https://github.com/Evolveum/midpoint/commit/58537f3b7ad00fdeba47594f494f215ef791d9cc
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
Log Message:
-----------
Resource Wizard bugfix - removing obsolete field for settuping Connextor version in NameStep
Commit: 59bda72bb2323c49ad2af9934878b8bac3c222b3
https://github.com/Evolveum/midpoint/commit/59bda72bb2323c49ad2af9934878b8bac3c222b3
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_es_ES.utf8.properties
M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.properties
Log Message:
-----------
Resource Wizard update - NameStep - changing connector type label from "Type" to "Connector"
Commit: c7a19fdd08c702c03923cb7f7a3e1874c4402c1a
https://github.com/Evolveum/midpoint/commit/c7a19fdd08c702c03923cb7f7a3e1874c4402c1a
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
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
Log Message:
-----------
Resource Wizard update - changing navigation menu based on requirements
Commit: 00a43aa203a7b4238900e0919ab8ec204f32e04c
https://github.com/Evolveum/midpoint/commit/00a43aa203a7b4238900e0919ab8ec204f32e04c
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
Log Message:
-----------
Resource Wizard update - fixing mapping label creation and a few minor issues on the way
Commit: c9c8ca7c796b349ff8b3d53592eb66a651f8731f
https://github.com/Evolveum/midpoint/commit/c9c8ca7c796b349ff8b3d53592eb66a651f8731f
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
Log Message:
-----------
Resource Wizard update - adding arrows to accordion items in wizard to indicate, that item is collapsable
Commit: 35c8a36d6abdf94ade89bc498d1da6390f6c9feb
https://github.com/Evolveum/midpoint/commit/35c8a36d6abdf94ade89bc498d1da6390f6c9feb
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
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/SchemaHandlingStep.html
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/SynchronizationStep.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
Log Message:
-----------
Resource Wizard update - adding arrows and different delete icons to side-collapsible menus (capabilities, sync objects object types)
Commit: 0068f82ec55645e5006cd714e17c3265a49fe246
https://github.com/Evolveum/midpoint/commit/0068f82ec55645e5006cd714e17c3265a49fe246
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
Log Message:
-----------
Improved error checking during connector initialization
Commit: 204bf4256b96a34a57dd0e55e03a5821b071db62
https://github.com/Evolveum/midpoint/commit/204bf4256b96a34a57dd0e55e03a5821b071db62
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif
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/impl/ShadowManager.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/ucf/query/LogicalOperation.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
Log Message:
-----------
support for more than one secondary identifier - improved consistency mechanism
Commit: c2884081b12ee6e82dbe989903233af548731a9c
https://github.com/Evolveum/midpoint/commit/c2884081b12ee6e82dbe989903233af548731a9c
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
Log Message:
-----------
MID-1993 - fix for typo in code, that was causing this issue.
Commit: e68fd7989da4660b465335d5ee01226eedf8ad32
https://github.com/Evolveum/midpoint/commit/e68fd7989da4660b465335d5ee01226eedf8ad32
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_es_ES.utf8.properties
M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
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/wizard/resource/CapabilityStep.html
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/NameStep.html
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/NameStep.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
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/SynchronizationStep.html
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/schemahandling/ResourceActivationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.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/security/MidPointApplication.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: ec5b05bc2e4537473e3e54c36b9182d84a1b2f2d
https://github.com/Evolveum/midpoint/commit/ec5b05bc2e4537473e3e54c36b9182d84a1b2f2d
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
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/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/rename.ldif
Log Message:
-----------
force rename if needed - e.g resource object was changed (icf_name, nameing attribute) and these changes were not synced to the midpoint..
Commit: cc4b4f6eadedf26d53bce58933f01db8f40ebd37
https://github.com/Evolveum/midpoint/commit/cc4b4f6eadedf26d53bce58933f01db8f40ebd37
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/CustomQuery.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/OrgFilterQuery.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
Log Message:
-----------
Working around duplicate records returned from a special kind of OR-style attribute-related query.
Commit: 9752ed987d3b253812fcf675b633bc31a51d116d
https://github.com/Evolveum/midpoint/commit/9752ed987d3b253812fcf675b633bc31a51d116d
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
Log Message:
-----------
fixing problem with changing password (GUI)
Commit: dc339bbdbb6ff97eaf25198cc456b7eb504fd7b2
https://github.com/Evolveum/midpoint/commit/dc339bbdbb6ff97eaf25198cc456b7eb504fd7b2
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_es_ES.utf8.properties
M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
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/progress/ProgressReportActivityDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
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/NameStep.html
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/NameStep.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
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/SynchronizationStep.html
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/schemahandling/ResourceActivationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.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/security/MidPointApplication.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
M model/model-intest/testng.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/CustomQuery.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/OrgFilterQuery.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 7453f4478b10505b6734f024b12405cb8386621e
https://github.com/Evolveum/midpoint/commit/7453f4478b10505b6734f024b12405cb8386621e
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
Log Message:
-----------
improving shadow query with disjunction - search according to secondary identifiers.
Commit: 258b93a4fbf784488a4a7977956a3e2387d484b8
https://github.com/Evolveum/midpoint/commit/258b93a4fbf784488a4a7977956a3e2387d484b8
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectNotFoundHandler.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/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/impl/ShadowManager.java
Log Message:
-----------
clean up provisioning logging
Commit: b01dab87c9253ef554f9ecaca772b23348eea67c
https://github.com/Evolveum/midpoint/commit/b01dab87c9253ef554f9ecaca772b23348eea67c
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
Log Message:
-----------
small improvement for shadow query with disjunction
Commit: 6985f0d18526c3b6e78ada5c8e17d461905b29f0
https://github.com/Evolveum/midpoint/commit/6985f0d18526c3b6e78ada5c8e17d461905b29f0
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_es_ES.utf8.properties
M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
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/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/SearchFilterTypeDto.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/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/progress/ProgressReportActivityDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
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.html
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.html
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/NameStep.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
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/SynchronizationStep.html
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/schemahandling/ResourceActivationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.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/component/ChooseTypePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.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/RefinedObjectClassDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.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/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
M model/model-intest/testng.xml
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/FocusTypeFilterHelper.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleResourceObjectNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleUserNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
M model/notifications-impl/src/test/resources/changes/user-jack-modification.xml
M model/notifications-impl/src/test/resources/objects/user-jack.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectNotFoundHandler.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/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/impl/ShadowManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.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/ucf/query/LogicalOperation.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/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/rename.ldif
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/CustomQuery.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/OrgFilterQuery.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
Log Message:
-----------
Merge branch 'master' into bootstrap-upgrade
Compare: https://github.com/Evolveum/midpoint/compare/8220b4811761...6985f0d18526
More information about the midPoint-svn
mailing list