<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-22 14:41:54 +0100 (Fri, 22 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5143</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5141<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/functions/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/functions/?r=5143"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AccountOperation.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AccountOperation.java?r=5143"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/CarefulAnt.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/CarefulAnt.java?r=5143"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/ResourceCarefulAntUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/ResourceCarefulAntUtil.java?r=5143"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/SqlRepoTestUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/SqlRepoTestUtil.java?r=5143"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ResourceModifyTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ResourceModifyTest.java?r=5143"><see></a><br/>
</div>
<b>Removed:</b><div style='padding-left: 20px; color:red; text-decoration:line-through;'>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/BasicExpressionFunctions.java<br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/BasicExpressionFunctionsXPath.java<br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/FunctionLibrary.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=5143&r1=5142"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html?r2=5143&r1=5142"><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=5143&r1=5142"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.properties?r2=5143&r1=5142"><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=5143&r1=5142"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/PasswordPanel.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/PasswordPanel.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/orgStruct/StyledLinkLabel.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/orgStruct/StyledLinkLabel.java?r2=5143&r1=5142"><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=5143&r1=5142"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgStruct.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgStruct.java?r2=5143&r1=5142"><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=5143&r1=5142"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java?r2=5143&r1=5142"><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=5143&r1=5142"><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=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ExpressionUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ExpressionUtil.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptEvaluator.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpression.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpression.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpressionFactory.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpressionFactory.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/jsr223/Jsr223ScriptEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/jsr223/Jsr223ScriptEvaluator.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/xpath/ReflectionXPathFunctionResolver.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/xpath/ReflectionXPathFunctionResolver.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/xpath/ReflectionXPathFunctionWrapper.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/xpath/ReflectionXPathFunctionWrapper.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/xpath/XPathScriptEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/xpath/XPathScriptEvaluator.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/expression/AbstractScriptTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/expression/AbstractScriptTest.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestMidPointFunctions.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestMidPointFunctions.java?r2=5143&r1=5142"><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=5143&r1=5142"><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=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/infra/util/src/main/java/com/evolveum/midpoint/util/logging/TraceManager.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/util/src/main/java/com/evolveum/midpoint/util/logging/TraceManager.java?r2=5143&r1=5142"><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=5143&r1=5142"><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=5143&r1=5142"><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=5143&r1=5142"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizationService.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizationService.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/model/model-impl/src/main/resources/ctx-model.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/resources/ctx-model.xml?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ConcurrencyTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ConcurrencyTest.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/testng.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/testng.xml?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java?r2=5143&r1=5142"><see></a><br/>
branches/wicket6/samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java?r2=5143&r1=5142"><see></a><br/>
</div>
</body></html>