Repository: reef Updated Branches: refs/heads/master d923b4b34 -> c0f047e69
[REEF-1067] Fix typo for IAllocatedEvaluator JIRA: [REEF-1067](https://issues.apache.org/jira/browse/REEF-1067) Pull Request: This closes #741 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/c0f047e6 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/c0f047e6 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/c0f047e6 Branch: refs/heads/master Commit: c0f047e697caef0e67f18a7f414e59132086caf1 Parents: d923b4b Author: Andrew Chung <[email protected]> Authored: Thu Dec 17 11:15:47 2015 -0800 Committer: Markus Weimer <[email protected]> Committed: Fri Dec 18 10:44:34 2015 -0800 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.Bridge/Clr2JavaImpl.h | 2 +- .../Clr2java/IAllocatedEvaluaotrClr2Java.cs | 42 -------------------- .../Clr2java/IAllocatedEvaluatorClr2Java.cs | 42 ++++++++++++++++++++ .../Bridge/ClrSystemHandlerWrapper.cs | 2 +- .../Bridge/Events/AllocatedEvaluator.cs | 4 +- .../Org.Apache.REEF.Driver.csproj | 4 +- 6 files changed, 48 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/c0f047e6/lang/cs/Org.Apache.REEF.Bridge/Clr2JavaImpl.h ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge/Clr2JavaImpl.h b/lang/cs/Org.Apache.REEF.Bridge/Clr2JavaImpl.h index 4d270f2..6a8d6b9 100644 --- a/lang/cs/Org.Apache.REEF.Bridge/Clr2JavaImpl.h +++ b/lang/cs/Org.Apache.REEF.Bridge/Clr2JavaImpl.h @@ -54,7 +54,7 @@ namespace Org { }; }; - public ref class AllocatedEvaluatorClr2Java : public IAllocatedEvaluaotrClr2Java { + public ref class AllocatedEvaluatorClr2Java : public IAllocatedEvaluatorClr2Java { jobject _jobjectAllocatedEvaluator = NULL; JavaVM* _jvm; jstring _jstringId = NULL; http://git-wip-us.apache.org/repos/asf/reef/blob/c0f047e6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluaotrClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluaotrClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluaotrClr2Java.cs deleted file mode 100644 index 0e24bc3..0000000 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluaotrClr2Java.cs +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -using Org.Apache.REEF.Driver.Evaluator; - -namespace Org.Apache.REEF.Driver.Bridge.Clr2java -{ - public interface IAllocatedEvaluaotrClr2Java : IClr2Java - { - void SubmitContextAndTask(string contextConfigStr, string taskConfigStr); - - void SubmitContext(string contextConfigStr); - - void SubmitContextAndService(string contextConfigStr, string serviceConfigStr); - - void SubmitContextAndServiceAndTask(string contextConfigStr, string serviceConfigStr, string taskConfigStr); - - void Close(); - - string GetId(); - - string GetNameServerInfo(); - - IEvaluatorDescriptor GetEvaluatorDescriptor(); - } -} http://git-wip-us.apache.org/repos/asf/reef/blob/c0f047e6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs new file mode 100644 index 0000000..8bfc8c7 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs @@ -0,0 +1,42 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +using Org.Apache.REEF.Driver.Evaluator; + +namespace Org.Apache.REEF.Driver.Bridge.Clr2java +{ + public interface IAllocatedEvaluatorClr2Java : IClr2Java + { + void SubmitContextAndTask(string contextConfigStr, string taskConfigStr); + + void SubmitContext(string contextConfigStr); + + void SubmitContextAndService(string contextConfigStr, string serviceConfigStr); + + void SubmitContextAndServiceAndTask(string contextConfigStr, string serviceConfigStr, string taskConfigStr); + + void Close(); + + string GetId(); + + string GetNameServerInfo(); + + IEvaluatorDescriptor GetEvaluatorDescriptor(); + } +} http://git-wip-us.apache.org/repos/asf/reef/blob/c0f047e6/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs index 70f05c6..4e3edc1 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs @@ -38,7 +38,7 @@ namespace Org.Apache.REEF.Driver.Bridge private static DriverBridge _driverBridge; - public static void Call_ClrSystemAllocatedEvaluatorHandler_OnNext(ulong handle, IAllocatedEvaluaotrClr2Java clr2Java) + public static void Call_ClrSystemAllocatedEvaluatorHandler_OnNext(ulong handle, IAllocatedEvaluatorClr2Java clr2Java) { using (LOGGER.LogFunction("ClrSystemHandlerWrapper::Call_ClrSystemAllocatedEvaluatorHandler_OnNext")) { http://git-wip-us.apache.org/repos/asf/reef/blob/c0f047e6/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs index 5e42bc5..aadf187 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs @@ -47,7 +47,7 @@ namespace Org.Apache.REEF.Driver.Bridge.Events private readonly ISet<IConfigurationProvider> _configurationProviders; - public AllocatedEvaluator(IAllocatedEvaluaotrClr2Java clr2Java, ISet<IConfigurationProvider> configurationProviders) + public AllocatedEvaluator(IAllocatedEvaluatorClr2Java clr2Java, ISet<IConfigurationProvider> configurationProviders) { _configurationProviders = configurationProviders; InstanceId = Guid.NewGuid().ToString("N"); @@ -71,7 +71,7 @@ namespace Org.Apache.REEF.Driver.Bridge.Events public string NameServerInfo { get; set; } [DataMember] - private IAllocatedEvaluaotrClr2Java Clr2Java { get; set; } + private IAllocatedEvaluatorClr2Java Clr2Java { get; set; } public void SubmitTask(IConfiguration taskConfiguration) { http://git-wip-us.apache.org/repos/asf/reef/blob/c0f047e6/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj index ef4bca8..5df9a58 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj +++ b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj @@ -42,7 +42,7 @@ under the License. <Compile Include="Bridge\BridgeHandlerManager.cs" /> <Compile Include="Bridge\BridgeLogger.cs" /> <Compile Include="Bridge\Clr2java\IActiveContextClr2Java.cs" /> - <Compile Include="Bridge\Clr2java\IAllocatedEvaluaotrClr2Java.cs" /> + <Compile Include="Bridge\Clr2java\IAllocatedEvaluatorClr2Java.cs" /> <Compile Include="Bridge\Clr2java\IClosedContextClr2Java.cs" /> <Compile Include="Bridge\Clr2java\IClr2Java.cs" /> <Compile Include="Bridge\Clr2java\IClr2JavaTaskMessage.cs" /> @@ -185,4 +185,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> +</Project> \ No newline at end of file
