2009-07-20 Michael Barker <mike@middlesoft.co.uk>

	* MessagingProviderLocator.cs: Default to rabbitmq if no
	MONO_MESSAGING_PROVIDER variable is defined.

svn path=/trunk/mcs/; revision=138230

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog b/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog
index 900d2c11b56589a8a2b8a42f2abb78f2f7d1e2fa..bf7fdb2ac3b666304c06e49350966997f5325341 100644 (file)
--- a/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog
+++ b/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-20  Michael Barker  <mike@middlesoft.co.uk>
+
+       * MessagingProviderLocator.cs: Default to rabbitmq if no
+       MONO_MESSAGING_PROVIDER variable is defined.
+
 2009-07-18  Michael Barker  <mike@middlesoft.co.uk>
 
        * MessagingProviderLocator.cs: Changed to cleanly support loading of

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs b/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs
index ab324352e5cac96edd9a98a5e096af447dc419de..15c5ce6d7e7e78f137463b0313360f90e557f7aa 100644 (file)
--- a/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs
+++ b/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs
@@ -46,11 +46,14 @@ namespace Mono.Messaging
                private static readonly MessagingProviderLocator instance = new MessagingProviderLocator();
                private readonly IMessagingProvider provider;
                private const string MESSAGING_PROVIDER_KEY = "MONO_MESSAGING_PROVIDER";
+               private const string RABBIT_MQ_CLASS_NAME = "Mono.Messaging.RabbitMQ.RabbitMQMessagingProvider";
+               private const string RABBIT_MQ_FULL_CLASS_NAME = RABBIT_MQ_CLASS_NAME + ",Mono.Messaging.RabbitMQ";
+               private const string RABBIT_MQ_ALIAS = "rabbitmq";
                
                private MessagingProviderLocator () {
                        string providerName = GetProviderClassName ();
                        if (providerName == null || providerName == "")
-                               throw new Exception("Configuration/Environment Variable MONO_MESSAGING_PROVIDER not defined");
+                               providerName = RABBIT_MQ_ALIAS;
                        provider = CreateProvider (providerName);
                }
                
@@ -95,10 +98,10 @@ namespace Mono.Messaging
                private Type ResolveType (string classNameOrAlias)
                {
                        switch (classNameOrAlias) {
-                       case "rabbitmq":
-                       case "Mono.Messaging.RabbitMQ.RabbitMQMessagingProvider,Mono.Messaging.RabbitMQ":
+                       case RABBIT_MQ_ALIAS:
+                       case RABBIT_MQ_FULL_CLASS_NAME:
                                Assembly a = Assembly.Load (Consts.AssemblyMono_Messaging_RabbitMQ);
-                               return a.GetType ("Mono.Messaging.RabbitMQ.RabbitMQMessagingProvider");
+                               return a.GetType (RABBIT_MQ_CLASS_NAME);
                        default:
                                throw new MonoMessagingException ("Unknown MessagingProvider class name or alias: " + classNameOrAlias);
                        }