Do not convert the sshExecutable to Unix path convention (fix for Windows) and...

Do not convert the sshExecutable to Unix path convention (fix for Windows) and convert it from a relative to an absolute path.

SVN: 26546

common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopier.java

@@ -640,7 +640,7 @@ public final class RsyncCopier implements IPathCopier, IDirectoryImmutableCopier
 
     private final static String getSshExecutableArgument(final String sshExecutable)
     {
-        return toUnix(sshExecutable) + " -oBatchMode=yes";
+        return new File(sshExecutable).getAbsolutePath() + " -oBatchMode=yes";
     }
 
     /**

common/sourceTest/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopierTest.java

@@ -379,6 +379,29 @@ public final class RsyncCopierTest
         assertEquals(expectedRsyncCmdLine, observedRsyncCmdLine);
     }
 
+    @Test(groups =
+        { "requires_unix" })
+    public void testRsyncWithSSHDirectoryOK() throws IOException, InterruptedException
+    {
+        final File parametersLogFile = new File(workingDirectory, "parameters.log");
+        final File loggingRsyncBinary =
+                createRsync("2.6.7",
+                        String.format("echo \"$@\" > %s", parametersLogFile.getAbsolutePath()));
+        final RsyncCopier copier =
+                new RsyncCopier(loggingRsyncBinary, new File("ssh"), false, false);
+        final Status status =
+                copier.copyToRemote(sourceDirectory, destinationDirectory.getAbsolutePath(),
+                        "localhost", null, null);
+        assertEquals(Status.OK, status);
+        final String expectedRsyncCmdLine =
+                String.format(
+                        "--archive --delete-before --inplace --append --rsh %s -oBatchMode=yes %s localhost:%s/\n",
+                        new File("ssh").getAbsolutePath(), sourceDirectory.getAbsolutePath(),
+                        destinationDirectory.getAbsolutePath());
+        final String observedRsyncCmdLine = FileUtilities.loadToString(parametersLogFile);
+        assertEquals(expectedRsyncCmdLine, observedRsyncCmdLine);
+    }
+
     @Test(groups =
         { "requires_unix" })
     public void testRsyncDirectoryContentOK() throws IOException, InterruptedException