<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>lazyman</b></td></tr>
<tr><td>Date:</td><td>2013-02-26 15:40:45 +0100 (Tue, 26 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5187</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5186<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/infra/common/src/test/resources/mapping/mapping-generate-policy-bad.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/mapping/mapping-generate-policy-bad.xml?r=5187"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/mapping/mapping-generate-policy-numeric.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/mapping/mapping-generate-policy-numeric.xml?r=5187"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111112.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111112.xml?r=5187"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml?r=5187"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/policy/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/policy/?r=5187"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/schema/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/schema/?r=5187"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultRunner.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultRunner.java?r=5187"><see></a><br/>
branches/wicket6/infra/schema/src/test/resources/deltaconverter/user-modify-givenname.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/test/resources/deltaconverter/user-modify-givenname.xml?r=5187"><see></a><br/>
branches/wicket6/samples/policy/numeric-pin-policy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/policy/numeric-pin-policy.xml?r=5187"><see></a><br/>
branches/wicket6/testing/sanity/src/test/resources/request/user-modify-givenname.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/testing/sanity/src/test/resources/request/user-modify-givenname.xml?r=5187"><see></a><br/>
</div>
<b>Removed:</b><div style='padding-left: 20px; color:red; text-decoration:line-through;'>
branches/wicket6/infra/common/src/test/resources/password-policy-complex.xml<br/>
branches/wicket6/infra/common/src/test/resources/password-policy-minimal.xml<br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
branches/wicket6/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/AccountChangesDto.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/AccountChangesDto.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/resources/admin.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/resources/admin.xml?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/GenerateExpressionEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/GenerateExpressionEvaluator.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAccountDefinition.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAccountDefinition.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/MappingTestEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/MappingTestEvaluator.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/TestMappingDynamic.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/TestMappingDynamic.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/test/PasswordPolicyValidatorTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/test/PasswordPolicyValidatorTest.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/refinery/account-jack.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/refinery/account-jack.xml?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/refinery/resource-complex.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/refinery/resource-complex.xml?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/JaxbTypeConverter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/JaxbTypeConverter.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceObjectShadowUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceObjectShadowUtil.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-api/src/main/java/com/evolveum/midpoint/model/security/api/PrincipalUser.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-api/src/main/java/com/evolveum/midpoint/model/security/api/PrincipalUser.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskHandler.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskHandler.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy.xml?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceContoller.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceContoller.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningOperationOptions.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningOperationOptions.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java?r2=5187&r1=5186"><see></a><br/>
branches/wicket6/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java?r2=5187&r1=5186"><see></a><br/>
</div>
</body></html>