svn commit: r1824283 - in /jackrabbit/commons/filevault/trunk: RELEASE-NOTES.txt vault-doc/src/site/markdown/importmode.md

[tr...@apache.org]

Author: tripod
Date: Thu Feb 15 06:29:17 2018
New Revision: 1824283

URL: http://svn.apache.org/viewvc?rev=1824283&view=rev
Log:
JCRVLT-255 ImportModes act on file serialization level not on node level

- update docu

Modified:
    jackrabbit/commons/filevault/trunk/RELEASE-NOTES.txt
    jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/importmode.md

Modified: jackrabbit/commons/filevault/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/RELEASE-NOTES.txt?rev=1824283&r1=1824282&r2=1824283&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/RELEASE-NOTES.txt (original)
+++ jackrabbit/commons/filevault/trunk/RELEASE-NOTES.txt Thu Feb 15 06:29:17 2018
@@ -21,7 +21,6 @@ Bug Fixes:
 * [JCRVLT-235] - Refuse to create snapshot for empty or root filters.
 * [JCRVLT-247] - Java 9 Support
 * [JCRVLT-250] - Test class "SimpleFileAggregateInPackage" not executed by default in maven-surefire-plugin
-* [JCRVLT-255] - ImportModes act on file serialization level not on node level
 * [JCRVLT-257] - ZipException: invalid code lengths set
 * [JCRVLT-258] - Default compression level incorrectly set to NO_COMPRESSION (0)
 * [JCRVLT-265] - JcrPackageDefinition.getDependencies() might return an array with a null element

Modified: jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/importmode.md
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/importmode.md?rev=1824283&r1=1824282&r2=1824283&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/importmode.md (original)
+++ jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/importmode.md Thu Feb 15 06:29:17 2018
@@ -70,6 +70,14 @@ Merging Group Members
 ---------------------
 `ImportMode.MERGE` has special semantics for Groups. In this case, the group members of the package are merged with the existing group members in the repository. This is especially useful when adding a new authorizable including its group membership.
 
+Merging of normal content
+-------------------------
+`ImportMode.MERGE` is not implemented completely (see [JCRVLT-255]). Merging works for generic artifacts (docview xmls) that represent authorizable or policy nodes (see aboce). Other generic artifacts are ignored when merging, which causes the entire subtree not to be updated. eg:
+
+if `foo.xml` contains `/foo/bar/a` and the repository already contains `/foo/bar/b` and the import mode is MERGE on `/foo`, then the content is not imported, i.e. `/foo/bar/a` is not created. however, if the import mode is MERGE on only on `/foo/bar` then `/foo/bar/a` is imported. Although it then rather behaves like UPDATE.
+ 
+The merging import mode is also respected for pure file artifacts, so that the node is not removed if the file is missing in the import.
+
 
 Scope of the workspace filter
 -----------------------------
@@ -80,4 +88,5 @@ However, the importer keeps track of pot
 <!-- references -->
 [api.WorkspaceFilter]: apidocs/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.html
 [api.ImportMode]: apidocs/org/apache/jackrabbit/vault/fs/api/ImportMode.html
-[api.ImportOptions]: apidocs/org/apache/jackrabbit/vault/fs/io/ImportOptions.html
\ No newline at end of file
+[api.ImportOptions]: apidocs/org/apache/jackrabbit/vault/fs/io/ImportOptions.html
+[JCRVLT-255]: https://issues.apache.org/jira/browse/JCRVLT-255
\ No newline at end of file