<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>semancik</b></td></tr>
<tr><td>Date:</td><td>2013-07-03 09:38:20 +0200 (Wed, 03 Jul 2013)</td></tr>
<tr><td>New Revision: </td><td>6036</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Fixing iterations (and many other things)<br/>
<br/>
Iterations now store iteration and iterationToken in the shadow. This is used for further recomputation.<br/>
Several minor fixes in prism (mostly null-proofing).<br/>
Optimization (or more like rationalization) of script expression execution: the expression is not executed twice if there was not delta.<br/>
Extra expression tests in common.<br/>
Query dump fixes and minor output formatting fixes.<br/>
<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/ExpressionTestUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/ExpressionTestUtil.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestExpression.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestExpression.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestExpressionUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestExpressionUtil.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestStaticValues.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestStaticValues.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/ <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/AbstractScriptTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/AbstractScriptTest.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestGroovyExpressions.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestGroovyExpressions.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestJavaScriptExpressions.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestJavaScriptExpressions.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestMidPointFunctions.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestMidPointFunctions.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestXPathExpressions.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestXPathExpressions.java?r=6036"><see></a><br/>
trunk/infra/common/src/test/resources/expression/expression/ <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/resources/expression/expression/?r=6036"><see></a><br/>
trunk/infra/common/src/test/resources/expression/expression/account-jack-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/resources/expression/expression/account-jack-dummy.xml?r=6036"><see></a><br/>
trunk/infra/common/src/test/resources/expression/expression/iteration-condition.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/resources/expression/expression/iteration-condition.xml?r=6036"><see></a><br/>
trunk/infra/common/src/test/resources/expression/expression/user-jack.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/resources/expression/expression/user-jack.xml?r=6036"><see></a><br/>
</div>
<b>Removed:</b><div style='padding-left: 20px; color:red; text-decoration:line-through;'>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/AbstractScriptTest.java<br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestExpressionUtil.java<br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestGroovyExpressions.java<br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestJavaScriptExpressions.java<br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestMidPointFunctions.java<br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestStaticValues.java<br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestXPathExpressions.java<br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/Expression.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/Expression.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ExpressionUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ExpressionUtil.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ObjectDeltaObject.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ObjectDeltaObject.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpression.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpression.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpressionEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpressionEvaluator.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptVariables.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptVariables.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/mapping/Mapping.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/mapping/Mapping.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/main/java/com/evolveum/midpoint/common/monitor/InternalMonitor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/main/java/com/evolveum/midpoint/common/monitor/InternalMonitor.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/MappingTestEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/MappingTestEvaluator.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/common/testng.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/common/testng.xml?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java?r2=6036&r1=6035"><see></a><br/>
trunk/infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MidpointAspect.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MidpointAspect.java?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java?r2=6036&r1=6035"><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=6036&r1=6035"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java?r2=6036&r1=6035"><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=6036&r1=6035"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/OutboundProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/OutboundProcessor.java?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java?r2=6036&r1=6035"><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=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-elaine-dummy-blue.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-elaine-dummy-blue.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-elaine-dummy-red.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-elaine-dummy-red.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-elaine-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-elaine-dummy.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-guybrush-dummy-red.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-guybrush-dummy-red.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-guybrush-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-guybrush-dummy.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-herman-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-herman-dummy.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-herman-opendj.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-herman-opendj.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-jack-dummy-red.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-jack-dummy-red.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-shadow-guybrush-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-shadow-guybrush-dummy.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/common/account-shadow-jack-dummy.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/common/account-shadow-jack-dummy.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/iteration/resource-dummy-magenta.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/iteration/resource-dummy-magenta.xml?r2=6036&r1=6035"><see></a><br/>
trunk/model/model-intest/src/test/resources/logback-test.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-intest/src/test/resources/logback-test.xml?r2=6036&r1=6035"><see></a><br/>
trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java?r2=6036&r1=6035"><see></a><br/>
trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java?r2=6036&r1=6035"><see></a><br/>
trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java?r2=6036&r1=6035"><see></a><br/>
trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java?r2=6036&r1=6035"><see></a><br/>
trunk/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java?r2=6036&r1=6035"><see></a><br/>
trunk/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-morgan.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-morgan.xml?r2=6036&r1=6035"><see></a><br/>
trunk/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java?r2=6036&r1=6035"><see></a><br/>
</div>
</body></html>