Repository: incubator-reef Updated Branches: refs/heads/master 05792696a -> 74282695a
[REEF-549] Remove APIs deprecated since 0.11 from REEF Runtime Common This addressed the issue by removing `REEF_DRIVER_APPDLL_DIR` and `TMP_LOAD_DIR`. JIRA: [REEF-549](https://issues.apache.org/jira/browse/REEF-549) Pull Request: This closes #333 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/74282695 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/74282695 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/74282695 Branch: refs/heads/master Commit: 74282695aa85ca98e42f895e674242dd6872ff8d Parents: 0579269 Author: Mariia Mykhailova <[email protected]> Authored: Mon Aug 3 14:25:52 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Mon Aug 3 15:36:10 2015 -0700 ---------------------------------------------------------------------- .../Files/REEFFileNames.cs | 18 ----------------- .../runtime/common/files/REEFFileNames.java | 21 -------------------- 2 files changed, 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/74282695/lang/cs/Org.Apache.REEF.Common/Files/REEFFileNames.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Files/REEFFileNames.cs b/lang/cs/Org.Apache.REEF.Common/Files/REEFFileNames.cs index 4b6d26e..8e921d2 100644 --- a/lang/cs/Org.Apache.REEF.Common/Files/REEFFileNames.cs +++ b/lang/cs/Org.Apache.REEF.Common/Files/REEFFileNames.cs @@ -42,8 +42,6 @@ namespace Org.Apache.REEF.Common.Files private const string EVALUATOR_STDERR = "evaluator.stderr"; private const string EVALUATOR_STDOUT = "evaluator.stdout"; private const string CPP_BRIDGE = "JavaClrBridge"; - private const string REEF_DRIVER_APPDLL_DIR = "/ReefDriverAppDlls/"; - private const string TMP_LOAD_DIR = "/reef/CLRLoadingDirectory"; private const string REEF_BASE_FOLDER = "reef"; private const string GLOBAL_FOLDER = "global"; private const string LOCAL_FOLDER = "local"; @@ -213,14 +211,6 @@ namespace Org.Apache.REEF.Common.Files } /// <summary> - /// </summary> - /// <returns>reef driver app dll directory</returns> - public string GetReefDriverAppDllDir() - { - return REEF_DRIVER_APPDLL_DIR; - } - - /// <summary> /// The name of the Bridge DLL. /// </summary> /// <returns>The name of the Bridge DLL.</returns> @@ -229,14 +219,6 @@ namespace Org.Apache.REEF.Common.Files return BRIDGE_DLL_NAME; } - /// <summary> - /// </summary> - /// <returns>temp load directory</returns> - public string GetLoadDir() - { - return TMP_LOAD_DIR; - } - private static readonly string GLOBAL_FOLDER_PATH = Path.Combine(REEF_BASE_FOLDER, GLOBAL_FOLDER); private static readonly string LOCAL_FOLDER_PATH = Path.Combine(REEF_BASE_FOLDER, LOCAL_FOLDER); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/74282695/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java index 90d40f1..04f0ae0 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/REEFFileNames.java @@ -47,10 +47,6 @@ public final class REEFFileNames { private static final String DRIVER_STDOUT = "driver.stdout"; private static final String EVALUATOR_STDERR = "evaluator.stderr"; private static final String EVALUATOR_STDOUT = "evaluator.stdout"; - @Deprecated - private static final String REEF_DRIVER_APPDLL_DIR = "/ReefDriverAppDlls/"; - @Deprecated - private static final String TMP_LOAD_DIR = "/reef/CLRLoadingDirectory"; private static final String BRIDGE_DLL_NAME = "Org.Apache.REEF.Bridge.dll"; @@ -220,21 +216,4 @@ public final class REEFFileNames { public String getEvaluatorStdoutFileName() { return EVALUATOR_STDOUT; } - - - /** - * @return reef driver app dll directory - */ - @Deprecated - public String getReefDriverAppDllDir() { - return REEF_DRIVER_APPDLL_DIR; - } - - /** - * @return temp load directory - */ - @Deprecated - public String getLoadDir() { - return TMP_LOAD_DIR; - } }
