svn commit: r1717293 - in /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli: MigrationFactory.java parser/StoreArguments.java

[jsedding]

Author: jsedding
Date: Mon Nov 30 16:36:04 2015
New Revision: 1717293

URL: http://svn.apache.org/viewvc?rev=1717293&view=rev
Log:
OAK-3685 - Support S3DataSource as the migration source

- use skipLongNames option in command line implementation

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java?rev=1717293&r1=1717292&r2=1717293&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
 Mon Nov 30 16:36:04 2015
@@ -90,6 +90,7 @@ public class MigrationFactory {
         if (options.getMergePaths() != null) {
             upgrade.setMerges(options.getMergePaths());
         }
+        upgrade.setSkipLongNames(stores.isSkipLongNames());
         upgrade.setSkipOnError(!options.isFailOnError());
         upgrade.setEarlyShutdown(options.isEarlyShutdown());
         ServiceLoader<CommitHook> loader = 
ServiceLoader.load(CommitHook.class);
@@ -112,6 +113,7 @@ public class MigrationFactory {
         if (options.getMergePaths() != null) {
             sidegrade.setMerges(options.getMergePaths());
         }
+        sidegrade.setSkipLongNames(stores.isSkipLongNames());
         return sidegrade;
     }
 

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java?rev=1717293&r1=1717292&r2=1717293&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java
 Mon Nov 30 16:36:04 2015
@@ -122,6 +122,10 @@ public class StoreArguments {
         return false;
     }
 
+    public boolean isSkipLongNames() {
+        return dst.getType() != SEGMENT;
+    }
+
     public String[] getSrcPaths() {
         return src.getPaths();
     }