<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-28 14:01:20 +0100 (Thu, 28 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5212</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5211<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/infra/common/src/test/resources/policy/value-policy-generate.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/policy/value-policy-generate.xml?r=5212"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/policy/value-policy-must-be-first.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/policy/value-policy-must-be-first.xml?r=5212"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/policy/value-policy-random-pin.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/policy/value-policy-random-pin.xml?r=5212"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java?r=5212"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java?r=5212"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-yellow.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-yellow.xml?r=5212"><see></a><br/>
branches/wicket6/samples/policy/numeric-pin-first-nonzero-all-unique-policy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/policy/numeric-pin-first-nonzero-all-unique-policy.xml?r=5212"><see></a><br/>
branches/wicket6/samples/policy/numeric-pin-first-nonzero-policy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/policy/numeric-pin-first-nonzero-policy.xml?r=5212"><see></a><br/>
branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-advanced-multi-nosync.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-advanced-multi-nosync.xml?r=5212"><see></a><br/>
branches/wicket6/samples/resources/csvfile/midpoint-flatfile-multi.csv <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/csvfile/midpoint-flatfile-multi.csv?r=5212"><see></a><br/>
branches/wicket6/samples/resources/databasetable/create-simple-idm-table-2.mysql <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/databasetable/create-simple-idm-table-2.mysql?r=5212"><see></a><br/>
branches/wicket6/samples/resources/databasetable/localhost-dbtable-advanced-nosync-2.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/databasetable/localhost-dbtable-advanced-nosync-2.xml?r=5212"><see></a><br/>
</div>
<b>Removed:</b><div style='padding-left: 20px; color:red; text-decoration:line-through;'>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestImportRecon.java<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=5212&r1=5211"><see></a><br/>
branches/wicket6/build-system/pom.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/build-system/pom.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java?r2=5212&r1=5211"><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=5212&r1=5211"><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=5212&r1=5211"><see></a><br/>
branches/wicket6/icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/mapping/Mapping.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/mapping/Mapping.java?r2=5212&r1=5211"><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=5212&r1=5211"><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=5212&r1=5211"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ActivationProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ActivationProcessor.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/OutboundProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/OutboundProcessor.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java?r2=5212&r1=5211"><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=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java?r2=5212&r1=5211"><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=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java?r2=5212&r1=5211"><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=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/account-jack-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/account-jack-dummy.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/connector-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/connector-dummy.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-blue.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-blue.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-green.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-green.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-red.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/resource-dummy-red.xml?r2=5212&r1=5211"><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=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/role-dummies.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/role-dummies.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/user-administrator.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/user-administrator.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/user-barbossa.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/user-barbossa.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/common/user-largo.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/common/user-largo.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/contract/user-blackbeard-account-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/contract/user-blackbeard-account-dummy.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/contract/user-morgan-assignment-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/contract/user-morgan-assignment-dummy.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/src/test/resources/logback-test.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/resources/logback-test.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-intest/testng.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/testng.xml?r2=5212&r1=5211"><see></a><br/>
branches/wicket6/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java?r2=5212&r1=5211"><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=5212&r1=5211"><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=5212&r1=5211"><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=5212&r1=5211"><see></a><br/>
branches/wicket6/samples/resources/databasetable/drop-simple-idm-table.mysql <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/databasetable/drop-simple-idm-table.mysql?r2=5212&r1=5211"><see></a><br/>
</div>
</body></html>