svn commit: r1632362 - /sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java

[tommaso]

Author: tommaso
Date: Thu Oct 16 15:49:47 2014
New Revision: 1632362

URL: http://svn.apache.org/r1632362
Log:
SLING-4062 - set VLT pb ACL handling to overwrite

Modified:
    
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java

Modified: 
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java?rev=1632362&r1=1632361&r2=1632362&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilder.java
 Thu Oct 16 15:49:47 2014
@@ -28,6 +28,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
 import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
 import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
+import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
 import org.apache.jackrabbit.vault.fs.io.ImportOptions;
 import org.apache.jackrabbit.vault.packaging.ExportOptions;
 import org.apache.jackrabbit.vault.packaging.Packaging;
@@ -158,7 +159,7 @@ public class FileVaultReplicationPackage
                 VaultPackage pkg = packaging.getPackageManager().open(file);
                 ImportOptions opts = new ImportOptions();
                 // TODO : make it possible to expose the VLT ImportMode / 
ACLHandling in a generic way (from the ReplicationRequest?)
-//                opts.setImportMode(ImportMode.MERGE);
+                opts.setAccessControlHandling(AccessControlHandling.OVERWRITE);
                 pkg.extract(session, opts);
                 return true;
             }