sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomm...@apache.org
Subject svn commit: r1636906 - in /sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication: agent/impl/ component/ serialization/impl/vlt/
Date Wed, 05 Nov 2014 15:49:46 GMT
Author: tommaso
Date: Wed Nov  5 15:49:46 2014
New Revision: 1636906

URL: http://svn.apache.org/r1636906
Log:
SLING-4084 - fixed wrong property name for vlt importmode

Modified:
    sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
    sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java
    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/agent/impl/CoordinatingReplicationAgentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java?rev=1636906&r1=1636905&r2=1636906&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
(original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CoordinatingReplicationAgentFactory.java
Wed Nov  5 15:49:46 2014
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;

Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java?rev=1636906&r1=1636905&r2=1636906&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java
(original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/component/ReplicationComponentFactory.java
Wed Nov  5 15:49:46 2014
@@ -280,14 +280,13 @@ public interface ReplicationComponentFac
     /**
      * import mode property for file vault package builder
      */
-    String PACKAGE_BUILDER_FILEVLT_IMPORT_MODE = "importOptions";
+    String PACKAGE_BUILDER_FILEVLT_IMPORT_MODE = "importMode";
 
     /**
      * ACL handling property for file vault package builder
      */
     String PACKAGE_BUILDER_FILEVLT_ACLHANDLING = "aclHandling";
 
-
     /**
      * queue provider job type
      */
@@ -313,10 +312,6 @@ public interface ReplicationComponentFac
      */
     String QUEUE_DISTRIBUTION_STRATEGY_PRIORITY_PROPERTY_PATHS = "priority.paths";
 
-
-
-
-
     /**
      * create a {@link ReplicationComponent}
      *

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=1636906&r1=1636905&r2=1636906&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
Wed Nov  5 15:49:46 2014
@@ -172,6 +172,7 @@ public class FileVaultReplicationPackage
                 ImportOptions opts = new ImportOptions();
                 if (aclHandling != null) {
                     opts.setAccessControlHandling(aclHandling);
+                    log.debug("using acl handling {}", aclHandling);
                 }
                 else {
                     // default to overwrite
@@ -179,6 +180,7 @@ public class FileVaultReplicationPackage
                 }
                 if (importMode != null) {
                     opts.setImportMode(importMode);
+                    log.debug("using import mode {}", importMode);
                 }
                 else {
                     // default to replace



Mime
View raw message