diff options
3 files changed, 9 insertions, 4 deletions
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 ba80c7f3b06..a7b40387171 100644 --- 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 bf7fdb2ac3b..2ffbee769b6 100644 --- a/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog +++ b/mcs/class/Mono.Messaging/Mono.Messaging/ChangeLog @@ -1,5 +1,10 @@ 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 MONO_MESSAGING_PROVIDER variable is defined. diff --git a/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs b/mcs/class/Mono.Messaging/Mono.Messaging/MessagingProviderLocator.cs index 15c5ce6d7e7..61c94309915 100644 --- 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]); } |