From bad2a77433242c0bf10c66358ed1980d595d7e0b Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 15 Nov 2010 21:46:00 +0000
Subject: [PATCH] fix: adapt to new method names in ISshExecutor
SVN: 18716
---
.../dss/phosphonetx/server/plugins/MsInjectionCopier.java | 4 ++--
.../dss/phosphonetx/server/plugins/MsInjectionCopierTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java
index 859c003653c..991a096f5f9 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java
@@ -169,7 +169,7 @@ class MsInjectionCopier implements Serializable, IPostRegistrationDatasetHandler
public void deleteFolder(File folder)
{
ProcessResult result =
- executor.tryExecuteCommandRemotely("rm -rf " + folder.getPath(),
+ executor.executeCommandRemotely("rm -rf " + folder.getPath(),
DataSetCopier.SSH_TIMEOUT_MILLIS);
if (result.isOK() == false)
{
@@ -201,7 +201,7 @@ class MsInjectionCopier implements Serializable, IPostRegistrationDatasetHandler
public void renameTo(File newFile, File oldFile)
{
ProcessResult result =
- executor.tryExecuteCommandRemotely("mv " + oldFile.getPath() + " "
+ executor.executeCommandRemotely("mv " + oldFile.getPath() + " "
+ newFile.getPath(), DataSetCopier.SSH_TIMEOUT_MILLIS);
if (result.isOK() == false)
{
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java
index 6e84591d0f5..e1dc456e57f 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java
@@ -196,14 +196,14 @@ public class MsInjectionCopierTest extends AbstractFileSystemTestCase
one(sshExecutor).exists(copiedDataSet, SSH_TIMEOUT_MILLIS);
will(returnValue(BooleanStatus.createTrue()));
- one(sshExecutor).tryExecuteCommandRemotely("rm -rf " + copiedDataSet,
+ one(sshExecutor).executeCommandRemotely("rm -rf " + copiedDataSet,
SSH_TIMEOUT_MILLIS);
will(returnValue(OK_RESULT));
one(copier).copyToRemote(dataSet, destination, "localhost", null, null);
will(returnValue(Status.OK));
- one(sshExecutor).tryExecuteCommandRemotely(
+ one(sshExecutor).executeCommandRemotely(
"mv " + new File(destination, dataSet.getName()) + " " + copiedDataSet,
SSH_TIMEOUT_MILLIS);
will(returnValue(OK_RESULT));
--
GitLab