Repository: incubator-reef Updated Branches: refs/heads/master c1b5200f6 -> b6c4e9838
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Source/REEF/reef-io/Network/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-io/Network/Properties/AssemblyInfo.cs b/lang/cs/Source/REEF/reef-io/Network/Properties/AssemblyInfo.cs deleted file mode 100644 index 82fb3ba..0000000 --- a/lang/cs/Source/REEF/reef-io/Network/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +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.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("NetWork")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NetWork")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b3f5e608-8908-4f06-a87e-5e41c88133ac")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Source/REEF/reef-io/Network/Utilities/BlockingCollectionExtensions.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-io/Network/Utilities/BlockingCollectionExtensions.cs b/lang/cs/Source/REEF/reef-io/Network/Utilities/BlockingCollectionExtensions.cs deleted file mode 100644 index ae80880..0000000 --- a/lang/cs/Source/REEF/reef-io/Network/Utilities/BlockingCollectionExtensions.cs +++ /dev/null @@ -1,78 +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; -using System.Collections.Concurrent; -using System.Collections.Generic; - -namespace Org.Apache.REEF.IO.Network.Utilities -{ - public static class BlockingCollectionExtensions - { - /// <summary> - /// Removes the given item from the BlockingCollection if it is present. - /// If it is not present, it blocks until any item is available in the - /// BlockingCollection. It then removes and returns that first available - /// item. - /// </summary> - /// <typeparam name="T">The type of BlockingCollection</typeparam> - /// <param name="collection">The BlockingCollection to remove the specified item</param> - /// <param name="item">The item to remove from the BlockingCollection, if it exists</param> - /// <returns>The specified item, or the first available item if the specified item is - /// not present in the BlockingCollection</returns> - public static T Take<T>(this BlockingCollection<T> collection, T item) - { - T ret = default(T); - bool foundItem = false; - List<T> removedItems = new List<T>(); - - // Empty the collection - for (int i = 0; i < collection.Count; i++) - { - T removed; - if (collection.TryTake(out removed)) - { - removedItems.Add(removed); - } - } - - // Add them back to the collection minus the specified item - foreach (T removedItem in removedItems) - { - if (removedItem.Equals(item)) - { - ret = removedItem; - foundItem = true; - } - else - { - collection.Add(removedItem); - } - } - - if (!foundItem) - { - // Error: the element wasn't in the collection - throw new InvalidOperationException(item + " not found in blocking collection"); - } - - return ret; - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Source/REEF/reef-io/Network/Utilities/Utils.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-io/Network/Utilities/Utils.cs b/lang/cs/Source/REEF/reef-io/Network/Utilities/Utils.cs deleted file mode 100644 index 49ce5c3..0000000 --- a/lang/cs/Source/REEF/reef-io/Network/Utilities/Utils.cs +++ /dev/null @@ -1,76 +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.IO; -using Microsoft.Hadoop.Avro; -using Org.Apache.REEF.Driver.Context; -using Org.Apache.REEF.Tasks; -using Org.Apache.REEF.Utilities.Logging; -using Org.Apache.REEF.Tang.Exceptions; -using Org.Apache.REEF.Tang.Interface; -using Org.Apache.REEF.Tang.Util; -using Org.Apache.REEF.Tang.Implementations.Tang; - -namespace Org.Apache.REEF.IO.Network.Utilities -{ - internal class Utils - { - private static Logger LOGGER = Logger.GetLogger(typeof(Utils)); - - /// <summary> - /// Returns the TaskIdentifier from the Configuration. - /// </summary> - /// <param name="taskConfiguration">The Configuration object</param> - /// <returns>The TaskIdentifier for the given Configuration</returns> - public static string GetTaskId(IConfiguration taskConfiguration) - { - try - { - IInjector injector = TangFactory.GetTang().NewInjector(taskConfiguration); - return injector.GetNamedInstance<TaskConfigurationOptions.Identifier, string>( - GenericType<TaskConfigurationOptions.Identifier>.Class); - } - catch (InjectionException) - { - LOGGER.Log(Level.Error, "Unable to find task identifier"); - throw; - } - } - - /// <summary> - /// Returns the Context Identifier from the Configuration. - /// </summary> - /// <param name="contextConfiguration">The Configuration object</param> - /// <returns>The TaskIdentifier for the given Configuration</returns> - public static string GetContextId(IConfiguration contextConfiguration) - { - try - { - IInjector injector = TangFactory.GetTang().NewInjector(contextConfiguration); - return injector.GetNamedInstance<ContextConfigurationOptions.ContextIdentifier, string>( - GenericType<ContextConfigurationOptions.ContextIdentifier>.Class); - } - catch (InjectionException) - { - LOGGER.Log(Level.Error, "Unable to find task identifier"); - throw; - } - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Source/REEF/reef-io/Network/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-io/Network/packages.config b/lang/cs/Source/REEF/reef-io/Network/packages.config deleted file mode 100644 index 88cf17b..0000000 --- a/lang/cs/Source/REEF/reef-io/Network/packages.config +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -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. ---> -<packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> - <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> - <package id="Rx-Core" version="2.2.5" targetFramework="net45" /> - <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" /> -</packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Source/Tools/ReefAll/ReefAll.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/Tools/ReefAll/ReefAll.csproj b/lang/cs/Source/Tools/ReefAll/ReefAll.csproj index 2a1bf70..abd71e3 100644 --- a/lang/cs/Source/Tools/ReefAll/ReefAll.csproj +++ b/lang/cs/Source/Tools/ReefAll/ReefAll.csproj @@ -82,29 +82,33 @@ under the License. <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(SourceDir)\REEF\reef-applications\Evaluator\Evaluator.csproj"> - <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project> - <Name>Evaluator</Name> - </ProjectReference> - <ProjectReference Include="$(SourceDir)\REEF\reef-io\NetWork\NetWork.csproj"> - <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project> - <Name>NetWork</Name> - </ProjectReference> - <ProjectReference Include="..\..\..\Org.Apache.Reef.Common\Org.Apache.Reef.Common.csproj"> + <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> - <Name>Org.Apache.Reef.Common</Name> + <Name>Org.Apache.REEF.Common</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Org.Apache.Reef.Driver\Org.Apache.Reef.Driver.csproj"> + <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.csproj"> <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> - <Name>Org.Apache.Reef.Driver</Name> + <Name>Org.Apache.REEF.Driver</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Org.Apache.Reef.Tang\Org.Apache.Reef.Tang.csproj"> + <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.csproj"> + <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project> + <Name>Org.Apache.REEF.Evaluator</Name> + </ProjectReference> + <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> - <Name>Org.Apache.Reef.Tang</Name> + <Name>Org.Apache.REEF.Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Org.Apache.Reef.Wake\Org.Apache.Reef.Wake.csproj"> + <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> - <Name>Org.Apache.Reef.Wake</Name> + <Name>Org.Apache.REEF.Wake</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.csproj"> + <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project> + <Name>Org.Apache.REEF.Network</Name> + </ProjectReference> + <ProjectReference Include="..\..\..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj"> + <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> + <Name>Org.Apache.REEF.Utilities</Name> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Tests/ReefTests/Functional.Tests/Bridge/TestSimpleEventHandlers.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/Functional.Tests/Bridge/TestSimpleEventHandlers.cs b/lang/cs/Tests/ReefTests/Functional.Tests/Bridge/TestSimpleEventHandlers.cs index 41a80cc..686bef4 100644 --- a/lang/cs/Tests/ReefTests/Functional.Tests/Bridge/TestSimpleEventHandlers.cs +++ b/lang/cs/Tests/ReefTests/Functional.Tests/Bridge/TestSimpleEventHandlers.cs @@ -27,7 +27,7 @@ using Org.Apache.REEF.Driver.Defaults; using Org.Apache.REEF.Examples.HelloCLRBridge; using Org.Apache.REEF.Examples.HelloCLRBridge.handlers; using Org.Apache.REEF.Examples.HelloCLRBridge.Handlers; -using Org.Apache.REEF.IO.Network.Naming; +using Org.Apache.REEF.Network.Naming; using Org.Apache.REEF.Tasks; using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Tang.Interface; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageDriver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageDriver.cs b/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageDriver.cs index 7199af1..7a82029 100644 --- a/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageDriver.cs +++ b/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageDriver.cs @@ -27,7 +27,7 @@ using Org.Apache.REEF.Driver.Bridge; using Org.Apache.REEF.Driver.Context; using Org.Apache.REEF.Driver.Evaluator; using Org.Apache.REEF.Driver.Task; -using Org.Apache.REEF.IO.Network.Naming; +using Org.Apache.REEF.Network.Naming; using Org.Apache.REEF.Services; using Org.Apache.REEF.Tasks; using Org.Apache.REEF.Utilities; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageTask.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageTask.cs b/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageTask.cs index 5c85426..2661cf1 100644 --- a/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageTask.cs +++ b/lang/cs/Tests/ReefTests/Functional.Tests/Messaging/MessageTask.cs @@ -22,7 +22,7 @@ using System.Globalization; using System.Linq; using System.Net; using System.Threading; -using Org.Apache.REEF.IO.Network.Naming; +using Org.Apache.REEF.Network.Naming; using Org.Apache.REEF.Tasks; using Org.Apache.REEF.Tasks.Events; using Org.Apache.REEF.Utilities; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Tests/ReefTests/IO.Tests/BlockingCollectionExtensionTests.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/IO.Tests/BlockingCollectionExtensionTests.cs b/lang/cs/Tests/ReefTests/IO.Tests/BlockingCollectionExtensionTests.cs index 2ae67d2..4b21b1e 100644 --- a/lang/cs/Tests/ReefTests/IO.Tests/BlockingCollectionExtensionTests.cs +++ b/lang/cs/Tests/ReefTests/IO.Tests/BlockingCollectionExtensionTests.cs @@ -17,7 +17,7 @@ * under the License. */ -using Org.Apache.REEF.IO.Network.Utilities; +using Org.Apache.REEF.Network.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Concurrent; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Tests/ReefTests/IO.Tests/NameServerTests.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/IO.Tests/NameServerTests.cs b/lang/cs/Tests/ReefTests/IO.Tests/NameServerTests.cs index 6caac93..3ceb21b 100644 --- a/lang/cs/Tests/ReefTests/IO.Tests/NameServerTests.cs +++ b/lang/cs/Tests/ReefTests/IO.Tests/NameServerTests.cs @@ -25,8 +25,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Org.Apache.REEF.Common.io; -using Org.Apache.REEF.IO.Network.Naming; -using Org.Apache.REEF.IO.Network.Naming.Events; +using Org.Apache.REEF.Network.Naming; +using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Implementations; using Org.Apache.REEF.Tang.Interface; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Tests/ReefTests/IO.Tests/NetworkServiceTests.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/IO.Tests/NetworkServiceTests.cs b/lang/cs/Tests/ReefTests/IO.Tests/NetworkServiceTests.cs index 1f827e2..3a38621 100644 --- a/lang/cs/Tests/ReefTests/IO.Tests/NetworkServiceTests.cs +++ b/lang/cs/Tests/ReefTests/IO.Tests/NetworkServiceTests.cs @@ -18,8 +18,8 @@ */ using Org.Apache.REEF.Common.io; -using Org.Apache.REEF.IO.Network.Naming; -using Org.Apache.REEF.IO.Network.NetworkService; +using Org.Apache.REEF.Network.Naming; +using Org.Apache.REEF.Network.NetworkService; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Implementations; using Org.Apache.REEF.Tang.Interface; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/lang/cs/Tests/ReefTests/ReefTests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/ReefTests.csproj b/lang/cs/Tests/ReefTests/ReefTests.csproj index fce90f6..1aa89ba 100644 --- a/lang/cs/Tests/ReefTests/ReefTests.csproj +++ b/lang/cs/Tests/ReefTests/ReefTests.csproj @@ -152,6 +152,14 @@ under the License. <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> <Name>Org.Apache.Reef.Driver</Name> </ProjectReference> + <ProjectReference Include="..\..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.csproj"> + <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project> + <Name>Org.Apache.REEF.Evaluator</Name> + </ProjectReference> + <ProjectReference Include="..\..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.csproj"> + <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project> + <Name>Org.Apache.REEF.Network</Name> + </ProjectReference> <ProjectReference Include="..\..\Org.Apache.Reef.Tang\Org.Apache.Reef.Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Org.Apache.Reef.Tang</Name> @@ -168,18 +176,10 @@ under the License. <Project>{5094c35b-4fdb-4322-ac05-45d684501cbf}</Project> <Name>CLRBridgeClient</Name> </ProjectReference> - <ProjectReference Include="..\..\Source\REEF\reef-applications\Evaluator\Evaluator.csproj"> - <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project> - <Name>Evaluator</Name> - </ProjectReference> <ProjectReference Include="..\..\Source\REEF\reef-examples\HelloCLRBridge\HelloCLRBridge.csproj"> <Project>{a78dd8e8-31d0-4506-8738-daa9da86d55b}</Project> <Name>HelloCLRBridge</Name> </ProjectReference> - <ProjectReference Include="..\..\Source\REEF\reef-io\NetWork\NetWork.csproj"> - <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project> - <Name>NetWork</Name> - </ProjectReference> <ProjectReference Include="..\..\Source\REEF\reef-tasks\Tasks\Tasks.csproj"> <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project> <Name>Tasks</Name> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b6c4e983/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a334f75..19c9090 100644 --- a/pom.xml +++ b/pom.xml @@ -250,11 +250,12 @@ under the License. <exclude>**/obj/**</exclude> <exclude>**/Release/**</exclude> <exclude>**/Debug/**</exclude> + <exclude>**/TestResults/**</exclude> <!-- NuGet dependencies downloaded as part of the build --> <exclude>**/packages/**</exclude> <!-- The below are auto generated files for serialization --> - <exclude>**/ReefCommon/protobuf/cs/*</exclude> - <exclude>**/ReefCommon/avro/*</exclude> + <exclude>**/Org.Apache.REEF.Common/protobuf/cs/*</exclude> + <exclude>**/Org.Apache.REEF.Common/avro/*</exclude> <!-- The below are binary data files used in tests --> <exclude>**/ConfigFiles/evaluator.conf</exclude> <exclude>**/TangTests/evaluator.conf</exclude>
