Author: jgomes
Date: Wed Mar 12 23:16:10 2014
New Revision: 1576992
URL: http://svn.apache.org/r1576992
Log:
Add IDisposable interface to IDestination.
Fixes [AMQNET-473]. (See https://issues.apache.org/jira/browse/AMQNET-473)
Rename the vs2008 projects to vs2010. They were actually VS 2010 format
projects already, so they should be consistently named.
Added:
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt-tests.csproj
- copied, changed from r1576553,
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt-tests.csproj
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.csproj
- copied, changed from r1576553,
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.csproj
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.sln
- copied, changed from r1576553,
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.sln
Removed:
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt-tests.csproj
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.csproj
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.sln
Modified:
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Connection.cs
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Topic.cs
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/test/csharp/MQTTSessionTest.cs
Modified:
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Connection.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Connection.cs?rev=1576992&r1=1576991&r2=1576992&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Connection.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Connection.cs
Wed Mar 12 23:16:10 2014
@@ -82,13 +82,17 @@ namespace Apache.NMS.MQTT
/// An asynchronous listener that is notified when a Fault
tolerant connection
/// has been interrupted.
/// </summary>
+ #pragma warning disable 0067
public event ConnectionInterruptedListener
ConnectionInterruptedListener;
+ #pragma warning restore 0067
/// <summary>
/// An asynchronous listener that is notified when a Fault
tolerant connection
/// has been resumed.
/// </summary>
+ #pragma warning disable 0067
public event ConnectionResumedListener
ConnectionResumedListener;
+ #pragma warning restore 0067
private ConsumerTransformerDelegate consumerTransformer;
public ConsumerTransformerDelegate ConsumerTransformer
Modified:
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Topic.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Topic.cs?rev=1576992&r1=1576991&r2=1576992&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Topic.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/main/csharp/Topic.cs Wed
Mar 12 23:16:10 2014
@@ -32,6 +32,10 @@ namespace Apache.NMS.MQTT
this.name = name;
}
+ public void Dispose()
+ {
+ }
+
public string TopicName
{
get { return this.name; }
Modified:
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/test/csharp/MQTTSessionTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/test/csharp/MQTTSessionTest.cs?rev=1576992&r1=1576991&r2=1576992&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/test/csharp/MQTTSessionTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/src/test/csharp/MQTTSessionTest.cs
Wed Mar 12 23:16:10 2014
@@ -16,7 +16,6 @@
//
using System;
using Apache.NMS.Test;
-using Apache.NMS.MQTT;
using NUnit.Framework;
namespace Apache.NMS.MQTT.Test
@@ -27,7 +26,7 @@ namespace Apache.NMS.MQTT.Test
private IConnection connection;
[SetUp]
- public void SetUp()
+ public override void SetUp()
{
Apache.NMS.Tracer.Trace = new NmsConsoleTracer();
base.SetUp();
Copied: activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt-tests.csproj
(from r1576553,
activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt-tests.csproj)
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt-tests.csproj?p2=activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt-tests.csproj&p1=activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt-tests.csproj&r1=1576553&r2=1576992&rev=1576992&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt-tests.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt-tests.csproj Wed
Mar 12 23:16:10 2014
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,16 +31,17 @@
<Externalconsole>true</Externalconsole>
</PropertyGroup>
<ItemGroup>
- <Reference Include="System" />
<Reference Include="Apache.NMS">
- <HintPath>build\mono-2.0\debug\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="Apache.NMS.Test">
- <HintPath>build\mono-2.0\debug\Apache.NMS.Test.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.Test.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework">
- <HintPath>build\mono-2.0\debug\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=2.5.8.10295, Culture=neutral,
PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>lib\NUnit\net-2.0\nunit.framework.dll</HintPath>
</Reference>
+ <Reference Include="System" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
@@ -57,9 +58,9 @@
<None Include="nmsprovider-test.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="vs2008-mqtt.csproj">
+ <ProjectReference Include="vs2010-mqtt.csproj">
<Project>{AEBC857B-D693-4833-9F1E-F6A22787D0C9}</Project>
- <Name>vs2008-mqtt</Name>
+ <Name>vs2010-mqtt</Name>
</ProjectReference>
</ItemGroup>
</Project>
\ No newline at end of file
Copied: activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.csproj (from
r1576553, activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.csproj)
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.csproj?p2=activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.csproj&p1=activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.csproj&r1=1576553&r2=1576992&rev=1576992&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.csproj Wed Mar
12 23:16:10 2014
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -30,10 +30,10 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
- <Reference Include="System" />
<Reference Include="Apache.NMS">
- <HintPath>lib\Apache.NMS\mono-2.0\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
+ <Reference Include="System" />
<Reference Include="System.Web" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -109,9 +109,7 @@
<Compile Include="src\main\csharp\Protocol\Header.cs" />
<Compile Include="src\main\csharp\Protocol\MQTTCommandFactory.cs" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="keyfile\" />
- </ItemGroup>
+ <ItemGroup />
<ItemGroup>
<None Include="LICENSE.txt" />
<None Include="NOTICE.txt" />
Copied: activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.sln (from
r1576553, activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.sln)
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.sln?p2=activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.sln&p1=activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.sln&r1=1576553&r2=1576992&rev=1576992&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2008-mqtt.sln (original)
+++ activemq/activemq-dotnet/Apache.NMS.MQTT/trunk/vs2010-mqtt.sln Wed Mar 12
23:16:10 2014
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-mqtt",
"vs2008-mqtt.csproj", "{AEBC857B-D693-4833-9F1E-F6A22787D0C9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2010-mqtt",
"vs2010-mqtt.csproj", "{AEBC857B-D693-4833-9F1E-F6A22787D0C9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-mqtt-tests",
"vs2008-mqtt-tests.csproj", "{186FAC43-F3B0-4B03-82DA-EEC0169307B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2010-mqtt-tests",
"vs2010-mqtt-tests.csproj", "{186FAC43-F3B0-4B03-82DA-EEC0169307B7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,7 +21,7 @@ Global
{AEBC857B-D693-4833-9F1E-F6A22787D0C9}.Release|x86.Build.0 =
Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = vs2008-mqtt-tests.csproj
+ StartupItem = vs2010-mqtt-tests.csproj
Policies = $0
$0.TextStylePolicy = $1
$1.inheritsSet = null
