Repository: incubator-reef Updated Branches: refs/heads/branch-0.11.0-incubating 57a3a3e1a -> b89aef3eb
change in REEF-306, update copyright hearder for run.cmd and rename IEvaluatorRequest.cs Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/410aa560 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/410aa560 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/410aa560 Branch: refs/heads/branch-0.11.0-incubating Commit: 410aa560af24a95f2d957eecda60dd05224e186b Parents: 57a3a3e Author: Julia Wang <[email protected]> Authored: Mon May 4 16:08:25 2015 -0700 Committer: Julia Wang <[email protected]> Committed: Mon May 4 16:08:25 2015 -0700 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.Client/run.cmd | 44 +++++++------------ .../Evaluator/IEvaluatorRequest .cs | 42 ------------------ .../Evaluator/IEvaluatorRequest.cs | 42 ++++++++++++++++++ ...g.Apache.REEF.Network.Examples.Client.csproj | 2 +- .../run.cmd | 45 -------------------- .../Org.Apache.REEF.Tests.csproj | 2 +- lang/cs/Org.Apache.REEF.Tests/run.cmd | 45 -------------------- 7 files changed, 59 insertions(+), 163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/410aa560/lang/cs/Org.Apache.REEF.Client/run.cmd ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/run.cmd b/lang/cs/Org.Apache.REEF.Client/run.cmd index 86bf58f..c960cb4 100644 --- a/lang/cs/Org.Apache.REEF.Client/run.cmd +++ b/lang/cs/Org.Apache.REEF.Client/run.cmd @@ -1,37 +1,23 @@ -@REM -@REM Copyright (C) 2013 Microsoft Corporation -@REM -@REM Licensed under the Apache License, Version 2.0 (the "License"); -@REM you may not use this file except in compliance with the License. -@REM You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. -@REM - @echo off :: -:: Copyright (C) 2013 Microsoft Corporation -:: -:: Licensed 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 +:: 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 +:: 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. +:: 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. :: - :: RUNTIME set SHADED_JAR=.\reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar @@ -42,4 +28,4 @@ set CLASSPATH=%HADOOP_HOME%\share\hadoop\hdfs\lib\*;%HADOOP_HOME%\share\hadoop\h set CMD=%JAVA_HOME%\bin\java.exe -cp %HADOOP_HOME%\etc\hadoop;%SHADED_JAR%;%CLASSPATH% %LOGGING_CONFIG% %* ::%LOGGING_CONFIG% echo %CMD% -%CMD% +%CMD% \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/410aa560/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs deleted file mode 100644 index dcfd85b..0000000 --- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .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 System.Collections.Generic; -using Org.Apache.REEF.Common.Catalog; -using Org.Apache.REEF.Common.Catalog.Capabilities; - -namespace Org.Apache.REEF.Driver.Evaluator -{ - public interface IEvaluatorRequest - { - int MemoryMegaBytes { get; set; } - - int Number { get; set; } - - int VirtualCore { get; set; } - - string Rack { get; set; } - - string EvaluatorBatchId { get; set; } - - List<ICapability> Capabilities { get; set; } - - IResourceCatalog Catalog { get; set; } - } -} http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/410aa560/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest.cs new file mode 100644 index 0000000..dcfd85b --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest.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 System.Collections.Generic; +using Org.Apache.REEF.Common.Catalog; +using Org.Apache.REEF.Common.Catalog.Capabilities; + +namespace Org.Apache.REEF.Driver.Evaluator +{ + public interface IEvaluatorRequest + { + int MemoryMegaBytes { get; set; } + + int Number { get; set; } + + int VirtualCore { get; set; } + + string Rack { get; set; } + + string EvaluatorBatchId { get; set; } + + List<ICapability> Capabilities { get; set; } + + IResourceCatalog Catalog { get; set; } + } +} http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/410aa560/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj index 6a65ae5..1f118e2 100644 --- a/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj +++ b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj @@ -49,7 +49,7 @@ under the License. <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="run.cmd"> + <None Include="$(SolutionDir)\Org.Apache.REEF.Client\run.cmd"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> </ItemGroup> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/410aa560/lang/cs/Org.Apache.REEF.Network.Examples.Client/run.cmd ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Examples.Client/run.cmd b/lang/cs/Org.Apache.REEF.Network.Examples.Client/run.cmd deleted file mode 100644 index bfdd44e..0000000 --- a/lang/cs/Org.Apache.REEF.Network.Examples.Client/run.cmd +++ /dev/null @@ -1,45 +0,0 @@ -@REM -@REM Copyright (C) 2013 Microsoft Corporation -@REM -@REM Licensed under the Apache License, Version 2.0 (the "License"); -@REM you may not use this file except in compliance with the License. -@REM You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. -@REM - -@echo off -:: -:: Copyright (C) 2013 Microsoft Corporation -:: -:: Licensed 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. -:: - - -:: RUNTIME -set SHADED_JAR=.\reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar - -set LOGGING_CONFIG=-Djava.util.logging.config.class=org.apache.reef.util.logging.Config - -set CLASSPATH=%HADOOP_HOME%\share\hadoop\hdfs\lib\*;%HADOOP_HOME%\share\hadoop\hdfs\*;%HADOOP_HOME%\share\hadoop\common\*;%HADOOP_HOME%\share\hadoop\common\lib\*;%HADOOP_HOME%\share\hadoop\mapreduce\lib\*;%HADOOP_HOME%\share\hadoop\mapreduce\*;%HADOOP_HOME%\share\hadoop\yarn\*;%HADOOP_HOME%\share\hadoop\yarn\lib\* - -set CMD=%JAVA_HOME%\bin\java.exe -cp %HADOOP_HOME%\etc\hadoop;%SHADED_JAR%;%CLASSPATH% %* -::%LOGGING_CONFIG% -echo %CMD% -%CMD% http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/410aa560/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj index a256a34..235721b 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj @@ -70,7 +70,7 @@ under the License. <None Include="ConfigFiles\evaluator.conf"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> - <None Include="run.cmd"> + <None Include="$(SolutionDir)\Org.Apache.REEF.Client\run.cmd"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> <None Include="packages.config" /> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/410aa560/lang/cs/Org.Apache.REEF.Tests/run.cmd ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/run.cmd b/lang/cs/Org.Apache.REEF.Tests/run.cmd deleted file mode 100644 index bfdd44e..0000000 --- a/lang/cs/Org.Apache.REEF.Tests/run.cmd +++ /dev/null @@ -1,45 +0,0 @@ -@REM -@REM Copyright (C) 2013 Microsoft Corporation -@REM -@REM Licensed under the Apache License, Version 2.0 (the "License"); -@REM you may not use this file except in compliance with the License. -@REM You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. -@REM - -@echo off -:: -:: Copyright (C) 2013 Microsoft Corporation -:: -:: Licensed 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. -:: - - -:: RUNTIME -set SHADED_JAR=.\reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar - -set LOGGING_CONFIG=-Djava.util.logging.config.class=org.apache.reef.util.logging.Config - -set CLASSPATH=%HADOOP_HOME%\share\hadoop\hdfs\lib\*;%HADOOP_HOME%\share\hadoop\hdfs\*;%HADOOP_HOME%\share\hadoop\common\*;%HADOOP_HOME%\share\hadoop\common\lib\*;%HADOOP_HOME%\share\hadoop\mapreduce\lib\*;%HADOOP_HOME%\share\hadoop\mapreduce\*;%HADOOP_HOME%\share\hadoop\yarn\*;%HADOOP_HOME%\share\hadoop\yarn\lib\* - -set CMD=%JAVA_HOME%\bin\java.exe -cp %HADOOP_HOME%\etc\hadoop;%SHADED_JAR%;%CLASSPATH% %* -::%LOGGING_CONFIG% -echo %CMD% -%CMD%
