Permalink
Browse files

Merge pull request #14 from joefitzgerald/master

RabbitMQ Client 2.6.1 Upgrade
  • Loading branch information...
2 parents 79d64c7 + f721ca6 commit 31c915340ecda5bb6756a1dd7134bce579461408 @joefitzgerald joefitzgerald committed Sep 19, 2011
Showing with 95 additions and 47 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 Spring.Amqp.build
  3. BIN packages/RabbitMQ.Client.2.5.1/RabbitMQ.Client.2.5.1.nupkg
  4. BIN packages/RabbitMQ.Client.2.5.1/lib/net20/RabbitMQ.Client.dll
  5. BIN packages/RabbitMQ.Client.2.5.1/lib/net30/RabbitMQ.Client.dll
  6. BIN packages/RabbitMQ.Client.2.6.1/RabbitMQ.Client.2.6.1.nupkg
  7. BIN packages/RabbitMQ.Client.2.6.1/lib/net20/RabbitMQ.Client.dll
  8. +16 −6 packages/{RabbitMQ.Client.2.5.1/lib/net30 → RabbitMQ.Client.2.6.1/lib/net20}/RabbitMQ.Client.xml
  9. BIN packages/RabbitMQ.Client.2.6.1/lib/net30/RabbitMQ.Client.dll
  10. +16 −6 packages/{RabbitMQ.Client.2.5.1/lib/net20 → RabbitMQ.Client.2.6.1/lib/net30}/RabbitMQ.Client.xml
  11. +1 −1 setup/Spring.Messaging.Amqp.Rabbit.nuspec
  12. +5 −4 src/CommonAssemblyInfo.cs
  13. +2 −2 src/Spring.Messaging.Amqp.Rabbit.Admin/Spring.Messaging.Amqp.Rabbit.Admin.2010.csproj
  14. +3 −3 src/Spring.Messaging.Amqp.Rabbit.Admin/packages.config
  15. +26 −0 src/Spring.Messaging.Amqp.Rabbit/Connection/CachedModel.cs
  16. +2 −2 src/Spring.Messaging.Amqp.Rabbit/Spring.Messaging.Amqp.Rabbit.2010.csproj
  17. +3 −3 src/Spring.Messaging.Amqp.Rabbit/packages.config
  18. +2 −2 test/Spring.Erlang.Tests/Spring.Erlang.Tests.2010.csproj
  19. +3 −3 test/Spring.Erlang.Tests/packages.config
  20. +2 −2 test/Spring.Messaging.Amqp.Rabbit.Admin.Tests/Spring.Messaging.Amqp.Rabbit.Admin.Tests.2010.csproj
  21. +3 −3 test/Spring.Messaging.Amqp.Rabbit.Admin.Tests/packages.config
  22. +3 −3 test/Spring.Messaging.Amqp.Rabbit.Tests/Spring.Messaging.Amqp.Rabbit.Tests.2010.csproj
  23. +6 −6 test/Spring.Messaging.Amqp.Rabbit.Tests/packages.config
View
@@ -47,3 +47,4 @@
/bin/
*.csproj.user
/_ReSharper.Spring.Messaging.Amqp.2010-40/
+/package/
View
@@ -24,7 +24,7 @@
<property name="product.fullname" value="${product.name} ${product.version}" if="${(product.releasetype == '')}" />
<property name="product.fullname" value="${product.name} ${product.version} (${product.releasetype})" if="${(product.releasetype != '')}" />
- <property name="project.buildnumber" value="7618" />
+ <property name="project.buildnumber" value="7620" />
<property name="project.version" value="${product.version}.${project.buildnumber}" />
<property name="project.buildtype" value="dev" />
<property name="project.sign" value="false" overwrite="false" />
@@ -1106,6 +1106,10 @@
<summary>Used to send a Queue.Declare method. Called by the
public declare method.</summary>
</member>
+ <member name="M:RabbitMQ.Client.Impl.IFullModel.HandleQueueDeclareOk(System.String,System.UInt32,System.UInt32)">
+ <summary>Handle incoming Queue.DeclareOk methods. Routes the
+ information to a waiting Queue.DeclareOk continuation.</summary>
+ </member>
<member name="M:RabbitMQ.Client.Impl.IFullModel._Private_QueueBind(System.String,System.String,System.String,System.Boolean,System.Collections.IDictionary)">
<summary>Used to send a Queue.Bind method. Called by the
public bind method.</summary>
@@ -3776,7 +3780,7 @@
factory.VirtualHost = ConnectionFactory.DefaultVHost;
factory.Protocol = Protocols.FromEnvironment();
factory.HostName = hostName;
- factory.PortNumber = AmqpTcpEndpoint.UseDefaultPort;
+ factory.Port = AmqpTcpEndpoint.UseDefaultPort;
//
IConnection conn = factory.CreateConnection();
//
@@ -4000,12 +4004,13 @@
</member>
<member name="T:RabbitMQ.Client.ExchangeType">
<summary>
- Convenience class providing compile-time names for various exchange types.
+ Convenience class providing compile-time names for standard exchange types.
</summary>
<remarks>
Use the static members of this class as values for the
"exchangeType" arguments for IModel methods such as
- ExchangeDeclare.
+ ExchangeDeclare. The broker may be extended with additional
+ exchange types that do not appear in this class.
</remarks>
</member>
<member name="F:RabbitMQ.Client.ExchangeType.Fanout">
@@ -4017,11 +4022,14 @@
<member name="F:RabbitMQ.Client.ExchangeType.Topic">
<summary>Exchange type used for AMQP topic exchanges.</summary>
</member>
+ <member name="F:RabbitMQ.Client.ExchangeType.Headers">
+ <summary>Exchange type used for AMQP headers exchanges.</summary>
+ </member>
<member name="M:RabbitMQ.Client.ExchangeType.#ctor">
<summary>Private constructor - this class has no instances</summary>
</member>
<member name="M:RabbitMQ.Client.ExchangeType.All">
- <summary>Retrieve a collection containing all defined exchange types.</summary>
+ <summary>Retrieve a collection containing all standard exchange types.</summary>
</member>
<member name="T:RabbitMQ.Client.IConnection">
<summary>Main interface to an AMQP connection.</summary>
@@ -4743,8 +4751,10 @@
</summary>
</member>
<member name="P:RabbitMQ.Client.SslOption.Certs">
- <summary>Convenience read-only property to retrieve an X509CertificateCollection
- containing the client certificate</summary>
+ <summary>Retrieve or set the X509CertificateCollection
+ containing the client certificate. If no collection is set,
+ the client will attempt to load one from the specified
+ CertPath.</summary>
</member>
<member name="P:RabbitMQ.Client.SslOption.ServerName">
<summary>Retrieve or set server's Canonical Name. This MUST match the CN
@@ -1106,6 +1106,10 @@
<summary>Used to send a Queue.Declare method. Called by the
public declare method.</summary>
</member>
+ <member name="M:RabbitMQ.Client.Impl.IFullModel.HandleQueueDeclareOk(System.String,System.UInt32,System.UInt32)">
+ <summary>Handle incoming Queue.DeclareOk methods. Routes the
+ information to a waiting Queue.DeclareOk continuation.</summary>
+ </member>
<member name="M:RabbitMQ.Client.Impl.IFullModel._Private_QueueBind(System.String,System.String,System.String,System.Boolean,System.Collections.IDictionary)">
<summary>Used to send a Queue.Bind method. Called by the
public bind method.</summary>
@@ -3776,7 +3780,7 @@
factory.VirtualHost = ConnectionFactory.DefaultVHost;
factory.Protocol = Protocols.FromEnvironment();
factory.HostName = hostName;
- factory.PortNumber = AmqpTcpEndpoint.UseDefaultPort;
+ factory.Port = AmqpTcpEndpoint.UseDefaultPort;
//
IConnection conn = factory.CreateConnection();
//
@@ -4000,12 +4004,13 @@
</member>
<member name="T:RabbitMQ.Client.ExchangeType">
<summary>
- Convenience class providing compile-time names for various exchange types.
+ Convenience class providing compile-time names for standard exchange types.
</summary>
<remarks>
Use the static members of this class as values for the
"exchangeType" arguments for IModel methods such as
- ExchangeDeclare.
+ ExchangeDeclare. The broker may be extended with additional
+ exchange types that do not appear in this class.
</remarks>
</member>
<member name="F:RabbitMQ.Client.ExchangeType.Fanout">
@@ -4017,11 +4022,14 @@
<member name="F:RabbitMQ.Client.ExchangeType.Topic">
<summary>Exchange type used for AMQP topic exchanges.</summary>
</member>
+ <member name="F:RabbitMQ.Client.ExchangeType.Headers">
+ <summary>Exchange type used for AMQP headers exchanges.</summary>
+ </member>
<member name="M:RabbitMQ.Client.ExchangeType.#ctor">
<summary>Private constructor - this class has no instances</summary>
</member>
<member name="M:RabbitMQ.Client.ExchangeType.All">
- <summary>Retrieve a collection containing all defined exchange types.</summary>
+ <summary>Retrieve a collection containing all standard exchange types.</summary>
</member>
<member name="T:RabbitMQ.Client.IConnection">
<summary>Main interface to an AMQP connection.</summary>
@@ -4743,8 +4751,10 @@
</summary>
</member>
<member name="P:RabbitMQ.Client.SslOption.Certs">
- <summary>Convenience read-only property to retrieve an X509CertificateCollection
- containing the client certificate</summary>
+ <summary>Retrieve or set the X509CertificateCollection
+ containing the client certificate. If no collection is set,
+ the client will attempt to load one from the specified
+ CertPath.</summary>
</member>
<member name="P:RabbitMQ.Client.SslOption.ServerName">
<summary>Retrieve or set server's Canonical Name. This MUST match the CN
@@ -18,7 +18,7 @@
<dependency id="Spring.Data" version="1.3.2" />
<dependency id="Newtonsoft.Json" version="4.0.2" />
<dependency id="Spring.Messaging.Amqp" version="1.0.0.0" />
- <dependency id="RabbitMQ.Client" version="2.5.1" />
+ <dependency id="RabbitMQ.Client" version="2.6.1" />
</dependencies>
</metadata>
<files>
@@ -5,7 +5,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.225
+// Runtime Version:4.0.30319.235
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -14,9 +14,10 @@
[assembly: CLSCompliantAttribute(true)]
[assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyProductAttribute("Spring.NET AMQP Messaging Framework 0.9.5 for .NET 4.0")]
-[assembly: AssemblyCompanyAttribute("http://www.springframework.net/")]
-[assembly: AssemblyCopyrightAttribute("Copyright 2011 SpringSource")]
+//[assembly: AllowPartiallyTrustedCallersAttribute()]
+[assembly: SecurityPermissionAttribute(SecurityAction.RequestMinimum)]
+[assembly: AssemblyCompanyAttribute("http://springsource.org/spring-amqp/")]
+[assembly: AssemblyCopyrightAttribute("Copyright 2011 SpringSource.")]
[assembly: AssemblyTrademarkAttribute("Apache License, Version 2.0")]
[assembly: AssemblyCultureAttribute("")]
[assembly: AssemblyVersionAttribute("1.0.0.0")]
@@ -64,9 +64,9 @@
<Reference Include="log4net">
<HintPath>..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
</Reference>
- <Reference Include="RabbitMQ.Client, Version=2.5.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+ <Reference Include="RabbitMQ.Client, Version=2.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\RabbitMQ.Client.2.5.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+ <HintPath>..\..\packages\RabbitMQ.Client.2.6.1\lib\net30\RabbitMQ.Client.dll</HintPath>
</Reference>
<Reference Include="Spring.Core, Version=1.3.2.40943, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="log4net" version="1.2.10" />
- <package id="Erlang.NET" version="0.9.5" />
<package id="Common.Logging" version="2.0.0" />
- <package id="RabbitMQ.Client" version="2.5.1" />
+ <package id="Erlang.NET" version="0.9.5" />
+ <package id="log4net" version="1.2.10" />
+ <package id="RabbitMQ.Client" version="2.6.1" />
<package id="Spring.Core" version="1.3.2" />
</packages>
@@ -716,5 +716,31 @@ public void Dispose()
{
this.InvokeActionWithReconnect(() => this.target.Dispose());
}
+
+
+ QueueDeclareOk IModel.QueueDeclare(string queue, bool durable, bool exclusive, bool autoDelete, IDictionary arguments)
+ {
+ throw new NotImplementedException();
+ }
+
+ QueueDeclareOk IModel.QueueDeclare()
+ {
+ throw new NotImplementedException();
+ }
+
+ QueueDeclareOk IModel.QueueDeclarePassive(string queue)
+ {
+ throw new NotImplementedException();
+ }
+
+ public bool WaitForConfirms()
+ {
+ throw new NotImplementedException();
+ }
+
+ public void WaitForConfirmsOrDie()
+ {
+ throw new NotImplementedException();
+ }
}
}
@@ -61,9 +61,9 @@
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.4.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="RabbitMQ.Client, Version=2.5.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+ <Reference Include="RabbitMQ.Client, Version=2.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\RabbitMQ.Client.2.5.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+ <HintPath>..\..\packages\RabbitMQ.Client.2.6.1\lib\net30\RabbitMQ.Client.dll</HintPath>
</Reference>
<Reference Include="Spring.Aop, Version=1.3.2.40943, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="4.0.2" />
<package id="Common.Logging" version="2.0.0" />
- <package id="RabbitMQ.Client" version="2.5.1" />
- <package id="Spring.Core" version="1.3.2" />
+ <package id="Newtonsoft.Json" version="4.0.2" />
+ <package id="RabbitMQ.Client" version="2.6.1" />
<package id="Spring.Aop" version="1.3.2" />
+ <package id="Spring.Core" version="1.3.2" />
<package id="Spring.Data" version="1.3.2" />
</packages>
@@ -75,9 +75,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
</Reference>
- <Reference Include="RabbitMQ.Client, Version=2.5.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+ <Reference Include="RabbitMQ.Client, Version=2.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\RabbitMQ.Client.2.5.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+ <HintPath>..\..\packages\RabbitMQ.Client.2.6.1\lib\net30\RabbitMQ.Client.dll</HintPath>
</Reference>
<Reference Include="Spring.Core, Version=1.3.2.40943, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="log4net" version="1.2.10" />
+ <package id="Common.Logging" version="2.0.0" />
<package id="Erlang.NET" version="0.9.5" />
+ <package id="log4net" version="1.2.10" />
<package id="NUnit" version="2.5.10.11092" />
- <package id="Common.Logging" version="2.0.0" />
- <package id="RabbitMQ.Client" version="2.5.1" />
+ <package id="RabbitMQ.Client" version="2.6.1" />
<package id="Spring.Core" version="1.3.2" />
</packages>
@@ -75,9 +75,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
</Reference>
- <Reference Include="RabbitMQ.Client, Version=2.5.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+ <Reference Include="RabbitMQ.Client, Version=2.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\RabbitMQ.Client.2.5.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+ <HintPath>..\..\packages\RabbitMQ.Client.2.6.1\lib\net30\RabbitMQ.Client.dll</HintPath>
</Reference>
<Reference Include="Spring.Core, Version=1.3.2.40943, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="log4net" version="1.2.10" />
- <package id="Erlang.NET" version="0.9.5" />
<package id="Common.Logging" version="2.0.0" />
+ <package id="Erlang.NET" version="0.9.5" />
+ <package id="log4net" version="1.2.10" />
<package id="NUnit" version="2.5.10.11092" />
- <package id="RabbitMQ.Client" version="2.5.1" />
+ <package id="RabbitMQ.Client" version="2.6.1" />
<package id="Spring.Core" version="1.3.2" />
</packages>
@@ -54,7 +54,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AutoMoq, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="AutoMoq, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\AutoMoq.1.5.0\lib\AutoMoq.dll</HintPath>
</Reference>
@@ -88,9 +88,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
</Reference>
- <Reference Include="RabbitMQ.Client, Version=2.5.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+ <Reference Include="RabbitMQ.Client, Version=2.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\RabbitMQ.Client.2.5.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+ <HintPath>..\..\packages\RabbitMQ.Client.2.6.1\lib\net30\RabbitMQ.Client.dll</HintPath>
</Reference>
<Reference Include="Spring.Aop, Version=1.3.2.40943, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Moq" version="4.0.10827" />
- <package id="NUnit" version="2.5.10.11092" />
+ <package id="AutoMoq" version="1.5.0" />
<package id="Common.Logging" version="2.0.0" />
<package id="CommonServiceLocator" version="1.0" />
- <package id="Unity" version="2.1.505.0" />
- <package id="RabbitMQ.Client" version="2.5.1" />
- <package id="Spring.Core" version="1.3.2" />
+ <package id="Moq" version="4.0.10827" />
+ <package id="NUnit" version="2.5.10.11092" />
+ <package id="RabbitMQ.Client" version="2.6.1" />
<package id="Spring.Aop" version="1.3.2" />
+ <package id="Spring.Core" version="1.3.2" />
<package id="Spring.Data" version="1.3.2" />
- <package id="AutoMoq" version="1.5.0" />
+ <package id="Unity" version="2.1.505.0" />
</packages>

0 comments on commit 31c9153

Please sign in to comment.