<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-05 18:03:51 +0100 (Tue, 05 Mar 2013)</td></tr>
<tr><td>New Revision: </td><td>5244</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5243<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/infra/common/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-norm.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-norm.xml?r=5244"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-op.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-op.xml?r=5244"><see></a><br/>
branches/wicket6/infra/common/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-orig.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/resources/mapping/mapping-script-system-variables-polystring-groovy-orig.xml?r=5244"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PartiallyResolvedValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PartiallyResolvedValue.java?r=5244"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestFind.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestFind.java?r=5244"><see></a><br/>
branches/wicket6/infra/prism/src/test/resources/common/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/resources/common/?r=5244"><see></a><br/>
</div>
<b>Removed:</b><div style='padding-left: 20px; color:red; text-decoration:line-through;'>
branches/wicket6/infra/prism/src/test/resources/parsing/<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=5244&r1=5243"><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=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ItemDeltaItem.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ItemDeltaItem.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ObjectDeltaObject.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/ObjectDeltaObject.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpressionEvaluator.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptExpressionEvaluator.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptVariables.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/ScriptVariables.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/SourceTriple.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/expression/script/SourceTriple.java?r2=5244&r1=5243"><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=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestExpressionUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/expression/TestExpressionUtil.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/TestMappingDynamic.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/test/java/com/evolveum/midpoint/common/mapping/TestMappingDynamic.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReference.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReference.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/UserType.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/UserType.java?r2=5244&r1=5243"><see></a><br/>
branches/wicket6/infra/prism/testng.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/testng.xml?r2=5244&r1=5243"><see></a><br/>
</div>
</body></html>