Author: tomekr Date: Mon Dec 3 11:09:25 2018 New Revision: 1848033 URL: http://svn.apache.org/viewvc?rev=1848033&view=rev Log: OAK-7925: OakUpgrade for RDBMK: user name and password must match
- don't try to login for unsupported cases Patch for the OAK-7925 provided by @tmueller - thanks! Modified: jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentTest.java jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentWithMetadataTest.java jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToJdbcTest.java jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java Modified: jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1848033&r1=1848032&r2=1848033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original) +++ jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Mon Dec 3 11:09:25 2018 @@ -127,7 +127,7 @@ public class MigrationOptions { this.forceCheckpoints = args.hasOption(OptionParserFactory.FORCE_CHECKPOINTS); this.srcUser = args.getOption(OptionParserFactory.SRC_USER); - this.srcPassword = args.getOption(OptionParserFactory.SRC_USER); + this.srcPassword = args.getOption(OptionParserFactory.SRC_PASSWORD); this.dstUser = args.getOption(OptionParserFactory.DST_USER); this.dstPassword = args.getOption(OptionParserFactory.DST_PASSWORD); Modified: jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentTest.java?rev=1848033&r1=1848032&r2=1848033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentTest.java Mon Dec 3 11:09:25 2018 @@ -45,7 +45,7 @@ public class JdbcToSegmentTest extends A @Override protected String[] getArgs() { - return new String[] { "--src-user", "sa", "--src-password", "sa", source.getDescription(), + return new String[] { "--src-user", "sa", "--src-password", "pwd", source.getDescription(), destination.getDescription() }; } Modified: jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentWithMetadataTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentWithMetadataTest.java?rev=1848033&r1=1848032&r2=1848033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentWithMetadataTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/JdbcToSegmentWithMetadataTest.java Mon Dec 3 11:09:25 2018 @@ -51,7 +51,7 @@ public class JdbcToSegmentWithMetadataTe @Override protected String[] getArgs() { - return new String[] { "--src-user", "sa", "--src-password", "sa", source.getDescription(), + return new String[] { "--src-user", "sa", "--src-password", "pwd", source.getDescription(), destination.getDescription() }; } Modified: jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToJdbcTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToJdbcTest.java?rev=1848033&r1=1848032&r2=1848033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToJdbcTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToJdbcTest.java Mon Dec 3 11:09:25 2018 @@ -46,7 +46,7 @@ public class SegmentToJdbcTest extends A @Override protected String[] getArgs() { - return new String[] { "--disable-mmap", "--user", "sa", "--password", "sa", source.getDescription(), + return new String[] { "--disable-mmap", "--user", "sa", "--password", "pwd", source.getDescription(), destination.getDescription() }; } Modified: jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java?rev=1848033&r1=1848032&r2=1848033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java (original) +++ jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java Mon Dec 3 11:09:25 2018 @@ -85,14 +85,16 @@ public class CopyBinariesTest extends Ab "Copy references, no blobstores defined, document -> segment-tar", new JdbcNodeStoreContainer(blob), new SegmentNodeStoreContainer(blob), - asList("--src-user=sa", "--src-password=sa"), + asList("--src-user=sa", "--src-password=pwd"), DatastoreArguments.BlobMigrationCase.COPY_REFERENCES }); params.add(new Object[]{ "Copy references, no blobstores defined, segment-tar -> document", new SegmentTarNodeStoreContainer(blob), new JdbcNodeStoreContainer(blob), - asList("--user=sa", "--password=sa"), + // user name and password are not used, as no login is attepted + // for unsupported migration use cases + asList("--user=unused", "--password=unused"), DatastoreArguments.BlobMigrationCase.UNSUPPORTED }); params.add(new Object[]{ Modified: jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java?rev=1848033&r1=1848032&r2=1848033&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java (original) +++ jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java Mon Dec 3 11:09:25 2018 @@ -53,7 +53,7 @@ public class JdbcNodeStoreContainer impl this.blob = blob; this.h2Dir = Files.createTempDirectory(Paths.get("target"), "repo-h2").toFile(); this.jdbcUri = String.format("jdbc:h2:%s", h2Dir.getAbsolutePath() + "/JdbcNodeStoreContainer"); - this.jdbcFactory = new JdbcFactory(jdbcUri, 2, "sa", "sa", false); + this.jdbcFactory = new JdbcFactory(jdbcUri, 2, "sa", "pwd", false); } @Override