<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>mserbak</b></td></tr>
<tr><td>Date:</td><td>2012-08-22 15:52:34 +0200 (Wed, 22 Aug 2012)</td></tr>
<tr><td>New Revision: </td><td>4055</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Joining importFromFile and importFromXml into one importObject page<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html?r=4055"><see></a><br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java?r=4055"><see></a><br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.properties?r=4055"><see></a><br/>
</div>
<b>Removed:</b><div style='padding-left: 20px; color:red; text-decoration:line-through;'>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportFile.html<br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportFile.java<br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportFile.properties<br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportXml.html<br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportXml.java<br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportXml.properties<br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration.java?r2=4055&r1=4054"><see></a><br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration.properties?r2=4055&r1=4054"><see></a><br/>
trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java?r2=4055&r1=4054"><see></a><br/>
</div>
</body></html>