Skip to content

Commit c760984

Browse files
author
Elad Zelingher
committed
Some cleanup before package release
1 parent ff09236 commit c760984

File tree

97 files changed

+905
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+905
-312
lines changed

‎NuGet/WampSharp.Default.nuspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<title>WampSharp default binding</title>
1616
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1717
<description>WampSharp above Fleck, Newtonsoft.Json and WebSocket4Net</description>
18-
<projectUrl>https://github.com/darkl/WampSharp/tree/wampv2</projectUrl>
18+
<projectUrl>https://github.com/Code-Sharp/WampSharp/</projectUrl>
19+
<tags>websockets wampws rpc pubsub fleck newtonsoft json msgpack wampv1 wampv2</tags>
1920
</metadata>
2021
<files>
2122
<file src="bin\net45\WampSharp.Default.dll" target="lib\net45\WampSharp.Default.dll" />

‎NuGet/WampSharp.SignalR.nuspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
<id>WampSharp.SignalR</id>
1313
<title>WampSharp SignalR support</title>
1414
<requireLicenseAcceptance>false</requireLicenseAcceptance>
15-
<description>SignalR transport support for WampSharp</description>
16-
<projectUrl>https://github.com/darkl/WampSharp/tree/wampv2</projectUrl>
15+
<description>SignalR transport for WampSharp</description>
16+
<projectUrl>https://github.com/Code-Sharp/WampSharp/</projectUrl>
17+
<tags>websockets wampws rpc pubsub signalr wampv2</tags>
1718
</metadata>
1819
<files>
1920
<file src="bin\net45\WampSharp.SignalR.dll" target="lib\net45\WampSharp.SignalR.dll" />
21+
<file src="bin\net45\WampSharp.SignalR.xml" target="lib\net45\WampSharp.SignalR.xml" />
2022
</files>
2123
</package>

‎NuGet/WampSharp.nuspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
<id>WampSharp</id>
1212
<title>WampSharp</title>
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14-
<description>An implementation of WAMP (The Web Application Messaging Protocol).</description>
15-
<projectUrl>https://github.com/darkl/WampSharp/tree/wampv2</projectUrl>
14+
<description>An implementation of WAMP (The Web Application Messaging Protocol). Supports both WAMPv2 and WAMPv1.</description>
15+
<projectUrl>https://github.com/Code-Sharp/WampSharp/</projectUrl>
16+
<tags>websockets wampws rpc pubsub wampv1 wampv2</tags>
1617
</metadata>
1718
<files>
1819
<file src="bin\net45\WampSharp.dll" target="lib\net45\WampSharp.dll" />

‎src/mono/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25+
<DocumentationFile>bin\Debug\WampSharp.SignalR.XML</DocumentationFile>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2728
<DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
3031
<DefineConstants>TRACE</DefineConstants>
3132
<ErrorReport>prompt</ErrorReport>
3233
<WarningLevel>4</WarningLevel>
34+
<DocumentationFile>bin\Release\WampSharp.SignalR.XML</DocumentationFile>
3335
</PropertyGroup>
3436
<ItemGroup>
3537
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

‎src/mono/WampSharp.Default/WampSharp.Default.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@
132132
<Compile Include="..\..\net45\WampSharp.Default\WAMP1\V1\WampChannelFactoryExtensions.cs">
133133
<Link>WAMP1\V1\WampChannelFactoryExtensions.cs</Link>
134134
</Compile>
135-
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenBinding.cs">
136-
<Link>WAMP2\Binding\JTokenBinding.cs</Link>
135+
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenJsonBinding.cs">
136+
<Link>WAMP2\Binding\JTokenJsonBinding.cs</Link>
137137
</Compile>
138-
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenMsgpackObjectBinding.cs">
139-
<Link>WAMP2\Binding\JTokenMsgpackObjectBinding.cs</Link>
138+
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenMsgpackBinding.cs">
139+
<Link>WAMP2\Binding\JTokenMsgpackBinding.cs</Link>
140140
</Compile>
141141
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\V2\DefaultWampChannelFactory.cs">
142142
<Link>WAMP2\V2\DefaultWampChannelFactory.cs</Link>

‎src/mono/WampSharp/WampSharp.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,8 @@
660660
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Server\IWampHost.cs">
661661
<Link>WAMP2\V2\Api\Server\IWampHost.cs</Link>
662662
</Compile>
663-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Rx\RawSubscriber.cs">
664-
<Link>WAMP2\V2\Api\Rx\RawSubscriber.cs</Link>
663+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Rx\RawTopicClientSubscriber.cs">
664+
<Link>WAMP2\V2\Api\Rx\RawTopicClientSubscriber.cs</Link>
665665
</Compile>
666666
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Rx\WampClientSubject.cs">
667667
<Link>WAMP2\V2\Api\Rx\WampClientSubject.cs</Link>
@@ -780,8 +780,8 @@
780780
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\PubSub\Interfaces\IRemoteWampTopicSubscriber.cs">
781781
<Link>WAMP2\V2\PubSub\Interfaces\IRemoteWampTopicSubscriber.cs</Link>
782782
</Compile>
783-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\PubSub\Interfaces\IWampRawTopicSubscriber.cs">
784-
<Link>WAMP2\V2\PubSub\Interfaces\IWampRawTopicSubscriber.cs</Link>
783+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\PubSub\Interfaces\IWampRawTopicClientSubscriber.cs">
784+
<Link>WAMP2\V2\PubSub\Interfaces\IWampRawTopicClientSubscriber.cs</Link>
785785
</Compile>
786786
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\Interfaces\IWampTopicContainerProxy.cs">
787787
<Link>WAMP2\V2\Client\PubSub\Interfaces\IWampTopicContainerProxy.cs</Link>
@@ -810,8 +810,8 @@
810810
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\WampTopicProxy.cs">
811811
<Link>WAMP2\V2\Client\PubSub\WampTopicProxy.cs</Link>
812812
</Compile>
813-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\WampTopicProxySection.cs">
814-
<Link>WAMP2\V2\Client\PubSub\WampTopicProxySection.cs</Link>
813+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\WampTopicClientProxySection.cs">
814+
<Link>WAMP2\V2\Client\PubSub\WampTopicClientProxySection.cs</Link>
815815
</Compile>
816816
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\Realm\IWampRealmProxy.cs">
817817
<Link>WAMP2\V2\Client\Realm\IWampRealmProxy.cs</Link>
@@ -870,8 +870,8 @@
870870
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Rpc\Dealer\WampClientRouterCallbackAdapter.cs">
871871
<Link>WAMP2\V2\Rpc\Dealer\WampClientRouterCallbackAdapter.cs</Link>
872872
</Compile>
873-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Rpc\Interfaces\IWampClientRawRpcOperationCallback.cs">
874-
<Link>WAMP2\V2\Rpc\Interfaces\IWampClientRawRpcOperationCallback.cs</Link>
873+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Rpc\Interfaces\IWampRawRpcOperationClientCallback.cs">
874+
<Link>WAMP2\V2\Rpc\Interfaces\IWampRawRpcOperationClientCallback.cs</Link>
875875
</Compile>
876876
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\Rpc\Interfaces\IWampRpcOperationCatalogProxy.cs">
877877
<Link>WAMP2\V2\Client\Rpc\Interfaces\IWampRpcOperationCatalogProxy.cs</Link>

‎src/net40/WampSharp.Default/WampSharp.Default.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@
136136
<Compile Include="..\..\net45\WampSharp.Default\WAMP1\V1\WampChannelFactoryExtensions.cs">
137137
<Link>WAMP1\V1\WampChannelFactoryExtensions.cs</Link>
138138
</Compile>
139-
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenBinding.cs">
140-
<Link>WAMP2\Binding\JTokenBinding.cs</Link>
139+
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenJsonBinding.cs">
140+
<Link>WAMP2\Binding\JTokenJsonBinding.cs</Link>
141141
</Compile>
142-
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenMsgpackObjectBinding.cs">
143-
<Link>WAMP2\Binding\JTokenMsgpackObjectBinding.cs</Link>
142+
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\Binding\JTokenMsgpackBinding.cs">
143+
<Link>WAMP2\Binding\JTokenMsgpackBinding.cs</Link>
144144
</Compile>
145145
<Compile Include="..\..\net45\WampSharp.Default\WAMP2\V2\DefaultWampChannelFactory.cs">
146146
<Link>WAMP2\V2\DefaultWampChannelFactory.cs</Link>

‎src/net40/WampSharp/WampSharp.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,8 @@
664664
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Server\IWampHost.cs">
665665
<Link>WAMP2\V2\Api\Server\IWampHost.cs</Link>
666666
</Compile>
667-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Rx\RawSubscriber.cs">
668-
<Link>WAMP2\V2\Api\Rx\RawSubscriber.cs</Link>
667+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Rx\RawTopicClientSubscriber.cs">
668+
<Link>WAMP2\V2\Api\Rx\RawTopicClientSubscriber.cs</Link>
669669
</Compile>
670670
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Rx\WampClientSubject.cs">
671671
<Link>WAMP2\V2\Api\Rx\WampClientSubject.cs</Link>
@@ -784,8 +784,8 @@
784784
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\PubSub\Interfaces\IRemoteWampTopicSubscriber.cs">
785785
<Link>WAMP2\V2\PubSub\Interfaces\IRemoteWampTopicSubscriber.cs</Link>
786786
</Compile>
787-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\PubSub\Interfaces\IWampRawTopicSubscriber.cs">
788-
<Link>WAMP2\V2\PubSub\Interfaces\IWampRawTopicSubscriber.cs</Link>
787+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\PubSub\Interfaces\IWampRawTopicClientSubscriber.cs">
788+
<Link>WAMP2\V2\PubSub\Interfaces\IWampRawTopicClientSubscriber.cs</Link>
789789
</Compile>
790790
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\Interfaces\IWampTopicContainerProxy.cs">
791791
<Link>WAMP2\V2\Client\PubSub\Interfaces\IWampTopicContainerProxy.cs</Link>
@@ -814,8 +814,8 @@
814814
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\WampTopicProxy.cs">
815815
<Link>WAMP2\V2\Client\PubSub\WampTopicProxy.cs</Link>
816816
</Compile>
817-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\WampTopicProxySection.cs">
818-
<Link>WAMP2\V2\Client\PubSub\WampTopicProxySection.cs</Link>
817+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\PubSub\WampTopicClientProxySection.cs">
818+
<Link>WAMP2\V2\Client\PubSub\WampTopicClientProxySection.cs</Link>
819819
</Compile>
820820
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\Realm\IWampRealmProxy.cs">
821821
<Link>WAMP2\V2\Client\Realm\IWampRealmProxy.cs</Link>
@@ -874,8 +874,8 @@
874874
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Rpc\Dealer\WampClientRouterCallbackAdapter.cs">
875875
<Link>WAMP2\V2\Rpc\Dealer\WampClientRouterCallbackAdapter.cs</Link>
876876
</Compile>
877-
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Rpc\Interfaces\IWampClientRawRpcOperationCallback.cs">
878-
<Link>WAMP2\V2\Rpc\Interfaces\IWampClientRawRpcOperationCallback.cs</Link>
877+
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Rpc\Interfaces\IWampRawRpcOperationClientCallback.cs">
878+
<Link>WAMP2\V2\Rpc\Interfaces\IWampRawRpcOperationClientCallback.cs</Link>
879879
</Compile>
880880
<Compile Include="..\..\net45\WampSharp\WAMP2\V2\Client\Rpc\Interfaces\IWampRpcOperationCatalogProxy.cs">
881881
<Link>WAMP2\V2\Client\Rpc\Interfaces\IWampRpcOperationCatalogProxy.cs</Link>

‎src/net45/Extensions/WampSharp.SignalR/Client/SignalRTextConnection.cs

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,22 @@
77

88
namespace WampSharp.SignalR
99
{
10+
/// <summary>
11+
/// Represents a <see cref="IWampConnection{TMessage}"/> implemented using SignalR.
12+
/// </summary>
13+
/// <typeparam name="TMessage"></typeparam>
1014
public class SignalRTextConnection<TMessage> : IControlledWampConnection<TMessage>
1115
{
1216
private readonly IWampTextBinding<TMessage> mBinding;
1317
private readonly Connection mConnection;
1418
private readonly IClientTransport mTransport;
1519

20+
/// <summary>
21+
/// Creates a new instance of <see cref="SignalRTextConnection{TMessage}"/>.
22+
/// </summary>
23+
/// <param name="uri">The uri of the server to connect to.</param>
24+
/// <param name="binding">The binding to use.</param>
25+
/// <param name="transport">The <see cref="IClientTransport"/> to use.</param>
1626
public SignalRTextConnection(string uri, IWampTextBinding<TMessage> binding, IClientTransport transport)
1727
{
1828
mBinding = binding;
@@ -24,18 +34,18 @@ public SignalRTextConnection(string uri, IWampTextBinding<TMessage> binding, ICl
2434
mConnection.Received += OnReceived;
2535
}
2636

27-
public void OnReceived(string text)
37+
private void OnReceived(string text)
2838
{
2939
WampMessage<TMessage> message = mBinding.Parse(text);
3040
this.RaiseMessageArrived(new WampMessageArrivedEventArgs<TMessage>(message));
3141
}
3242

33-
public void OnError(Exception exception)
43+
private void OnError(Exception exception)
3444
{
3545
this.RaiseConnectionError(new WampConnectionErrorEventArgs(exception));
3646
}
3747

38-
public void OnClosed()
48+
private void OnClosed()
3949
{
4050
this.RaiseConnectionClosed();
4151
}
@@ -85,9 +95,24 @@ protected virtual void RaiseConnectionError(WampConnectionErrorEventArgs e)
8595
if (handler != null) handler(this, e);
8696
}
8797

98+
/// <summary>
99+
/// Occurs when this connection opens.
100+
/// </summary>
88101
public event EventHandler ConnectionOpen;
102+
103+
/// <summary>
104+
/// Occurs when a message arrives.
105+
/// </summary>
89106
public event EventHandler<WampMessageArrivedEventArgs<TMessage>> MessageArrived;
107+
108+
/// <summary>
109+
/// Occurs when this connection closes.
110+
/// </summary>
90111
public event EventHandler ConnectionClosed;
112+
113+
/// <summary>
114+
/// Occurs when this connection occurs an error.
115+
/// </summary>
91116
public event EventHandler<WampConnectionErrorEventArgs> ConnectionError;
92117
}
93118
}

‎src/net45/Extensions/WampSharp.SignalR/Server/SignalRTransport.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,29 @@
55

66
namespace WampSharp.SignalR
77
{
8+
/// <summary>
9+
/// Represents a <see cref="IWampTransport"/> implemented using SignalR.
10+
/// </summary>
811
public class SignalRTransport : IWampTransport
912
{
1013
private readonly string mUrl;
1114
private ISignalRListener mListener;
1215

16+
/// <summary>
17+
/// Creates a new instance of <see cref="SignalRTransport"/> given the url
18+
/// to host the server at.
19+
/// </summary>
20+
/// <param name="url">The url to host the server at.</param>
1321
public SignalRTransport(string url)
1422
{
1523
mUrl = url;
1624
}
1725

18-
public IWampConnectionListener<TMessage> GetListener<TMessage>(IWampTextBinding<TMessage> binding)
26+
private IWampConnectionListener<TMessage> GetListener<TMessage>(IWampTextBinding<TMessage> binding)
1927
{
2028
if (mListener != null)
2129
{
22-
throw new ArgumentException();
30+
throw new ArgumentException("Listener already set.");
2331
}
2432
else
2533
{
@@ -45,7 +53,7 @@ public IWampConnectionListener<TMessage> GetListener<TMessage>(IWampBinding<TMes
4553

4654
if (textBinding == null)
4755
{
48-
throw new ArgumentException();
56+
throw new ArgumentException("This transport supports only text binding.", "binding");
4957
}
5058
else
5159
{

‎src/net45/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25+
<DocumentationFile>bin\Debug\WampSharp.SignalR.XML</DocumentationFile>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2728
<DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
3031
<DefineConstants>TRACE</DefineConstants>
3132
<ErrorReport>prompt</ErrorReport>
3233
<WarningLevel>4</WarningLevel>
34+
<DocumentationFile>bin\Release\WampSharp.SignalR.XML</DocumentationFile>
3335
</PropertyGroup>
3436
<ItemGroup>
3537
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

‎src/net45/Samples/WAMP2/WampSharp.Samples.Callee/ArgumentsService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ArgLenOperation()
4141
{
4242
}
4343

44-
protected override object InvokeSync<TMessage>(IWampRouterRawRpcOperationCallback caller, IWampFormatter<TMessage> formatter, InvocationDetails details, TMessage[] arguments, IDictionary<string, TMessage> argumentsKeywords, out IDictionary<string, object> outputs)
44+
protected override object InvokeSync<TMessage>(IWampRawRpcOperationRouterCallback caller, IWampFormatter<TMessage> formatter, InvocationDetails details, TMessage[] arguments, IDictionary<string, TMessage> argumentsKeywords, out IDictionary<string, object> outputs)
4545
{
4646
outputs = null;
4747

‎src/net45/Samples/WAMP2/WampSharp.Samples.Callee/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ private static void RouterCode(string serverAddress, IEnumerable<IWampRpcOperati
6363
DefaultWampHost host =
6464
new DefaultWampHost(serverAddress, new IWampBinding[]
6565
{
66-
new JTokenMsgpackObjectBinding(),
67-
new JTokenBinding(),
66+
new JTokenMsgpackBinding(),
67+
new JTokenJsonBinding(),
6868
});
6969

7070
IWampRealm realm = host.RealmContainer.GetRealmByName("realm1");

‎src/net45/Samples/WAMP2/WampSharp.Samples.Caller/ManualProxy/ArgumentsProxy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public string Stars(string nick = "somebody", int stars = 0)
9797
}
9898
}
9999

100-
private abstract class Callback<T> : IWampClientRawRpcOperationCallback
100+
private abstract class Callback<T> : IWampRawRpcOperationClientCallback
101101
{
102102
protected readonly TaskCompletionSource<T> mTask = new TaskCompletionSource<T>();
103103

‎src/net45/Samples/WAMP2/WampSharp.Samples.Caller/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private static void RouterCode(string serverAddress, MethodInfo sampleMethod)
7070

7171
private static void ClientCode(string serverAddress, MethodInfo sampleMethod)
7272
{
73-
JTokenBinding binding = new JTokenBinding();
73+
JTokenJsonBinding binding = new JTokenJsonBinding();
7474

7575
DefaultWampChannelFactory factory =
7676
new DefaultWampChannelFactory();

‎src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private static IDisposable ServerCode(WampHost host)
5252
IWampTopicContainer topicContainer = realm.TopicContainer;
5353

5454
IWampTopic topic =
55-
topicContainer.GetOrCreateTopicByUri("com.myapp.topic1", true);
55+
topicContainer.GetOrCreateTopicByUri("com.myapp.topic1");
5656

5757
IDisposable disposable = realm.Services.GetSubject<int>("com.myapp.topic1")
5858
.Subscribe(x => GetValue(x));

‎src/net45/Tests/WampSharp.Tests.Wampv2/Client/Callee/CalleeTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void Unsubscribe(IWampSubscriber subscriber, long requestId, long subscri
188188
protected class OperationMock : IWampRpcOperation
189189
{
190190
private object[] mActualInvoke;
191-
private Action<IWampRouterRawRpcOperationCallback> mInvocationCallback;
191+
private Action<IWampRawRpcOperationRouterCallback> mInvocationCallback;
192192
public string Procedure { get; set; }
193193

194194
public object[] ActualInvoke
@@ -197,24 +197,24 @@ public object[] ActualInvoke
197197
private set { mActualInvoke = value; }
198198
}
199199

200-
public void SetInvocationCallback(Action<IWampRouterRawRpcOperationCallback> value)
200+
public void SetInvocationCallback(Action<IWampRawRpcOperationRouterCallback> value)
201201
{
202202
mInvocationCallback = value;
203203
}
204204

205-
public void Invoke<TMessage1>(IWampRouterRawRpcOperationCallback caller, IWampFormatter<TMessage1> formatter, InvocationDetails details)
205+
public void Invoke<TMessage1>(IWampRawRpcOperationRouterCallback caller, IWampFormatter<TMessage1> formatter, InvocationDetails details)
206206
{
207207
ActualInvoke = new object[] {details};
208208
mInvocationCallback(caller);
209209
}
210210

211-
public void Invoke<TMessage1>(IWampRouterRawRpcOperationCallback caller, IWampFormatter<TMessage1> formatter, InvocationDetails details, TMessage1[] arguments)
211+
public void Invoke<TMessage1>(IWampRawRpcOperationRouterCallback caller, IWampFormatter<TMessage1> formatter, InvocationDetails details, TMessage1[] arguments)
212212
{
213213
ActualInvoke = new object[] { details, arguments };
214214
mInvocationCallback(caller);
215215
}
216216

217-
public void Invoke<TMessage1>(IWampRouterRawRpcOperationCallback caller, IWampFormatter<TMessage1> formatter, InvocationDetails details, TMessage1[] arguments, IDictionary<string, TMessage1> argumentsKeywords)
217+
public void Invoke<TMessage1>(IWampRawRpcOperationRouterCallback caller, IWampFormatter<TMessage1> formatter, InvocationDetails details, TMessage1[] arguments, IDictionary<string, TMessage1> argumentsKeywords)
218218
{
219219
ActualInvoke = new object[] {details, arguments, argumentsKeywords};
220220
mInvocationCallback(caller);

0 commit comments

Comments
 (0)