summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerg Melikyan <serg.melikyan@gmail.com>2013-04-25 00:46:37 -0700
committerSerg Melikyan <serg.melikyan@gmail.com>2013-04-25 00:46:37 -0700
commitb1e1b2dfaecf0c5b27b0b8c3ff09513502e0d889 (patch)
treed54914ca28d1237ef19a64509e427f85b030bdf9
parent0f82f2ec02524f21f11847bf625981fe702c4a44 (diff)
parent051ce7b76b928c4b11c5a8439c4eefb945d2e0e7 (diff)
Merge pull request #1 from Mirantis/KEERO-3160.1release-0.1
KEERO-316 - Fix all occurrences of old names (keero, glazier)
-rw-r--r--ExecutionPlanGenerator/ExecutionPlanGenerator.csproj2
-rw-r--r--ExecutionPlanGenerator/Program.cs2
-rw-r--r--WindowsAgent/App.config6
-rw-r--r--WindowsAgent/ExecutionPlan.cs2
-rw-r--r--WindowsAgent/MqMessage.cs2
-rw-r--r--WindowsAgent/PlanExecutor.cs2
-rw-r--r--WindowsAgent/Program.cs4
-rw-r--r--WindowsAgent/RabbitMqClient.cs2
-rw-r--r--WindowsAgent/ServiceManager.cs2
-rw-r--r--WindowsAgent/WindowsAgent.csproj6
-rw-r--r--WindowsAgent/WindowsService.cs2
-rw-r--r--WindowsAgent/WindowsServiceInstaller.cs2
12 files changed, 16 insertions, 18 deletions
diff --git a/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj b/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj
index fa80540..5c63e53 100644
--- a/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj
+++ b/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj
@@ -7,7 +7,7 @@
7 <ProjectGuid>{501BE151-4B8C-4355-88DC-3AEF1921B2D7}</ProjectGuid> 7 <ProjectGuid>{501BE151-4B8C-4355-88DC-3AEF1921B2D7}</ProjectGuid>
8 <OutputType>Exe</OutputType> 8 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder> 9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>ConsoleApplication1</RootNamespace> 10 <RootNamespace>Mirantis.Murano</RootNamespace>
11 <AssemblyName>ExecutionPlanGenerator</AssemblyName> 11 <AssemblyName>ExecutionPlanGenerator</AssemblyName>
12 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 12 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13 <FileAlignment>512</FileAlignment> 13 <FileAlignment>512</FileAlignment>
diff --git a/ExecutionPlanGenerator/Program.cs b/ExecutionPlanGenerator/Program.cs
index c5c7f12..798c2ae 100644
--- a/ExecutionPlanGenerator/Program.cs
+++ b/ExecutionPlanGenerator/Program.cs
@@ -6,7 +6,7 @@ using System.Text;
6using System.Threading.Tasks; 6using System.Threading.Tasks;
7using Newtonsoft.Json; 7using Newtonsoft.Json;
8 8
9namespace ConsoleApplication1 9namespace Mirantis.Murano
10{ 10{
11 class Command 11 class Command
12 { 12 {
diff --git a/WindowsAgent/App.config b/WindowsAgent/App.config
index 6568f0f..7a2641c 100644
--- a/WindowsAgent/App.config
+++ b/WindowsAgent/App.config
@@ -19,9 +19,9 @@
19 </nlog> 19 </nlog>
20 <appSettings> 20 <appSettings>
21 <add key="rabbitmq.host" value="localhost"/> 21 <add key="rabbitmq.host" value="localhost"/>
22 <add key="rabbitmq.user" value="keero"/> 22 <add key="rabbitmq.user" value="murano"/>
23 <add key="rabbitmq.password" value="keero"/> 23 <add key="rabbitmq.password" value="murano"/>
24 <add key="rabbitmq.vhost" value="keero"/> 24 <add key="rabbitmq.vhost" value="murano"/>
25 <add key="rabbitmq.resultExchange" value=""/> 25 <add key="rabbitmq.resultExchange" value=""/>
26 <add key="rabbitmq.resultRoutingKey" value="-execution-results"/> 26 <add key="rabbitmq.resultRoutingKey" value="-execution-results"/>
27 <add key="rabbitmq.durableMessages" value="true"/> 27 <add key="rabbitmq.durableMessages" value="true"/>
diff --git a/WindowsAgent/ExecutionPlan.cs b/WindowsAgent/ExecutionPlan.cs
index 899c5cc..9761d36 100644
--- a/WindowsAgent/ExecutionPlan.cs
+++ b/WindowsAgent/ExecutionPlan.cs
@@ -4,7 +4,7 @@ using System.Linq;
4using System.Text; 4using System.Text;
5using System.Threading.Tasks; 5using System.Threading.Tasks;
6 6
7namespace Mirantis.Keero.WindowsAgent 7namespace Mirantis.Murano.WindowsAgent
8{ 8{
9 class ExecutionPlan 9 class ExecutionPlan
10 { 10 {
diff --git a/WindowsAgent/MqMessage.cs b/WindowsAgent/MqMessage.cs
index 255fcb2..76e2faa 100644
--- a/WindowsAgent/MqMessage.cs
+++ b/WindowsAgent/MqMessage.cs
@@ -4,7 +4,7 @@ using System.Linq;
4using System.Text; 4using System.Text;
5using System.Threading.Tasks; 5using System.Threading.Tasks;
6 6
7namespace Mirantis.Keero.WindowsAgent 7namespace Mirantis.Murano.WindowsAgent
8{ 8{
9 class MqMessage 9 class MqMessage
10 { 10 {
diff --git a/WindowsAgent/PlanExecutor.cs b/WindowsAgent/PlanExecutor.cs
index e1d8292..b6248fc 100644
--- a/WindowsAgent/PlanExecutor.cs
+++ b/WindowsAgent/PlanExecutor.cs
@@ -8,7 +8,7 @@ using System.Text;
8using NLog; 8using NLog;
9using Newtonsoft.Json; 9using Newtonsoft.Json;
10 10
11namespace Mirantis.Keero.WindowsAgent 11namespace Mirantis.Murano.WindowsAgent
12{ 12{
13 class PlanExecutor 13 class PlanExecutor
14 { 14 {
diff --git a/WindowsAgent/Program.cs b/WindowsAgent/Program.cs
index 08fa125..0717e2f 100644
--- a/WindowsAgent/Program.cs
+++ b/WindowsAgent/Program.cs
@@ -9,9 +9,9 @@ using System.Text;
9using System.Threading; 9using System.Threading;
10using NLog; 10using NLog;
11 11
12namespace Mirantis.Keero.WindowsAgent 12namespace Mirantis.Murano.WindowsAgent
13{ 13{
14 [DisplayName("Keero Agent")] 14 [DisplayName("Murano Agent")]
15 sealed public class Program : WindowsService 15 sealed public class Program : WindowsService
16 { 16 {
17 private static readonly Logger Log = LogManager.GetCurrentClassLogger(); 17 private static readonly Logger Log = LogManager.GetCurrentClassLogger();
diff --git a/WindowsAgent/RabbitMqClient.cs b/WindowsAgent/RabbitMqClient.cs
index 6dfe5c6..a4b4634 100644
--- a/WindowsAgent/RabbitMqClient.cs
+++ b/WindowsAgent/RabbitMqClient.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
8using NLog; 8using NLog;
9using RabbitMQ.Client; 9using RabbitMQ.Client;
10 10
11namespace Mirantis.Keero.WindowsAgent 11namespace Mirantis.Murano.WindowsAgent
12{ 12{
13 class RabbitMqClient : IDisposable 13 class RabbitMqClient : IDisposable
14 { 14 {
diff --git a/WindowsAgent/ServiceManager.cs b/WindowsAgent/ServiceManager.cs
index 2bcf227..6bf4d49 100644
--- a/WindowsAgent/ServiceManager.cs
+++ b/WindowsAgent/ServiceManager.cs
@@ -4,7 +4,7 @@ using System.Reflection;
4using System.ServiceProcess; 4using System.ServiceProcess;
5using NLog; 5using NLog;
6 6
7namespace Mirantis.Keero.WindowsAgent 7namespace Mirantis.Murano.WindowsAgent
8{ 8{
9 public class ServiceManager 9 public class ServiceManager
10 { 10 {
diff --git a/WindowsAgent/WindowsAgent.csproj b/WindowsAgent/WindowsAgent.csproj
index d19fa32..f6c714b 100644
--- a/WindowsAgent/WindowsAgent.csproj
+++ b/WindowsAgent/WindowsAgent.csproj
@@ -7,7 +7,7 @@
7 <ProjectGuid>{F7E2A8D5-6D24-4651-A4BC-1024D59F4903}</ProjectGuid> 7 <ProjectGuid>{F7E2A8D5-6D24-4651-A4BC-1024D59F4903}</ProjectGuid>
8 <OutputType>Exe</OutputType> 8 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder> 9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>Mirantis.Keero.WindowsAgent</RootNamespace> 10 <RootNamespace>Mirantis.Murano.WindowsAgent</RootNamespace>
11 <AssemblyName>WindowsAgent</AssemblyName> 11 <AssemblyName>WindowsAgent</AssemblyName>
12 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 12 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13 <FileAlignment>512</FileAlignment> 13 <FileAlignment>512</FileAlignment>
@@ -62,9 +62,7 @@
62 <Compile Include="ExecutionPlan.cs" /> 62 <Compile Include="ExecutionPlan.cs" />
63 <Compile Include="MqMessage.cs" /> 63 <Compile Include="MqMessage.cs" />
64 <Compile Include="PlanExecutor.cs" /> 64 <Compile Include="PlanExecutor.cs" />
65 <Compile Include="Program.cs"> 65 <Compile Include="Program.cs" />
66 <SubType>Component</SubType>
67 </Compile>
68 <Compile Include="Properties\AssemblyInfo.cs" /> 66 <Compile Include="Properties\AssemblyInfo.cs" />
69 <Compile Include="RabbitMqClient.cs" /> 67 <Compile Include="RabbitMqClient.cs" />
70 <Compile Include="ServiceManager.cs" /> 68 <Compile Include="ServiceManager.cs" />
diff --git a/WindowsAgent/WindowsService.cs b/WindowsAgent/WindowsService.cs
index 1ad2d0d..1748e04 100644
--- a/WindowsAgent/WindowsService.cs
+++ b/WindowsAgent/WindowsService.cs
@@ -6,7 +6,7 @@ using System.Reflection;
6using System.ServiceProcess; 6using System.ServiceProcess;
7using NLog; 7using NLog;
8 8
9namespace Mirantis.Keero.WindowsAgent 9namespace Mirantis.Murano.WindowsAgent
10{ 10{
11 public abstract class WindowsService : ServiceBase 11 public abstract class WindowsService : ServiceBase
12 { 12 {
diff --git a/WindowsAgent/WindowsServiceInstaller.cs b/WindowsAgent/WindowsServiceInstaller.cs
index ca6e4c2..c737b28 100644
--- a/WindowsAgent/WindowsServiceInstaller.cs
+++ b/WindowsAgent/WindowsServiceInstaller.cs
@@ -4,7 +4,7 @@ using System.Linq;
4using System.Reflection; 4using System.Reflection;
5using System.ServiceProcess; 5using System.ServiceProcess;
6 6
7namespace Mirantis.Keero.WindowsAgent 7namespace Mirantis.Murano.WindowsAgent
8{ 8{
9 [RunInstaller(true)] 9 [RunInstaller(true)]
10 public class WindowsServiceInstaller : Installer 10 public class WindowsServiceInstaller : Installer