Skip to content
This repository has been archived by the owner on Jul 16, 2018. It is now read-only.

Commit

Permalink
Synchronize with Zebus v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@ocoanet
ocoanet committed Nov 26, 2014
1 parent cf35f52 commit 266fa7d
Show file tree
Hide file tree
Showing 13 changed files with 114 additions and 71 deletions.
62 changes: 33 additions & 29 deletions src/Abc.Zebus.Directory.Cassandra.Tests/Abc.Zebus.Directory.Cassandra.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abc.Zebus, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll</HintPath>
<Reference Include="Abc.Zebus">
<HintPath>..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abc.Zebus.Testing, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Abc.Zebus.Testing.dll</HintPath>
<Reference Include="Abc.Zebus.Testing">
<HintPath>..\packages\Zebus.Testing.1.2.0\lib\net45\Abc.Zebus.Testing.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cassandra, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -57,44 +57,48 @@
<Reference Include="Crc32C.NET">
<HintPath>..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll</HintPath>
</Reference>
<Reference Include="KellermanSoftware.Compare-NET-Objects, Version=1.5.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
<Reference Include="KellermanSoftware.Compare-NET-Objects">
<HintPath>..\packages\CompareNETObjects.3.01.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LZ4, Version=1.0.5.93, Culture=neutral, PublicKeyToken=fd2bda0a70c5a705, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\lz4net.1.0.5.93\lib\net40-client\LZ4.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Moq.dll</HintPath>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ploeh.AutoFixture, Version=2.1.0.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Ploeh.AutoFixture.dll</HintPath>
<Reference Include="Ploeh.AutoFixture">
<HintPath>..\packages\AutoFixture.3.21.1\lib\net40\Ploeh.AutoFixture.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="protobuf-net, Version=2.0.0.622, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\protobuf\protobuf-net.dll</HintPath>
<Reference Include="protobuf-net">
<HintPath>..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Snappy.NET">
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
</Reference>
<Reference Include="StructureMap, Version=2.6.4.0, Culture=neutral, PublicKeyToken=e60ad81abae3c223, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\StructureMap.dll</HintPath>
<Reference Include="StructureMap">
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StructureMap.Net4">
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
11 changes: 9 additions & 2 deletions src/Abc.Zebus.Directory.Cassandra.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoFixture" version="3.21.1" targetFramework="net45" />
<package id="CassandraCSharpDriver" version="2.1.2" targetFramework="net45" />
<package id="CassandraEntityContext" version="2.1.0" targetFramework="net45" />
<package id="CompareNETObjects" version="3.01.0.0" targetFramework="net45" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net45" />
<package id="log4net" version="2.0.3" targetFramework="net45" />
<package id="lz4net" version="1.0.5.93" targetFramework="net45" />
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
<package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net45" />
<package id="Zebus" version="1.1.7" targetFramework="net45" />
<package id="Zebus.Testing" version="1.1.7" targetFramework="net45" />
<package id="structuremap" version="3.1.4.143" targetFramework="net45" />
<package id="Zebus" version="1.2.0" targetFramework="net45" />
<package id="Zebus.Testing" version="1.2.0" targetFramework="net45" />
</packages>
21 changes: 14 additions & 7 deletions src/Abc.Zebus.Directory.Cassandra/Abc.Zebus.Directory.Cassandra.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abc.Zebus, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll</HintPath>
<Reference Include="Abc.Zebus">
<HintPath>..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll</HintPath>
</Reference>
<Reference Include="Cassandra, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -61,15 +60,23 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\lz4net.1.0.5.93\lib\net40-client\LZ4.dll</HintPath>
</Reference>
<Reference Include="protobuf-net, Version=2.0.0.622, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\protobuf\protobuf-net.dll</HintPath>
<HintPath>..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="Snappy.NET">
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
</Reference>
<Reference Include="StructureMap">
<HintPath>..\..\lib\structuremap\StructureMap.dll</HintPath>
<Reference Include="StructureMap, Version=3.1.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll</HintPath>
</Reference>
<Reference Include="StructureMap.Net4">
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 0 additions & 2 deletions src/Abc.Zebus.Directory.Cassandra/Cql/CassandraCqlSessionManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
using System.Collections.Concurrent;
using System.Linq;
using Cassandra;
using StructureMap;

namespace Abc.Zebus.Directory.Cassandra.Cql
{
[PluginFamily(IsSingleton = true)]
public class CassandraCqlSessionManager : IDisposable
{
private readonly ConcurrentDictionary<string, Cluster> _clusters = new ConcurrentDictionary<string, Cluster>();
Expand Down
5 changes: 4 additions & 1 deletion src/Abc.Zebus.Directory.Cassandra/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net45" />
<package id="log4net" version="2.0.3" targetFramework="net45" />
<package id="lz4net" version="1.0.5.93" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net45" />
<package id="Zebus" version="1.1.7" targetFramework="net45" />
<package id="structuremap" version="3.1.4.143" targetFramework="net45" />
<package id="Zebus" version="1.2.0" targetFramework="net45" />
</packages>
29 changes: 19 additions & 10 deletions src/Abc.Zebus.Directory.Tests/Abc.Zebus.Directory.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,48 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abc.Zebus, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll</HintPath>
<Reference Include="Abc.Zebus">
<HintPath>..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abc.Zebus.Testing">
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Abc.Zebus.Testing.dll</HintPath>
<HintPath>..\packages\Zebus.Testing.1.2.0\lib\net45\Abc.Zebus.Testing.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="KellermanSoftware.Compare-NET-Objects">
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
<HintPath>..\packages\CompareNETObjects.3.01.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Moq.dll</HintPath>
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ploeh.AutoFixture">
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\Ploeh.AutoFixture.dll</HintPath>
<HintPath>..\packages\AutoFixture.3.21.1\lib\net40\Ploeh.AutoFixture.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="protobuf-net">
<HintPath>..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StructureMap">
<HintPath>..\packages\Zebus.Testing.1.1.7\lib\net45\StructureMap.dll</HintPath>
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StructureMap.Net4">
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
11 changes: 9 additions & 2 deletions src/Abc.Zebus.Directory.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoFixture" version="3.21.1" targetFramework="net45" />
<package id="CompareNETObjects" version="3.01.0.0" targetFramework="net45" />
<package id="log4net" version="2.0.3" targetFramework="net45" />
<package id="Zebus" version="1.1.7" targetFramework="net45" />
<package id="Zebus.Testing" version="1.1.7" targetFramework="net45" />
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
<package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
<package id="structuremap" version="3.1.4.143" targetFramework="net45" />
<package id="Zebus" version="1.2.0" targetFramework="net45" />
<package id="Zebus.Testing" version="1.2.0" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/Abc.Zebus.Directory.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "@ Solution Items", "@ Solution Items", "{A85342C3-7BA4-4A6B-B690-B1D0ACE14C76}"
ProjectSection(SolutionItems) = preProject
Expand Down
16 changes: 11 additions & 5 deletions src/Abc.Zebus.Directory/Abc.Zebus.Directory.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,22 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="Abc.Zebus, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll</HintPath>
<Reference Include="Abc.Zebus">
<HintPath>..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="StructureMap, Version=2.6.4.0, Culture=neutral, PublicKeyToken=e60ad81abae3c223, processorArchitecture=MSIL">
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="StructureMap, Version=3.1.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\structuremap\StructureMap.dll</HintPath>
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll</HintPath>
</Reference>
<Reference Include="StructureMap.Net4">
<HintPath>..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down
12 changes: 5 additions & 7 deletions src/Abc.Zebus.Directory/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>

<add key="Endpoint" value="tcp://*:129"/>
<add key="Environment" value="Demo"/>
<add key="PeerId" value="Directory.0"/>

<add key="Endpoint" value="tcp://*:129" />
<add key="Environment" value="Demo" />
<add key="PeerId" value="Directory.0" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
</startup>
</configuration>
3 changes: 2 additions & 1 deletion src/Abc.Zebus.Directory/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Abc.Zebus.Util;
using log4net;
using log4net.Config;
using StructureMap;

namespace Abc.Zebus.Directory
{
Expand Down Expand Up @@ -64,7 +65,7 @@ private static void InjectDirectoryServiceSpecificConfiguration(BusFactory busFa
c.ForSingletonOf<PeerDirectoryServer>().Use<PeerDirectoryServer>();
c.Forward<PeerDirectoryServer, IPeerDirectory>();

c.ForSingletonOf<IMessageDispatcher>().Use(ctx =>
c.ForSingletonOf<IMessageDispatcher>().Use(typeof(Func<IContext, MessageDispatcher>).Name, ctx =>
{
var dispatcher = ctx.GetInstance<MessageDispatcher>();
dispatcher.ConfigureHandlerFilter(x => x != typeof(PeerDirectoryClient));
Expand Down
5 changes: 4 additions & 1 deletion src/Abc.Zebus.Directory/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.3" targetFramework="net45" />
<package id="Zebus" version="1.1.7" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
<package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
<package id="structuremap" version="3.1.4.143" targetFramework="net45" />
<package id="Zebus" version="1.2.0" targetFramework="net45" />
</packages>
6 changes: 3 additions & 3 deletions src/SharedVersionInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Reflection;

[assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.7")]
[assembly: AssemblyInformationalVersion("1.1.7")]
[assembly: AssemblyVersion("1.2.0")]
[assembly: AssemblyFileVersion("1.2.0")]
[assembly: AssemblyInformationalVersion("1.2.0")]

0 comments on commit 266fa7d

Please sign in to comment.