From 051ce7b76b928c4b11c5a8439c4eefb945d2e0e7 Mon Sep 17 00:00:00 2001
From: Stan Lagun <s.lagun@jet.msk.su>
Date: Thu, 25 Apr 2013 10:25:48 +0400
Subject: [PATCH] KEERO-316 - Fix all occurrences of old names (keero, glazier)

---
 ExecutionPlanGenerator/ExecutionPlanGenerator.csproj | 2 +-
 ExecutionPlanGenerator/Program.cs                    | 2 +-
 WindowsAgent/App.config                              | 6 +++---
 WindowsAgent/ExecutionPlan.cs                        | 2 +-
 WindowsAgent/MqMessage.cs                            | 2 +-
 WindowsAgent/PlanExecutor.cs                         | 2 +-
 WindowsAgent/Program.cs                              | 4 ++--
 WindowsAgent/RabbitMqClient.cs                       | 2 +-
 WindowsAgent/ServiceManager.cs                       | 2 +-
 WindowsAgent/WindowsAgent.csproj                     | 6 ++----
 WindowsAgent/WindowsService.cs                       | 2 +-
 WindowsAgent/WindowsServiceInstaller.cs              | 2 +-
 12 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj b/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj
index fa80540d..5c63e534 100644
--- a/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj
+++ b/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{501BE151-4B8C-4355-88DC-3AEF1921B2D7}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ConsoleApplication1</RootNamespace>
+    <RootNamespace>Mirantis.Murano</RootNamespace>
     <AssemblyName>ExecutionPlanGenerator</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
diff --git a/ExecutionPlanGenerator/Program.cs b/ExecutionPlanGenerator/Program.cs
index c5c7f129..798c2ae5 100644
--- a/ExecutionPlanGenerator/Program.cs
+++ b/ExecutionPlanGenerator/Program.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace ConsoleApplication1
+namespace Mirantis.Murano
 {
 	class Command
 	{
diff --git a/WindowsAgent/App.config b/WindowsAgent/App.config
index 6568f0ff..7a2641c7 100644
--- a/WindowsAgent/App.config
+++ b/WindowsAgent/App.config
@@ -19,9 +19,9 @@
 	</nlog>
 	<appSettings>
 		<add key="rabbitmq.host" value="localhost"/>
-		<add key="rabbitmq.user" value="keero"/>
-		<add key="rabbitmq.password" value="keero"/>
-		<add key="rabbitmq.vhost" value="keero"/>
+		<add key="rabbitmq.user" value="murano"/>
+		<add key="rabbitmq.password" value="murano"/>
+		<add key="rabbitmq.vhost" value="murano"/>
 		<add key="rabbitmq.resultExchange" value=""/>
 		<add key="rabbitmq.resultRoutingKey" value="-execution-results"/>
 		<add key="rabbitmq.durableMessages" value="true"/>
diff --git a/WindowsAgent/ExecutionPlan.cs b/WindowsAgent/ExecutionPlan.cs
index 899c5cca..9761d36a 100644
--- a/WindowsAgent/ExecutionPlan.cs
+++ b/WindowsAgent/ExecutionPlan.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
 	class ExecutionPlan
 	{
diff --git a/WindowsAgent/MqMessage.cs b/WindowsAgent/MqMessage.cs
index 255fcb22..76e2faab 100644
--- a/WindowsAgent/MqMessage.cs
+++ b/WindowsAgent/MqMessage.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
 	class MqMessage
 	{
diff --git a/WindowsAgent/PlanExecutor.cs b/WindowsAgent/PlanExecutor.cs
index e1d82925..b6248fca 100644
--- a/WindowsAgent/PlanExecutor.cs
+++ b/WindowsAgent/PlanExecutor.cs
@@ -8,7 +8,7 @@ using System.Text;
 using NLog;
 using Newtonsoft.Json;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
 	class PlanExecutor
 	{
diff --git a/WindowsAgent/Program.cs b/WindowsAgent/Program.cs
index 08fa1255..0717e2fe 100644
--- a/WindowsAgent/Program.cs
+++ b/WindowsAgent/Program.cs
@@ -9,9 +9,9 @@ using System.Text;
 using System.Threading;
 using NLog;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
-	[DisplayName("Keero Agent")]
+	[DisplayName("Murano Agent")]
 	sealed public class Program : WindowsService
 	{
 		private static readonly Logger Log = LogManager.GetCurrentClassLogger();
diff --git a/WindowsAgent/RabbitMqClient.cs b/WindowsAgent/RabbitMqClient.cs
index 6dfe5c68..a4b4634a 100644
--- a/WindowsAgent/RabbitMqClient.cs
+++ b/WindowsAgent/RabbitMqClient.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using NLog;
 using RabbitMQ.Client;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
 	class RabbitMqClient : IDisposable
 	{
diff --git a/WindowsAgent/ServiceManager.cs b/WindowsAgent/ServiceManager.cs
index 2bcf227c..6bf4d494 100644
--- a/WindowsAgent/ServiceManager.cs
+++ b/WindowsAgent/ServiceManager.cs
@@ -4,7 +4,7 @@ using System.Reflection;
 using System.ServiceProcess;
 using NLog;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
     public class ServiceManager
     {
diff --git a/WindowsAgent/WindowsAgent.csproj b/WindowsAgent/WindowsAgent.csproj
index d19fa326..f6c714b5 100644
--- a/WindowsAgent/WindowsAgent.csproj
+++ b/WindowsAgent/WindowsAgent.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{F7E2A8D5-6D24-4651-A4BC-1024D59F4903}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Mirantis.Keero.WindowsAgent</RootNamespace>
+    <RootNamespace>Mirantis.Murano.WindowsAgent</RootNamespace>
     <AssemblyName>WindowsAgent</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -62,9 +62,7 @@
     <Compile Include="ExecutionPlan.cs" />
     <Compile Include="MqMessage.cs" />
     <Compile Include="PlanExecutor.cs" />
-    <Compile Include="Program.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RabbitMqClient.cs" />
     <Compile Include="ServiceManager.cs" />
diff --git a/WindowsAgent/WindowsService.cs b/WindowsAgent/WindowsService.cs
index 1ad2d0d5..1748e047 100644
--- a/WindowsAgent/WindowsService.cs
+++ b/WindowsAgent/WindowsService.cs
@@ -6,7 +6,7 @@ using System.Reflection;
 using System.ServiceProcess;
 using NLog;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
     public abstract class WindowsService : ServiceBase
     {
diff --git a/WindowsAgent/WindowsServiceInstaller.cs b/WindowsAgent/WindowsServiceInstaller.cs
index ca6e4c24..c737b28c 100644
--- a/WindowsAgent/WindowsServiceInstaller.cs
+++ b/WindowsAgent/WindowsServiceInstaller.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Reflection;
 using System.ServiceProcess;
 
-namespace Mirantis.Keero.WindowsAgent
+namespace Mirantis.Murano.WindowsAgent
 {
 	[RunInstaller(true)]
 	public class WindowsServiceInstaller : Installer