You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2016/08/29 16:26:40 UTC
svn commit: r1758256 - in
/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser:
StoreArguments.java StoreType.java
Author: tomekr
Date: Mon Aug 29 16:26:39 2016
New Revision: 1758256
URL: http://svn.apache.org/viewvc?rev=1758256&view=rev
Log:
OAK-4720: segment-tar should be used for 1-argument JCR2 upgrade
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreArguments.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
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=1758256&r1=1758255&r2=1758256&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 Aug 29 16:26:39 2016
@@ -141,7 +141,7 @@ public class StoreArguments {
}
public boolean isInPlaceUpgrade() {
- if (src.getType() == JCR2_DIR_XML && dst.getType() == SEGMENT) {
+ if (src.getType() == JCR2_DIR_XML && dst.getType() == SEGMENT_TAR) {
return src.getPath().equals(dst.getPath());
}
return false;
@@ -167,7 +167,7 @@ public class StoreArguments {
StoreType type = getMatchingType(argument);
if (type == JCR2_DIR) {
if (jcr2Dir) {
- type = SEGMENT;
+ type = SEGMENT_TAR;
}
jcr2Dir = true;
}
@@ -225,7 +225,7 @@ public class StoreArguments {
StoreType type = descriptors.get(0).getType();
if (type == JCR2_DIR_XML) {
String crx2Dir = descriptors.get(0).getPath();
- descriptors.add(new StoreDescriptor(SEGMENT, crx2Dir));
+ descriptors.add(new StoreDescriptor(SEGMENT_TAR, crx2Dir));
log.info("In place migration between JCR2 and SegmentNodeStore in {}", crx2Dir);
}
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java?rev=1758256&r1=1758255&r2=1758256&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java Mon Aug 29 16:26:39 2016
@@ -159,7 +159,7 @@ public enum StoreType {
return t;
}
}
- return SEGMENT;
+ return SEGMENT_TAR;
}
public abstract boolean matches(String argument);