<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>katkav</b></td></tr>
<tr><td>Date:</td><td>2013-03-22 10:36:34 +0100 (Fri, 22 Mar 2013)</td></tr>
<tr><td>New Revision: </td><td>5354</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
fix for MID-979, MID-1056 improved consistency model for object already exists situation..<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java?r=5354"><see></a><br/>
trunk/testing/consistency-mechanism/src/test/resources/repo/account-chuck.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/testing/consistency-mechanism/src/test/resources/repo/account-chuck.xml?r=5354"><see></a><br/>
trunk/testing/consistency-mechanism/src/test/resources/repo/account-herman.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/testing/consistency-mechanism/src/test/resources/repo/account-herman.xml?r=5354"><see></a><br/>
trunk/testing/consistency-mechanism/src/test/resources/repo/user-herman.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/testing/consistency-mechanism/src/test/resources/repo/user-herman.xml?r=5354"><see></a><br/>
trunk/testing/consistency-mechanism/src/test/resources/request/user-chuck.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/testing/consistency-mechanism/src/test/resources/request/user-chuck.xml?r=5354"><see></a><br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java?r2=5354&r1=5353"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java?r2=5354&r1=5353"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java?r2=5354&r1=5353"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java?r2=5354&r1=5353"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java?r2=5354&r1=5353"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java?r2=5354&r1=5353"><see></a><br/>
trunk/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java?r2=5354&r1=5353"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java?r2=5354&r1=5353"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java?r2=5354&r1=5353"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java?r2=5354&r1=5353"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AccountValuesProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AccountValuesProcessor.java?r2=5354&r1=5353"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizationService.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizationService.java?r2=5354&r1=5353"><see></a><br/>
trunk/model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java?r2=5354&r1=5353"><see></a><br/>
trunk/testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java?r2=5354&r1=5353"><see></a><br/>
trunk/testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml?r2=5354&r1=5353"><see></a><br/>
</div>
</body></html>