Merge branch 'master' of github.com:mookid8000/Rebus

rebus-org · Oct 9, 2012 · 32070e4 · 32070e4
2 parents 6d1e636 + 5a12fdc
commit 32070e4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/src/Rebus.Autofac/AutofacContainerAdapter.cs b/src/Rebus.Autofac/AutofacContainerAdapter.cs
@@ -39,6 +39,7 @@ public void SaveBusInstances(IBus bus, IAdvancedBus advancedBus)
             var builder = new ContainerBuilder();
             builder.RegisterInstance(bus).As<IBus>();
             builder.RegisterInstance(advancedBus).As<IAdvancedBus>();
+            builder.Register(a => MessageContext.GetCurrent()).InstancePerDependency();
             builder.Update(container);
         }
     }

diff --git a/src/Rebus.Castle.Windsor/WindsorContainerAdapter.cs b/src/Rebus.Castle.Windsor/WindsorContainerAdapter.cs
@@ -51,7 +51,8 @@ public void SaveBusInstances(IBus bus, IAdvancedBus advancedBus)
                     .Instance(advancedBus),
 
                 Component.For<IMessageContext>()
-                    .UsingFactoryMethod(k => MessageContext.GetCurrent()),
+                    .UsingFactoryMethod(k => MessageContext.GetCurrent())
+                    .LifestyleTransient(),
 
                 Component.For<InstanceDisposer>()
                 );

diff --git a/src/Rebus.Ninject/NinjectContainerAdapter.cs b/src/Rebus.Ninject/NinjectContainerAdapter.cs
@@ -33,6 +33,7 @@ public void SaveBusInstances(IBus bus, IAdvancedBus advancedBus)
         {
             kernel.Bind<IBus>().ToConstant(bus).InSingletonScope().Named("bus");
             kernel.Bind<IAdvancedBus>().ToConstant(advancedBus).InSingletonScope().Named("advancedBus");
+            kernel.Bind<IMessageContext>().ToMethod(k => MessageContext.GetCurrent()).InTransientScope().Named("messageContext");
 
             // We need to ensure that the kernel have resolved the interfaces once to make it control their lifetime
             kernel.Get<IBus>();

diff --git a/src/Rebus.StructureMap/StructureMapContainerAdapter.cs b/src/Rebus.StructureMap/StructureMapContainerAdapter.cs
@@ -40,6 +40,7 @@ public void SaveBusInstances(IBus bus, IAdvancedBus advancedBus)
                 {
                     x.For<IBus>().Singleton().Add(bus);
                     x.For<IAdvancedBus>().Singleton().Add(advancedBus);
+                    x.For<IMessageContext>().Transient().Use(MessageContext.GetCurrent);
                 });
         }
     }

diff --git a/src/Rebus.Unity/UnityContainerAdapter.cs b/src/Rebus.Unity/UnityContainerAdapter.cs
@@ -33,6 +33,7 @@ public void SaveBusInstances(IBus bus, IAdvancedBus advancedBus)
         {
             unityContainer.RegisterInstance(typeof(IBus), bus);
             unityContainer.RegisterInstance(typeof(IAdvancedBus), advancedBus);
+            unityContainer.RegisterType<IMessageContext>(new InjectionFactory(c => MessageContext.GetCurrent()));
         }
     }
 }
diff --git a/src/Rebus/Configuration/BuiltinContainerAdapter.cs b/src/Rebus/Configuration/BuiltinContainerAdapter.cs
@@ -12,9 +12,15 @@ public class BuiltinContainerAdapter : IContainerAdapter, IDisposable
     {
         readonly SimpleHandlerActivator handlerActivator = new SimpleHandlerActivator();
 
-        public IBus Bus { get; set; }
+        /// <summary>
+        /// Use this property to access the bus instance
+        /// </summary>
+        public IBus Bus { get; internal set; }
 
-        public IAdvancedBus AdvancedBus { get; set; }
+        /// <summary>
+        /// Use this property to access the advanced bus, which is an ordinary bus plus some advanced operations
+        /// </summary>
+        public IAdvancedBus AdvancedBus { get; internal set; }
 
         /// <summary>
         /// Registers the given handler type. It is assumed that the type registered has a public