[midPoint-git] [Evolveum/midpoint] 9306db: Diag fixes. Extending import test.
Erik Suta
erik.suta at evolveum.com
Mon Jun 30 10:33:20 CEST 2014
Branch: refs/heads/gui-devel
Home: https://github.com/Evolveum/midpoint
Commit: 9306db3302e2a3c919afcd9d07dfaa10aec44dfd
https://github.com/Evolveum/midpoint/commit/9306db3302e2a3c919afcd9d07dfaa10aec44dfd
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/sync/account-taugustus-dummy.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
Log Message:
-----------
Diag fixes. Extending import test.
Commit: d2e7d8851abfeddda92265e5330f475fdd759cc6
https://github.com/Evolveum/midpoint/commit/d2e7d8851abfeddda92265e5330f475fdd759cc6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
A samples/resources/ad/ad-resource-groups-advanced.xml
A samples/resources/ad/ad-resource-groups-basic.xml
R samples/resources/ad/ad-resource-groups.xml
Log Message:
-----------
Group synchronization sample, advanced version.
Commit: e4b1b3f0f68d6f2275a9b4ff58fff7bad1adf0d8
https://github.com/Evolveum/midpoint/commit/e4b1b3f0f68d6f2275a9b4ff58fff7bad1adf0d8
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskResult.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
A model/model-intest/src/test/resources/sync/account-andre-dummy.xml
A model/model-intest/src/test/resources/sync/account-augustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-cruff-dummy.xml
A model/model-intest/src/test/resources/sync/account-kenny-dummy.xml
A model/model-intest/src/test/resources/sync/account-lechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tandre-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlafoot-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tpalido-dummy.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Fixing an issue with imports/recon of objects in the entire object class (regardless of kind/intent)
Commit: c4a809253ae28623a2a2cc0abafff4b9d7116a85
https://github.com/Evolveum/midpoint/commit/c4a809253ae28623a2a2cc0abafff4b9d7116a85
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
Log Message:
-----------
Disabling irrelevant test
Commit: cb5d95bc43b3b979b5f276b7dbb28c129c11c250
https://github.com/Evolveum/midpoint/commit/cb5d95bc43b3b979b5f276b7dbb28c129c11c250
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
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/any/RAnyConverter.java
Log Message:
-----------
fixed error handling for extension/clob querying.
Commit: cd26e4b0ec5769ef772f24ddcc02086ac4a14808
https://github.com/Evolveum/midpoint/commit/cd26e4b0ec5769ef772f24ddcc02086ac4a14808
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
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/PageDebugView.properties
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/schema/src/test/resources/common/resource-opendj.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskResult.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/sync/account-andre-dummy.xml
A model/model-intest/src/test/resources/sync/account-augustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-cruff-dummy.xml
A model/model-intest/src/test/resources/sync/account-kenny-dummy.xml
A model/model-intest/src/test/resources/sync/account-lechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tandre-dummy.xml
A model/model-intest/src/test/resources/sync/account-taugustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlafoot-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tpalido-dummy.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
A samples/resources/ad/ad-resource-groups-advanced.xml
A samples/resources/ad/ad-resource-groups-basic.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 8e40875400cd2fe2cc2ddbb5a25f13600e7abe24
https://github.com/Evolveum/midpoint/commit/8e40875400cd2fe2cc2ddbb5a25f13600e7abe24
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M samples/resources/ad/ad-resource-groups-advanced.xml
M samples/resources/ad/ad-resource-groups-basic.xml
Log Message:
-----------
Fixing samples w.r.t. schema. Fixed a couple of typos in common-3.xsd.
Commit: e0c8390fd75af44d6983ed9630bbe1dabe426476
https://github.com/Evolveum/midpoint/commit/e0c8390fd75af44d6983ed9630bbe1dabe426476
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
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/any/RAnyConverter.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 1a49a1103152460e9a9cbdb06de18198d729460a
https://github.com/Evolveum/midpoint/commit/1a49a1103152460e9a9cbdb06de18198d729460a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
Log Message:
-----------
"raw" parameter for bulk actions: add, modify, delete, assign.
Commit: dcfbac0e40c68fe106a50cf9e47141ff9783cf79
https://github.com/Evolveum/midpoint/commit/dcfbac0e40c68fe106a50cf9e47141ff9783cf79
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
Log Message:
-----------
fix for gui thread pool, wls midpoint restart.
Commit: 12c8513db3cb0552779908708b1b8ccbb75cfc23
https://github.com/Evolveum/midpoint/commit/12c8513db3cb0552779908708b1b8ccbb75cfc23
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
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/scripting/actions/AddExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
M samples/resources/ad/ad-resource-groups-advanced.xml
M samples/resources/ad/ad-resource-groups-basic.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 21606fa04f2c7a38571d5c996f35f120d2b67b96
https://github.com/Evolveum/midpoint/commit/21606fa04f2c7a38571d5c996f35f120d2b67b96
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
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/util/ObjectWrapperUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
Log Message:
-----------
Fix for non-functioning WorkItemPage.
Commit: ace8e2974410911ea0d58cbaa0b0ef9e82002022
https://github.com/Evolveum/midpoint/commit/ace8e2974410911ea0d58cbaa0b0ef9e82002022
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: e2008c147a1cc75bdd41821fdeedb410b7c3c86f
https://github.com/Evolveum/midpoint/commit/e2008c147a1cc75bdd41821fdeedb410b7c3c86f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
Log Message:
-----------
Fix for displaying associations at user page.
Commit: 6b2153cf7c6c00db28a054387f30d2a50662e777
https://github.com/Evolveum/midpoint/commit/6b2153cf7c6c00db28a054387f30d2a50662e777
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
Log Message:
-----------
Removing unreliable assertion
Commit: 0f3731dffc36818bd42a7741a524b62e47b20415
https://github.com/Evolveum/midpoint/commit/0f3731dffc36818bd42a7741a524b62e47b20415
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java
Log Message:
-----------
MID-1931 implementation. It is now possible to delete 3 types of shadow, all users and all org. units from one place in debug pages.
Commit: f897eb30af0a69e13fe35b05f4c68ea1799111d6
https://github.com/Evolveum/midpoint/commit/f897eb30af0a69e13fe35b05f4c68ea1799111d6
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 5a15ce424f1198b66bbd8338a6c6882b1c115a3e
https://github.com/Evolveum/midpoint/commit/5a15ce424f1198b66bbd8338a6c6882b1c115a3e
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.html
Log Message:
-----------
Delete All IDentities popup css fix
Commit: c042868659199e54f7f457b5c931aacb056df445
https://github.com/Evolveum/midpoint/commit/c042868659199e54f7f457b5c931aacb056df445
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
Log Message:
-----------
Fix for MID-1957 (moving users between OUs and groups at once).
Commit: 5bf1b4889f2e8591135eaf78ebf1c84c76f36113
https://github.com/Evolveum/midpoint/commit/5bf1b4889f2e8591135eaf78ebf1c84c76f36113
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: fc7c455408ed8baece046351409cc9b749ea3485
https://github.com/Evolveum/midpoint/commit/fc7c455408ed8baece046351409cc9b749ea3485
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.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/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
Log Message:
-----------
MID-1949: Reconciliation of associations
Commit: 199e714e934f1d0f52566dd1f29df51696b3f97d
https://github.com/Evolveum/midpoint/commit/199e714e934f1d0f52566dd1f29df51696b3f97d
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
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/sync/SynchronizationService.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
Log Message:
-----------
Fixing TestImportRecon.test510 (+ a few typos)
Commit: d062f494518cf2045caabf8ffa4ee93bd7a13cde
https://github.com/Evolveum/midpoint/commit/d062f494518cf2045caabf8ffa4ee93bd7a13cde
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
Log Message:
-----------
More serious implementation of MID-1949, taking explicitReferentialIntegrity parameter into account.
Commit: 025e32455cc5461f6fdc42b685554985ce6de77d
https://github.com/Evolveum/midpoint/commit/025e32455cc5461f6fdc42b685554985ce6de77d
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M samples/resources/ad/ad-resource-groups-advanced.xml
M samples/resources/ad/ad-resource-groups-basic.xml
Log Message:
-----------
Fixing gensync AD resource samples.
Commit: 5e196b4b5ebddecc6d0e00f26dd9eded8288048b
https://github.com/Evolveum/midpoint/commit/5e196b4b5ebddecc6d0e00f26dd9eded8288048b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-06-29 (Sun, 29 Jun 2014)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
Log Message:
-----------
Fixed logging in recon processor.
Commit: 903728c915e37852275c600f4aacc4dd0e75a939
https://github.com/Evolveum/midpoint/commit/903728c915e37852275c600f4aacc4dd0e75a939
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
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/util/ObjectWrapperUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.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/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.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/RefinedAssociationDefinition.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/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.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/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskResult.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/sync/account-andre-dummy.xml
A model/model-intest/src/test/resources/sync/account-augustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-cruff-dummy.xml
A model/model-intest/src/test/resources/sync/account-kenny-dummy.xml
A model/model-intest/src/test/resources/sync/account-lechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tandre-dummy.xml
A model/model-intest/src/test/resources/sync/account-taugustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlafoot-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tpalido-dummy.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
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/any/RAnyConverter.java
A samples/resources/ad/ad-resource-groups-advanced.xml
A samples/resources/ad/ad-resource-groups-basic.xml
R samples/resources/ad/ad-resource-groups.xml
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 350d17555ad2e580af32b968745fae3770c09d42
https://github.com/Evolveum/midpoint/commit/350d17555ad2e580af32b968745fae3770c09d42
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html
Log Message:
-----------
Small fix for buttons in assignment and add account popups on user details page
Commit: 2dcc9d257351777dc12b6320ffde3fc7d6a2e370
https://github.com/Evolveum/midpoint/commit/2dcc9d257351777dc12b6320ffde3fc7d6a2e370
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html
Log Message:
-----------
Merge branch 'master' into gui-devel
Compare: https://github.com/Evolveum/midpoint/compare/c20f638b282f...2dcc9d257351
More information about the midPoint-svn
mailing list