adding the notion of automatically executing deployment & env. valida…

…tion actions. git-svn-id: https://rhino-tools.svn.sourceforge.net/svnroot/rhino-tools/trunk@2040 079b0acf-d9fa-0310-9935-e5ade295c882
lanwin · Feb 18, 2009 · 1a03139 · 1a03139
1 parent 893fca4
commit 1a03139
Show file tree

Hide file tree

Showing 21 changed files with 239 additions and 92 deletions.
diff --git a/Rhino.ServiceBus.Host/Actions/InstallAction.cs b/Rhino.ServiceBus.Host/Actions/InstallAction.cs
@@ -33,7 +33,7 @@ public void Execute(ExecutingOptions options)
 
             var host = new RhinoServiceBusHost();
             host.SetArguments(options.Assembly, options.ConfigFile);
-            host.CreateQueues();
+            host.InitialDeployment(installer.Account);
         }
     }
 }
diff --git a/Rhino.ServiceBus.Host/ProjectInstaller.cs b/Rhino.ServiceBus.Host/ProjectInstaller.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Configuration.Install;
 using System.Linq;
+using System.ServiceProcess;
 
 
 namespace Rhino.ServiceBus.Host
@@ -19,6 +20,14 @@ public string ServiceName
 			}
 		}
 
+	    public ServiceAccount Account
+	    {
+	        get
+	        {
+	            return serviceProcessInstaller1.Account;
+	        }
+	    }
+
 		public ProjectInstaller()
 		{
 			InitializeComponent();

diff --git a/Rhino.ServiceBus.Host/RhinoServiceBusHost.cs b/Rhino.ServiceBus.Host/RhinoServiceBusHost.cs
@@ -1,4 +1,6 @@
 
+using System;
+
 namespace Rhino.ServiceBus.Host
 {
 	using System.ServiceProcess;
@@ -38,10 +40,13 @@ public void DebugStart(string[] arguments)
 			OnStart(arguments);
 		}
 
-	    public void CreateQueues()
+	    public void InitialDeployment(ServiceAccount account)
 	    {
 	        var tmpHost = new RemoteAppDomainHost(asm, cfg);
-	        tmpHost.CreateQueues();
+	        var user = account.ToString();
+            if (account == ServiceAccount.User)
+                user = Environment.UserDomainName;
+	        tmpHost.InitialDeployment(user);
             tmpHost.Close();
 
 	    }

diff --git a/Rhino.ServiceBus/Actions/CreateLogQueueAction.cs b/Rhino.ServiceBus/Actions/CreateLogQueueAction.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Messaging;
+using Rhino.ServiceBus.Internal;
+using Rhino.ServiceBus.MessageModules;
+using Rhino.ServiceBus.Msmq;
+
+namespace Rhino.ServiceBus.Actions
+{
+    public class CreateLogQueueAction : IDeploymentAction
+    {
+        private readonly MessageLoggingModule messageLoggingModule;
+        private readonly ITransport transport;
+
+        public CreateLogQueueAction(MessageLoggingModule messageLoggingModule, ITransport transport)
+        {
+            this.messageLoggingModule = messageLoggingModule;
+            this.transport = transport;
+        }
+
+        public void Execute(string user)
+        {
+            // will create the queues if they are not already there
+            messageLoggingModule.Init(transport);
+            var queuePath = MsmqUtil.GetQueuePath(new Endpoint
+            {
+                Uri = messageLoggingModule.LogQueue
+            }).QueuePath;
+
+            using (var queue = new MessageQueue(queuePath))
+            {
+                queue.SetPermissions(user,
+                                     MessageQueueAccessRights.DeleteMessage |
+                                     MessageQueueAccessRights.DeleteJournalMessage |
+                                     MessageQueueAccessRights.GenericRead |
+                                     MessageQueueAccessRights.GenericWrite |
+                                     MessageQueueAccessRights.GetQueuePermissions |
+                                     MessageQueueAccessRights.PeekMessage |
+                                     MessageQueueAccessRights.ReceiveJournalMessage |
+                                     MessageQueueAccessRights.ReceiveMessage |
+                                     MessageQueueAccessRights.WriteMessage,
+                                     AccessControlEntryType.Allow);
+            }
+        }
+    }
+}
diff --git a/Rhino.ServiceBus/Actions/CreateQueuesAction.cs b/Rhino.ServiceBus/Actions/CreateQueuesAction.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Messaging;
+using Rhino.ServiceBus.Msmq;
+
+namespace Rhino.ServiceBus.Actions
+{
+    public class CreateQueuesAction : IDeploymentAction
+    {
+        private readonly IQueueStrategy queueStrategy;
+        private readonly IServiceBus serviceBus;
+
+        public CreateQueuesAction(IQueueStrategy queueStrategy, IServiceBus serviceBus)
+        {
+            this.queueStrategy = queueStrategy;
+            this.serviceBus = serviceBus;
+        }
+
+        public void Execute(string user)
+        {
+            // will create the queues if they are not already there
+            var queues = queueStrategy.InitializeQueue(serviceBus.Endpoint);
+            foreach (var queue in queues)
+            {
+                queue.SetPermissions(user,
+                                     MessageQueueAccessRights.DeleteMessage |
+                                     MessageQueueAccessRights.DeleteJournalMessage |
+                                     MessageQueueAccessRights.GenericRead |
+                                     MessageQueueAccessRights.GenericWrite |
+                                     MessageQueueAccessRights.GetQueuePermissions |
+                                     MessageQueueAccessRights.PeekMessage |
+                                     MessageQueueAccessRights.ReceiveJournalMessage |
+                                     MessageQueueAccessRights.ReceiveMessage |
+                                     MessageQueueAccessRights.WriteMessage,
+                                     AccessControlEntryType.Allow);
+            }
+        }
+    }
+}
diff --git a/Rhino.ServiceBus/Actions/IDeploymentAction.cs b/Rhino.ServiceBus/Actions/IDeploymentAction.cs
@@ -2,6 +2,6 @@ namespace Rhino.ServiceBus.Actions
 {
     public interface IDeploymentAction
     {
-        void Execute();
+        void Execute(string user);
     }
 }
diff --git a/...o.ServiceBus/Actions/IValidationAction.cs → ...s/Actions/IEnvironmentValidationAction.cs b/...o.ServiceBus/Actions/IValidationAction.cs → ...s/Actions/IEnvironmentValidationAction.cs
@@ -1,6 +1,6 @@
 namespace Rhino.ServiceBus.Actions
 {
-    public interface IValidationAction
+    public interface IEnvironmentValidationAction
     {
         void Execute();
     }

diff --git a/Rhino.ServiceBus/Hosting/AbstractBootStrapper.cs b/Rhino.ServiceBus/Hosting/AbstractBootStrapper.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using Castle.MicroKernel.Registration;
 using Castle.Windsor;
+using Rhino.ServiceBus.Actions;
 using Rhino.ServiceBus.Impl;
 using Rhino.ServiceBus.Internal;
 
@@ -30,6 +31,10 @@ public void InitializeContainer(IWindsorContainer windsorContainer)
         protected virtual void ConfigureContainer()
         {
             container.Register(
+                AllTypes.Of<IDeploymentAction>()
+                    .FromAssembly(Assembly),
+                AllTypes.Of<IEnvironmentValidationAction>()
+                    .FromAssembly(Assembly),
                 AllTypes
 					.FromAssembly(Assembly)
 					.Where(type => 

diff --git a/Rhino.ServiceBus/Hosting/DefaultHost.cs b/Rhino.ServiceBus/Hosting/DefaultHost.cs
@@ -6,14 +6,15 @@
 using Castle.Windsor.Configuration.Interpreters;
 using log4net;
 using log4net.Config;
+using Rhino.ServiceBus.Actions;
 using Rhino.ServiceBus.Impl;
 using Rhino.ServiceBus.Internal;
 using Rhino.ServiceBus.MessageModules;
 using Rhino.ServiceBus.Msmq;
 
 namespace Rhino.ServiceBus.Hosting
 {
-    public class DefaultHost : MarshalByRefObject, IDisposable
+    public class DefaultHost : MarshalByRefObject, IApplicationHost
     {
         private readonly ILog logger = LogManager.GetLogger(typeof(DefaultHost));
         private string assebmlyName;
@@ -137,20 +138,19 @@ public override object InitializeLifetimeService()
             return null; //singleton
         }
 
-        public void CreateQueues(string asmName)
+        public void InitialDeployment(string asmName, string user)
         {
             InitailizeBus(asmName);
 
-            var queueStrategy = container.Resolve<IQueueStrategy>();
-            // will create the queues if they are not already there
-            queueStrategy.InitializeQueue(serviceBus.Endpoint);
+            foreach (var action in container.ResolveAll<IDeploymentAction>())
+            {
+                action.Execute(user);
+            }
 
-            if(container.Kernel.HasComponent(typeof(MessageLoggingModule))==false)
-                return;
-            var transport = container.Resolve<ITransport>();
-            var loggingModule = container.Resolve<MessageLoggingModule>();
-            // will create the queues if they are not already there
-            loggingModule.Init(transport);
+            foreach (var action in container.ResolveAll<IEnvironmentValidationAction>())
+            {
+                action.Execute();
+            }
         }
     }
 }
diff --git a/Rhino.ServiceBus/Hosting/IApplicationHost.cs b/Rhino.ServiceBus/Hosting/IApplicationHost.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Rhino.ServiceBus.Hosting
+{
+    public interface IApplicationHost : IDisposable
+    {
+        void Start(string assembly);
+        void InitialDeployment(string assembly, string user);
+    }
+}
diff --git a/Rhino.ServiceBus/Hosting/RemoteAppDomainHost.cs b/Rhino.ServiceBus/Hosting/RemoteAppDomainHost.cs
@@ -6,14 +6,14 @@
 
 namespace Rhino.ServiceBus.Hosting
 {
-	using System.Reflection;
-	using System.Text;
+    using System.Reflection;
+    using System.Text;
 
     public class RemoteAppDomainHost
     {
-	    private readonly Type boosterType;
+        private readonly Type boosterType;
         private readonly string assembly;
-        private string path;
+        private readonly string path;
         private HostedService current;
         private string configurationFile;
 
@@ -24,7 +24,7 @@ public RemoteAppDomainHost Configuration(string configFile)
         }
 
         public RemoteAppDomainHost(Type boosterType)
-            :this(boosterType.Assembly.Location, null)
+            : this(boosterType.Assembly.Location, null)
         {
             this.boosterType = boosterType;
         }
@@ -40,19 +40,19 @@ public void Start()
         {
             HostedService service = CreateNewAppDomain();
             current = service;
-        	try
-        	{
-        		service.Start();
-        	}
-			catch (ReflectionTypeLoadException e)
-			{
-				var sb = new StringBuilder();
-				foreach (var exception in e.LoaderExceptions)
-				{
-					sb.AppendLine(exception.ToString());
-				}
-				throw new TypeLoadException(sb.ToString(), e);
-			}
+            try
+            {
+                service.Start();
+            }
+            catch (ReflectionTypeLoadException e)
+            {
+                var sb = new StringBuilder();
+                foreach (var exception in e.LoaderExceptions)
+                {
+                    sb.AppendLine(exception.ToString());
+                }
+                throw new TypeLoadException(sb.ToString(), e);
+            }
         }
 
         private HostedService CreateNewAppDomain()
@@ -69,27 +69,18 @@ private HostedService CreateNewAppDomain()
         }
 
         protected virtual HostedService CreateRemoteHost(AppDomain appDomain)
-	    {
-	        object instance = appDomain.CreateInstanceAndUnwrap("Rhino.ServiceBus",
-	                                                            "Rhino.ServiceBus.Hosting.DefaultHost");
-	        var hoster = (DefaultHost) instance;
-
-	        if (boosterType != null)
-	            hoster.SetBootStrapperTypeName(boosterType.FullName);
-
-	        return new HostedService
-	        {
-                CreateQueues = ()=>hoster.CreateQueues(assembly),
-	            Stop = ()=>
-	            {
-	                hoster.Dispose();
-	                AppDomain.Unload(appDomain);
-	            },
-	            Start = () => hoster.Start(assembly)
-	        };
-	    }
-
-	    private string ConfigurationFile
+        {
+            object instance = appDomain.CreateInstanceAndUnwrap("Rhino.ServiceBus",
+                                                                "Rhino.ServiceBus.Hosting.DefaultHost");
+            var hoster = (DefaultHost)instance;
+
+            if (boosterType != null)
+                hoster.SetBootStrapperTypeName(boosterType.FullName);
+
+            return new HostedService(hoster, assembly, appDomain);
+        }
+
+        private string ConfigurationFile
         {
             get
             {
@@ -110,19 +101,42 @@ public void Close()
 
         #region Nested type: HostedService
 
-	    protected class HostedService
+        protected class HostedService
         {
-            public Action Start;
-            public Action Stop;
-	        public Action CreateQueues;
+            private readonly IApplicationHost hoster;
+            private readonly string assembly;
+            private readonly AppDomain appDomain;
+
+            public HostedService(IApplicationHost hoster, string assembly, AppDomain appDomain)
+            {
+                this.hoster = hoster;
+                this.assembly = assembly;
+                this.appDomain = appDomain;
+            }
+
+            public void Stop()
+            {
+                hoster.Dispose();
+                AppDomain.Unload(appDomain);
+            }
+
+            public void Start()
+            {
+                hoster.Start(assembly);
+            }
+
+            public void InitialDeployment(string user)
+            {
+                hoster.InitialDeployment(assembly, user);
+            }
         }
 
         #endregion
 
-        public void CreateQueues()
+        public void InitialDeployment(string user)
         {
             HostedService service = CreateNewAppDomain();
-            service.CreateQueues();
+            service.InitialDeployment(user);
         }
     }
 }