<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-03-01 21:27:32 +0100 (Fri, 01 Mar 2013)</td></tr>
<tr><td>New Revision: </td><td>5227</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5226<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/ProvisioningScriptSpec.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/ProvisioningScriptSpec.java?r=5227"><see></a><br/>
branches/wicket6/tools/repo-ninja/src/other/ninja.sh <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/tools/repo-ninja/src/other/ninja.sh?r=5227"><see></a><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=5227&r1=5226"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/NavigatorPanel.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/NavigatorPanel.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxColumn.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxColumn.java?r2=5227&r1=5226"><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=5227&r1=5226"><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=5227&r1=5226"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageAdminHome.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageAdminHome.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java?r2=5227&r1=5226"><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=5227&r1=5226"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/LiteralExpressionEvaluatorFactory.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/LiteralExpressionEvaluatorFactory.java?r2=5227&r1=5226"><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=5227&r1=5226"><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=5227&r1=5226"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd?r2=5227&r1=5226"><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=5227&r1=5226"><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=5227&r1=5226"><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=5227&r1=5226"><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=5227&r1=5226"><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=5227&r1=5226"><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=5227&r1=5226"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowConverter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowConverter.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/Change.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/Change.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ExecuteScriptArgument.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ExecuteScriptArgument.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/test/resources/impl/dummy/script-add.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/test/resources/impl/dummy/script-add.xml?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/repo/repo-test-util/pom.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-test-util/pom.xml?r2=5227&r1=5226"><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=5227&r1=5226"><see></a><br/>
branches/wicket6/samples/resources/databasetable/localhost-dbtable-advanced-sync.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/databasetable/localhost-dbtable-advanced-sync.xml?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/tools/repo-ninja/pom.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/tools/repo-ninja/pom.xml?r2=5227&r1=5226"><see></a><br/>
branches/wicket6/tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java?r2=5227&r1=5226"><see></a><br/>
</div>
</body></html>