<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>mamut</b></td></tr>
<tr><td>Date:</td><td>2012-09-11 12:31:00 +0200 (Tue, 11 Sep 2012)</td></tr>
<tr><td>New Revision: </td><td>263</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merged revisions 213-220 via svnmerge from <br/>
https://svn.evolveum.com/icf/forgerock<br/>
<br/>
........<br/>
  r213 | mamut | 2012-09-10 18:35:55 +0200 (Mon, 10 Sep 2012) | 5 lines<br/>
  <br/>
  r6216 | gael | 2012-03-07 13:19:16 +0100 (Wed, 07 Mar 2012) | 1 line<br/>
  Changed paths:<br/>
     M /trunk/connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/CSVFileConnector.java<br/>
  <br/>
  Fixes JIRA OPENIDM-9 & OPENIDM-20<br/>
........<br/>
  r214 | mamut | 2012-09-10 19:00:07 +0200 (Mon, 10 Sep 2012) | 2 lines<br/>
  <br/>
  add support to moved or coppied dirs<br/>
........<br/>
  r215 | mamut | 2012-09-10 19:04:20 +0200 (Mon, 10 Sep 2012) | 1 line<br/>
  <br/>
  ANother script fix<br/>
........<br/>
  r216 | mamut | 2012-09-10 19:24:53 +0200 (Mon, 10 Sep 2012) | 2 lines<br/>
  <br/>
  try to fix <br/>
........<br/>
  r217 | mamut | 2012-09-10 19:38:31 +0200 (Mon, 10 Sep 2012) | 1 line<br/>
  <br/>
  fixed cp/mv importing<br/>
........<br/>
  r218 | mamut | 2012-09-11 08:57:15 +0200 (Tue, 11 Sep 2012) | 1 line<br/>
  <br/>
  fixx unexpected copy form older version :-(<br/>
........<br/>
  r219 | mamut | 2012-09-11 08:58:03 +0200 (Tue, 11 Sep 2012) | 8 lines<br/>
  <br/>
  r6217 | Laszlo | 2012-03-09 08:45:11 +0100 (Fri, 09 Mar 2012) | 1 line<br/>
  Changed paths:<br/>
     M /trunk/connectors/java/xml/src/main/java/com/forgerock/openicf/xml/XMLFilterTranslator.java<br/>
     M /trunk/connectors/java/xml/src/main/java/com/forgerock/openicf/xml/XMLHandlerImpl.java<br/>
     M /trunk/connectors/java/xml/src/test/java/com/forgerock/openicf/xml/tests/XMLConnectorTests.java<br/>
     M /trunk/connectors/java/xml/src/test/java/com/forgerock/openicf/xml/tests/XmlConnectorTestUtil.java<br/>
  <br/>
  [OPENICF-21] Small fix of query injection. Needs more testing.<br/>
........<br/>
  r220 | mamut | 2012-09-11 09:03:27 +0200 (Tue, 11 Sep 2012) | 44 lines<br/>
  <br/>
  r6218 | Laszlo | 2012-03-15 11:40:52 +0100 (Thu, 15 Mar 2012) | 1 line<br/>
  Changed paths:<br/>
     M /trunk/connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/CSVFileConnector.java<br/>
     M /trunk/connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/util/Utils.java<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/deleteOp/before-delete-backup.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/deleteOp/delete-after-double-create-backup.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-after-create.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create-delete-second.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create-delete.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/authenticate.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/config.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/create-backup-empty.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/create-backup.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/create-result-with-pwd.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/delete-backup.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/delete-result.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/pipe-backup-1.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/pipe-backup.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/resolve.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/schema-bad-pwd.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/schema-bad-unique.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/schema-good.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/search.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/sync-bad.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/sync-token.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/sync.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/test-bad.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-backup.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-1.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-multi-1.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-multi.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-non-existing.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-1.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-multi-1.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-multi.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-backup.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-result-add.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-result-delete.csv<br/>
     M /trunk/connectors/java/csvfile/src/test/resources/files/update-result-non-existing.csv<br/>
  <br/>
  [OPENICF-22] The HEADER remain unchanged when update operation is called. Future fix would enforce to comply with http://tools.ietf.org/html/rfc4180 and update the header.  <br/>
........<br/>
<br/>
</div><hr/>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/CSVFileConnector.java   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/CSVFileConnector.java?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/util/Utils.java   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/main/java/org/forgerock/openicf/csvfile/util/Utils.java?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/deleteOp/before-delete-backup.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/deleteOp/before-delete-backup.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/deleteOp/delete-after-double-create-backup.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/deleteOp/delete-after-double-create-backup.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-after-create.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-after-create.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create-delete-second.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create-delete-second.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create-delete.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create-delete.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/deleteOp/expected-double-create.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/authenticate.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/authenticate.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/config.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/config.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/create-backup-empty.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/create-backup-empty.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/create-backup.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/create-backup.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/create-result-with-pwd.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/create-result-with-pwd.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/delete-backup.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/delete-backup.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/delete-result.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/delete-result.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/pipe-backup-1.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/pipe-backup-1.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/pipe-backup.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/pipe-backup.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/resolve.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/resolve.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/schema-bad-pwd.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/schema-bad-pwd.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/schema-bad-unique.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/schema-bad-unique.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/schema-good.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/schema-good.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/search.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/search.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/sync-bad.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/sync-bad.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/sync-token.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/sync-token.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/sync.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/sync.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/test-bad.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/test-bad.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-backup.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-backup.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-1.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-1.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-multi-1.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-multi-1.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-multi.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add-multi.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-add.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-non-existing.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-non-existing.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-1.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-1.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-multi-1.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-multi-1.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-multi.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove-multi.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-attribute-result-remove.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-backup.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-backup.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-result-add.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-result-add.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-result-delete.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-result-delete.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/csvfile/src/test/resources/files/update-result-non-existing.csv   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/csvfile/src/test/resources/files/update-result-non-existing.csv?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/xml/src/main/java/com/forgerock/openicf/xml/XMLFilterTranslator.java   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/xml/src/main/java/com/forgerock/openicf/xml/XMLFilterTranslator.java?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/xml/src/main/java/com/forgerock/openicf/xml/XMLHandlerImpl.java   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/xml/src/main/java/com/forgerock/openicf/xml/XMLHandlerImpl.java?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/xml/src/test/java/com/forgerock/openicf/xml/tests/XMLConnectorTests.java   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/xml/src/test/java/com/forgerock/openicf/xml/tests/XMLConnectorTests.java?r2=263&r1=262"><see></a><br/>
trunk/connectors/java/xml/src/test/java/com/forgerock/openicf/xml/tests/XmlConnectorTestUtil.java   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/connectors/java/xml/src/test/java/com/forgerock/openicf/xml/tests/XmlConnectorTestUtil.java?r2=263&r1=262"><see></a><br/>
trunk/synchronize.sh   <a href="http://fisheye.evolveum.com/browse/ICF/trunk/synchronize.sh?r2=263&r1=262"><see></a><br/>
</div>
</body></html>