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

	* MessagingProviderLocator.cs: Changed System.Exceptions to
	MonoMessagingExceptions.

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

diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ_test_net_2_0.dll.config b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ_test_net_2_0.dll.config
index ba80c7f3b06f65a994139e8437477b0d748c9edf..a7b40387171fc7da0e549fc8ed8e0608a4d5c875 100644 (file)
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ_test_net_2_0.dll.config
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ_test_net_2_0.dll.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
        <appSettings>
-               <add key="MONO_MESSAGING_PROVIDER" value="Mono.Messaging.RabbitMQ.RabbitMQMessagingProvider,Mono.Messaging.RabbitMQ"/>
+               <add key="MONO_MESSAGING_PROVIDER" value="rabbitmq"/>
        </appSettings>
 </configuration>
\ No newline at end of file

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog b/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog
index bf7fdb2ac3b666304c06e49350966997f5325341..2ffbee769b690e0b3455fd5a6f9c6ddc7bc14a9d 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: Changed System.Exceptions to
+       MonoMessagingExceptions.
+
 2009-07-20  Michael Barker  <mike@middlesoft.co.uk>
 
        * MessagingProviderLocator.cs: Default to rabbitmq if no

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs b/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs
index 15c5ce6d7e7e78f137463b0313360f90e557f7aa..61c94309915f8207369f627fd24443bb0d380f4d 100644 (file)
--- a/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs
+++ b/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs
@@ -69,7 +69,7 @@ namespace Mono.Messaging
 #if NET_2_0 || BOOTSTRAP_NET_2_0 || NET_3_0 || NET_2_1 || NET_3_0 || NET_3_5 || NET_4_0 || BOOTSTRAP_NET_4_0
                private string GetProviderClassName ()
                {
-                       string className = System.Configuration.ConfigurationSettings.AppSettings[MESSAGING_PROVIDER_KEY];
+                       string className = System.Configuration.ConfigurationManager.AppSettings[MESSAGING_PROVIDER_KEY];
                        return className != null ? className : System.Environment.GetEnvironmentVariable(MESSAGING_PROVIDER_KEY);
                }
 #else
@@ -83,14 +83,14 @@ namespace Mono.Messaging
                {
                        Type t = ResolveType (className);                       
                        if (t == null)
-                               throw new Exception ("Can't find class: " + className);
+                               throw new MonoMessagingException ("Can't find class: " + className);
                        
                        ConstructorInfo ci = t.GetConstructor (BindingFlags.Public | BindingFlags.Instance,
                                                               Type.DefaultBinder,
                                                               new Type[0],
                                                               new ParameterModifier[0]);
                        if (ci == null)
-                               throw new Exception ("Can't find constructor");
+                               throw new MonoMessagingException ("Can't find constructor");
                        
                        return (IMessagingProvider) ci.Invoke (new object[0]);
                }