Skip to content
Browse files

Updated Topshelf for demos and logging changes

  • Loading branch information...
1 parent 376483b commit c536fcf122bf39d006a656c76674372b4fe34f9e @phatboyg phatboyg committed Mar 7, 2012
Showing with 45,798 additions and 17,018 deletions.
  1. +1 −1 .gitignore
  2. BIN lib/Topshelf/net-3.5/Topshelf.Log4NetIntegration.dll
  3. BIN lib/Topshelf/net-3.5/Topshelf.Log4NetIntegration.pdb
  4. +26 −0 lib/Topshelf/net-3.5/Topshelf.Log4NetIntegration.xml
  5. BIN lib/Topshelf/net-3.5/Topshelf.dll
  6. BIN lib/Topshelf/net-3.5/Topshelf.pdb
  7. +22,514 −8,314 lib/Topshelf/net-3.5/Topshelf.xml
  8. BIN lib/Topshelf/net-4.0/Topshelf.Log4NetIntegration.dll
  9. BIN lib/Topshelf/net-4.0/Topshelf.Log4NetIntegration.pdb
  10. +26 −0 lib/Topshelf/net-4.0/Topshelf.Log4NetIntegration.xml
  11. BIN lib/Topshelf/net-4.0/Topshelf.dll
  12. BIN lib/Topshelf/net-4.0/Topshelf.pdb
  13. +22,814 −8,314 lib/Topshelf/net-4.0/Topshelf.xml
  14. +5 −0 rakefile.rb
  15. +8 −12 src/Loggers/MassTransit.Log4NetIntegration/Log4NetConfigurationExtensions.cs
  16. +15 −0 src/Loggers/MassTransit.Log4NetIntegration/Logging/Log4NetLogger.cs
  17. +15 −9 src/MassTransit.RuntimeServices/MassTransit.RuntimeServices.csproj
  18. +100 −104 src/MassTransit.RuntimeServices/Program.cs
  19. +5 −2 src/Samples/Distributor/Grid.Distributor.Activator/Grid.Distributor.Activator.csproj
  20. +22 −35 src/Samples/Distributor/Grid.Distributor.Activator/Program.cs
  21. +5 −2 src/Samples/Distributor/Grid.Distributor.Worker/Grid.Distributor.Worker.csproj
  22. +22 −35 src/Samples/Distributor/Grid.Distributor.Worker/Program.cs
  23. +9 −0 src/Samples/Distributor/Grid.Distributor.sln
  24. +65 −65 src/Samples/Starbucks/Starbucks.Barista/Program.cs
  25. +17 −13 src/Samples/Starbucks/Starbucks.Barista/Starbucks.Barista.csproj
  26. +41 −41 src/Samples/Starbucks/Starbucks.Cashier/Program.cs
  27. +17 −13 src/Samples/Starbucks/Starbucks.Cashier/Starbucks.Cashier.csproj
  28. +45 −45 src/Samples/Starbucks/Starbucks.Customer/Program.cs
  29. +17 −13 src/Samples/Starbucks/Starbucks.Customer/Starbucks.Customer.csproj
  30. +9 −0 src/Samples/Starbucks/Starbucks.sln
View
2 .gitignore
@@ -3,8 +3,8 @@ build_artifacts/*
*.suo
*.user
packages
+*.dotCover
-NDependOut/*
src/logs/*
View
BIN lib/Topshelf/net-3.5/Topshelf.Log4NetIntegration.dll
Binary file not shown.
View
BIN lib/Topshelf/net-3.5/Topshelf.Log4NetIntegration.pdb
Binary file not shown.
View
26 lib/Topshelf/net-3.5/Topshelf.Log4NetIntegration.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>Topshelf.Log4NetIntegration</name>
+ </assembly>
+ <members>
+ <member name="T:Topshelf.Log4NetConfigurationExtensions">
+ <summary>
+ Extensions for configuring MassTransit for log4net
+ </summary>
+ </member>
+ <member name="M:Topshelf.Log4NetConfigurationExtensions.UseLog4Net(Topshelf.HostConfigurators.HostConfigurator)">
+ <summary>
+ Specify that you want to use the Log4net logging engine for logging with MassTransit.
+ </summary>
+ <param name="configurator"></param>
+ </member>
+ <member name="M:Topshelf.Log4NetConfigurationExtensions.UseLog4Net(Topshelf.HostConfigurators.HostConfigurator,System.String)">
+ <summary>
+ Specify that log4net should be used for logging MassTransit messages
+ </summary>
+ <param name="configurator"></param>
+ <param name="configFileName">The name of the log4net xml configuration file</param>
+ </member>
+ </members>
+</doc>
View
BIN lib/Topshelf/net-3.5/Topshelf.dll
Binary file not shown.
View
BIN lib/Topshelf/net-3.5/Topshelf.pdb
Binary file not shown.
View
30,828 lib/Topshelf/net-3.5/Topshelf.xml
22,514 additions, 8,314 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN lib/Topshelf/net-4.0/Topshelf.Log4NetIntegration.dll
Binary file not shown.
View
BIN lib/Topshelf/net-4.0/Topshelf.Log4NetIntegration.pdb
Binary file not shown.
View
26 lib/Topshelf/net-4.0/Topshelf.Log4NetIntegration.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>Topshelf.Log4NetIntegration</name>
+ </assembly>
+ <members>
+ <member name="T:Topshelf.Log4NetConfigurationExtensions">
+ <summary>
+ Extensions for configuring MassTransit for log4net
+ </summary>
+ </member>
+ <member name="M:Topshelf.Log4NetConfigurationExtensions.UseLog4Net(Topshelf.HostConfigurators.HostConfigurator)">
+ <summary>
+ Specify that you want to use the Log4net logging engine for logging with MassTransit.
+ </summary>
+ <param name="configurator"></param>
+ </member>
+ <member name="M:Topshelf.Log4NetConfigurationExtensions.UseLog4Net(Topshelf.HostConfigurators.HostConfigurator,System.String)">
+ <summary>
+ Specify that log4net should be used for logging MassTransit messages
+ </summary>
+ <param name="configurator"></param>
+ <param name="configFileName">The name of the log4net xml configuration file</param>
+ </member>
+ </members>
+</doc>
View
BIN lib/Topshelf/net-4.0/Topshelf.dll
Binary file not shown.
View
BIN lib/Topshelf/net-4.0/Topshelf.pdb
Binary file not shown.
View
31,128 lib/Topshelf/net-4.0/Topshelf.xml
22,814 additions, 8,314 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
5 rakefile.rb
@@ -121,6 +121,7 @@
copyOutputFiles src, "MassTransit.*.{dll,exe,config,log4net.xml,sdf}", targ
copyOutputFiles props[:output], 'MassTransit.dll', targ
+ copyOutputFiles src, "MassTransit.Log4NetIntegration.dll", targ
copyOutputFiles src, "Castle*.dll", targ
copyOutputFiles src, "log4net.dll", targ
copyOutputFiles src, "Magnum.dll", targ
@@ -129,6 +130,7 @@
copyOutputFiles src, "Iesi.Collections.dll", targ
copyOutputFiles src, "StructureMap.dll", targ
copyOutputFiles src, "Topshelf.dll", targ
+ copyOutputFiles src, "Topshelf.Log4NetIntegration.dll", targ
copyOutputFiles File.join(props[:lib], 'SqlCe'), '*', targ
copyOutputFiles File.join(props[:lib], 'SqlCe', 'x86'), '*', File.join(targ, 'x86')
copyOutputFiles File.join(props[:lib], 'SqlCe', 'x86', 'Microsoft.VC90.CRT'), '*', File.join(targ, 'x86', 'Microsoft.VC90.CRT')
@@ -169,6 +171,8 @@
copyOutputFiles props[:output], "MassTransit.dll", targ
+ copyOutputFiles src, "Starbucks.Barista/bin/#{BUILD_CONFIG}/MassTransit.Log4NetIntegration.dll", targ
+
copyOutputFiles File.join(src, "Starbucks.Customer/bin/#{BUILD_CONFIG}"), "{log4net,Magnum,MassTransit.StructureMapIntegration,MassTransit.Transports.Msmq,StructureMap}.dll", targ
copyOutputFiles File.join(src, "Starbucks.Barista/bin/#{BUILD_CONFIG}"), "{MassTransit.WindsorIntegration,Castle.Windsor,Castle.Core,Topshelf}.dll", targ
copyOutputFiles File.join(src, "Starbucks.Cashier/bin/#{BUILD_CONFIG}"), "{MassTransit.NinjectIntegration,Ninject}.dll", targ
@@ -184,6 +188,7 @@
src = File.join(props[:src], "Samples", "Distributor")
copyOutputFiles props[:output], "MassTransit.dll", targ
+ copyOutputFiles src, "Grid.Distributor.Activator/bin/#{BUILD_CONFIG}/MassTransit.Log4NetIntegration.dll", targ
copyOutputFiles File.join(src, "Grid.Distributor.Activator/bin/#{BUILD_CONFIG}"), "{log4net,Magnum,MassTransit.StructureMapIntegration,MassTransit.Transports.Msmq,StructureMap,Topshelf}.dll", targ
copyOutputFiles File.join(src, "Grid.Distributor.Activator/bin/#{BUILD_CONFIG}"), "Grid.Distributor.Activator.exe", targ
View
20 src/Loggers/MassTransit.Log4NetIntegration/Log4NetConfigurationExtensions.cs
@@ -12,13 +12,11 @@
// specific language governing permissions and limitations under the License.
namespace MassTransit.Log4NetIntegration
{
+ using System;
using System.IO;
- using System.Reflection;
using BusConfigurators;
using Logging;
- using MassTransit.Logging;
using Util;
- using log4net.Config;
/// <summary>
/// Extensions for configuring MassTransit for log4net
@@ -31,7 +29,7 @@ public static class Log4NetConfigurationExtensions
/// <param name="configurator"></param>
public static void UseLog4Net([CanBeNull] this ServiceBusConfigurator configurator)
{
- Logger.UseLogger(new Log4NetLogger());
+ Log4NetLogger.Use();
}
/// <summary>
@@ -41,19 +39,17 @@ public static void UseLog4Net([CanBeNull] this ServiceBusConfigurator configurat
/// <param name="configFileName">The name of the log4net xml configuration file</param>
public static void UseLog4Net([NotNull] this ServiceBusConfigurator configurator, string configFileName)
{
- Logger.UseLogger(new Log4NetLogger());
+ Log4NetLogger.Use();
- string path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
- if (path == null)
- return;
+ string path = AppDomain.CurrentDomain.BaseDirectory;
string file = Path.Combine(path, configFileName);
var configFile = new FileInfo(file);
- if (!configFile.Exists)
- return;
-
- XmlConfigurator.Configure(configFile);
+ if (configFile.Exists)
+ {
+ Log4NetLogger.Use(file);
+ }
}
}
}
View
15 src/Loggers/MassTransit.Log4NetIntegration/Logging/Log4NetLogger.cs
@@ -12,8 +12,10 @@
// specific language governing permissions and limitations under the License.
namespace MassTransit.Log4NetIntegration.Logging
{
+ using System.IO;
using MassTransit.Logging;
using log4net;
+ using log4net.Config;
public class Log4NetLogger :
ILogger
@@ -22,5 +24,18 @@ public MassTransit.Logging.ILog Get(string name)
{
return new Log4NetLog(LogManager.GetLogger(name));
}
+
+ public static void Use()
+ {
+ Logger.UseLogger(new Log4NetLogger());
+ }
+
+ public static void Use(string file)
+ {
+ Logger.UseLogger(new Log4NetLogger());
+
+ var configFile = new FileInfo(file);
+ XmlConfigurator.Configure(configFile);
+ }
}
}
View
24 src/MassTransit.RuntimeServices/MassTransit.RuntimeServices.csproj
@@ -83,13 +83,23 @@
</Reference>
<Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
<HintPath>..\..\lib\Magnum\net-4.0\Magnum.dll</HintPath>
- </Reference>
- <Reference Include="NHibernate, Version=2.1.2.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ </Reference>
+ <Reference Include="Topshelf" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\lib\Topshelf\net-3.5\Topshelf.dll</HintPath>
+ </Reference>
+ <Reference Include="Topshelf" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\lib\Topshelf\net-4.0\Topshelf.dll</HintPath>
+ </Reference>
+ <Reference Include="Topshelf.Log4NetIntegration" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\lib\Topshelf\net-3.5\Topshelf.Log4NetIntegration.dll</HintPath>
+ </Reference>
+ <Reference Include="Topshelf.Log4NetIntegration" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\lib\Topshelf\net-4.0\Topshelf.Log4NetIntegration.dll</HintPath>
+ </Reference>
+ <Reference Include="NHibernate">
<HintPath>..\..\lib\NHibernate\NHibernate.dll</HintPath>
</Reference>
- <Reference Include="StructureMap, Version=2.5.3.0, Culture=neutral, PublicKeyToken=e60ad81abae3c223, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="StructureMap">
<HintPath>..\..\lib\StructureMap\StructureMap.dll</HintPath>
</Reference>
<Reference Include="System" />
@@ -103,10 +113,6 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
- <Reference Include="Topshelf, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\Topshelf\net-3.5\Topshelf.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\SolutionVersion.cs">
View
204 src/MassTransit.RuntimeServices/Program.cs
@@ -12,108 +12,104 @@
// specific language governing permissions and limitations under the License.
namespace MassTransit.RuntimeServices
{
- using System;
- using System.IO;
- using Log4NetIntegration.Logging;
- using Logging;
- using log4net.Config;
- using Services.HealthMonitoring;
- using Services.Subscriptions.Server;
- using Services.Timeout;
- using StructureMap;
- using StructureMap.Configuration.DSL;
- using Topshelf;
- using Topshelf.HostConfigurators;
-
- class Program
- {
- static readonly ILog _log = Logger.Get(typeof (Program));
-
- static void Main()
- {
- BootstrapLogger();
-
- ObjectFactory.Initialize(x => x.For<IConfiguration>().Use<Configuration>());
-
- var serviceConfiguration = ObjectFactory.GetInstance<IConfiguration>();
-
- HostFactory.Run(config =>
- {
- config.SetServiceName(typeof (Program).Namespace);
- config.SetDisplayName(typeof (Program).Namespace);
- config.SetDescription("MassTransit Runtime Services (Subscription, Timeout, Health Monitoring)");
-
- if (serviceConfiguration.UseServiceCredentials)
- {
- config.RunAs(serviceConfiguration.ServiceUsername, serviceConfiguration.ServicePassword);
- }
- else
- config.RunAsLocalSystem();
-
- config.DependsOnMsmq();
-
- if (serviceConfiguration.SubscriptionServiceEnabled)
- {
- config.ConfigureService<SubscriptionService, SubscriptionServiceRegistry>(
- c => new SubscriptionServiceRegistry(c), start => start.Start(), stop => stop.Stop());
- }
-
- if (serviceConfiguration.HealthServiceEnabled)
- {
- config.ConfigureService<HealthService, HealthServiceRegistry>(
- c => new HealthServiceRegistry(c), start => start.Start(), stop => stop.Stop());
- }
-
- if (serviceConfiguration.TimeoutServiceEnabled)
- {
- config.ConfigureService<TimeoutService, TimeoutServiceRegistry>(
- c => new TimeoutServiceRegistry(c), start => start.Start(), stop => stop.Stop());
- }
-
- config.AfterStoppingServices(x => { _log.Info("MassTransit Runtime Services are exiting..."); });
- });
- }
-
- static void BootstrapLogger()
- {
- Logger.UseLogger(new Log4NetLogger());
-
- string configFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
- typeof (Program).Namespace + ".log4net.xml");
-
- XmlConfigurator.ConfigureAndWatch(new FileInfo(configFileName));
-
- _log.Info("Loading " + typeof (Program).Namespace + " Services...");
- }
- }
-
- public static class ConfigureServiceExtension
- {
- public static void ConfigureService<TService, TRegistry>(this HostConfigurator configurator,
- Func<IContainer, TRegistry> registry,
- Action<TService> start, Action<TService> stop)
- where TRegistry : Registry
- where TService : class
- {
- var container = new Container(x =>
- {
- x.For<IConfiguration>()
- .Singleton()
- .Add<Configuration>();
-
- x.For<TService>()
- .Singleton()
- .Use<TService>();
- });
-
- container.Configure(x => x.AddRegistry(registry(container)));
-
- configurator.Service<TService>(service =>
- {
- service.ConstructUsing(builder => container.GetInstance<TService>());
- service.WhenStarted(start);
- service.WhenStopped(stop);
- });
- }
- }
+ using System;
+ using System.IO;
+ using Log4NetIntegration.Logging;
+ using Logging;
+ using log4net.Config;
+ using Services.HealthMonitoring;
+ using Services.Subscriptions.Server;
+ using Services.Timeout;
+ using StructureMap;
+ using StructureMap.Configuration.DSL;
+ using Topshelf;
+ using Topshelf.HostConfigurators;
+
+ class Program
+ {
+ static readonly ILog _log = Logger.Get(typeof (Program));
+
+ static void Main()
+ {
+ BootstrapLogger();
+
+ ObjectFactory.Initialize(x => x.For<IConfiguration>().Use<Configuration>());
+
+ var serviceConfiguration = ObjectFactory.GetInstance<IConfiguration>();
+
+ HostFactory.Run(config =>
+ {
+ config.SetServiceName(typeof (Program).Namespace);
+ config.SetDisplayName(typeof (Program).Namespace);
+ config.SetDescription("MassTransit Runtime Services (Subscription, Timeout, Health Monitoring)");
+
+ if (serviceConfiguration.UseServiceCredentials)
+ {
+ config.RunAs(serviceConfiguration.ServiceUsername, serviceConfiguration.ServicePassword);
+ }
+ else
+ config.RunAsLocalSystem();
+
+ config.DependsOnMsmq();
+
+ if (serviceConfiguration.SubscriptionServiceEnabled)
+ {
+ config.ConfigureService<SubscriptionService, SubscriptionServiceRegistry>(
+ c => new SubscriptionServiceRegistry(c), start => start.Start(), stop => stop.Stop());
+ }
+
+ if (serviceConfiguration.HealthServiceEnabled)
+ {
+ config.ConfigureService<HealthService, HealthServiceRegistry>(
+ c => new HealthServiceRegistry(c), start => start.Start(), stop => stop.Stop());
+ }
+
+ if (serviceConfiguration.TimeoutServiceEnabled)
+ {
+ config.ConfigureService<TimeoutService, TimeoutServiceRegistry>(
+ c => new TimeoutServiceRegistry(c), start => start.Start(), stop => stop.Stop());
+ }
+
+ config.AfterStoppingServices(x => { _log.Info("MassTransit Runtime Services are exiting..."); });
+ });
+ }
+
+ static void BootstrapLogger()
+ {
+ Log4NetLogger.Use(typeof (Program).Namespace + ".log4net.xml");
+ Topshelf.Logging.Log4NetLogger.Use();
+
+ _log.Info("Loading " + typeof (Program).Namespace + " Services...");
+ }
+ }
+
+ public static class ConfigureServiceExtension
+ {
+ public static void ConfigureService<TService, TRegistry>(this HostConfigurator configurator,
+ Func<IContainer, TRegistry> registry,
+ Action<TService> start, Action<TService> stop)
+ where TRegistry : Registry
+ where TService : class
+ {
+ var container = new Container(x =>
+ {
+ x.For<IConfiguration>()
+ .Singleton()
+ .Add<Configuration>();
+
+ x.For<TService>()
+ .Singleton()
+ .Use<TService>();
+ });
+
+ container.Configure(x => x.AddRegistry(registry(container)));
+
+ configurator.Service<TService>(service =>
+ {
+ service.ConstructUsing(builder => container.GetInstance<TService>());
+ service.WhenStarted(start);
+ service.WhenStopped(stop);
+ });
+ }
+ }
}
View
7 src/Samples/Distributor/Grid.Distributor.Activator/Grid.Distributor.Activator.csproj
@@ -70,7 +70,6 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
@@ -80,6 +79,10 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\..\Loggers\MassTransit.Log4NetIntegration\MassTransit.Log4NetIntegration.csproj">
+ <Project>{8D2BE372-A756-4676-B2EA-ED7846809BFE}</Project>
+ <Name>MassTransit.Log4NetIntegration</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\..\MassTransit\MassTransit.csproj">
<Project>{6EFD69FC-CBCC-4F85-AEE0-EFBA73F4D273}</Project>
<Name>MassTransit</Name>
@@ -124,4 +127,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
57 src/Samples/Distributor/Grid.Distributor.Activator/Program.cs
@@ -1,44 +1,31 @@
-// Copyright 2007-2008 The Apache Software Foundation.
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-namespace Grid.Distributor.Activator
+namespace Grid.Distributor.Activator
{
- using System;
- using System.Configuration;
- using System.IO;
- using log4net.Config;
+ using System;
+ using System.Configuration;
+ using MassTransit.Log4NetIntegration.Logging;
- internal class Program
+ class Program
{
- private static void Main()
+ static void Main()
{
- XmlConfigurator.ConfigureAndWatch(new FileInfo(@"activator.log4net.config"));
+ Log4NetLogger.Use("activator.log4net.config");
- try
- {
- var service = new ActivorServiceProvider
- {
- ServiceName = ConfigurationManager.AppSettings["ServiceName"],
- DisplayName = ConfigurationManager.AppSettings["DisplayName"],
- Description = ConfigurationManager.AppSettings["Description"],
- SourceQueue = ConfigurationManager.AppSettings["SourceQueue"],
- };
+ try
+ {
+ var service = new ActivorServiceProvider
+ {
+ ServiceName = ConfigurationManager.AppSettings["ServiceName"],
+ DisplayName = ConfigurationManager.AppSettings["DisplayName"],
+ Description = ConfigurationManager.AppSettings["Description"],
+ SourceQueue = ConfigurationManager.AppSettings["SourceQueue"],
+ };
- service.ConfigureService<CollectCompletedWork>();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex);
- }
+ service.ConfigureService<CollectCompletedWork>();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex);
+ }
}
}
}
View
7 src/Samples/Distributor/Grid.Distributor.Worker/Grid.Distributor.Worker.csproj
@@ -70,7 +70,6 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
@@ -80,6 +79,10 @@
<Compile Include="WorkerServiceProvider.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\..\Loggers\MassTransit.Log4NetIntegration\MassTransit.Log4NetIntegration.csproj">
+ <Project>{8D2BE372-A756-4676-B2EA-ED7846809BFE}</Project>
+ <Name>MassTransit.Log4NetIntegration</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\..\MassTransit\MassTransit.csproj">
<Project>{6EFD69FC-CBCC-4F85-AEE0-EFBA73F4D273}</Project>
<Name>MassTransit</Name>
@@ -126,4 +129,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
57 src/Samples/Distributor/Grid.Distributor.Worker/Program.cs
@@ -1,44 +1,31 @@
-// Copyright 2007-2008 The Apache Software Foundation.
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-namespace Grid.Distributor.Worker
+namespace Grid.Distributor.Worker
{
- using System;
- using System.Configuration;
- using System.IO;
- using log4net.Config;
+ using System;
+ using System.Configuration;
+ using MassTransit.Log4NetIntegration.Logging;
- internal class Program
+ class Program
{
- private static void Main()
+ static void Main()
{
- XmlConfigurator.ConfigureAndWatch(new FileInfo(@"worker.log4net.config"));
+ Log4NetLogger.Use("worker.log4net.config");
- try
- {
- var service = new WorkerServiceProvider
- {
- ServiceName = ConfigurationManager.AppSettings["ServiceName"],
- DisplayName = ConfigurationManager.AppSettings["DisplayName"],
- Description = ConfigurationManager.AppSettings["Description"],
- SourceQueue = ConfigurationManager.AppSettings["SourceQueue"],
- };
+ try
+ {
+ var service = new WorkerServiceProvider
+ {
+ ServiceName = ConfigurationManager.AppSettings["ServiceName"],
+ DisplayName = ConfigurationManager.AppSettings["DisplayName"],
+ Description = ConfigurationManager.AppSettings["Description"],
+ SourceQueue = ConfigurationManager.AppSettings["SourceQueue"],
+ };
- service.ConfigureService<DoWork>();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex);
- }
+ service.ConfigureService<DoWork>();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex);
+ }
}
}
}
View
9 src/Samples/Distributor/Grid.Distributor.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MassTransit", "..\..\MassTr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MassTransit.Transports.Msmq", "..\..\Transports\MassTransit.Transports.Msmq\MassTransit.Transports.Msmq.csproj", "{6F90867C-E092-4EDC-B3DE-600D39DF0335}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MassTransit.Log4NetIntegration", "..\..\Loggers\MassTransit.Log4NetIntegration\MassTransit.Log4NetIntegration.csproj", "{8D2BE372-A756-4676-B2EA-ED7846809BFE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Build|Any CPU = Build|Any CPU
@@ -48,12 +50,19 @@ Global
{6F90867C-E092-4EDC-B3DE-600D39DF0335}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F90867C-E092-4EDC-B3DE-600D39DF0335}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F90867C-E092-4EDC-B3DE-600D39DF0335}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Build|Any CPU.ActiveCfg = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Build|Any CPU.Build.0 = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6EFD69FC-CBCC-4F85-AEE0-EFBA73F4D273} = {A9CBE7DC-AD66-4891-9C4C-C18E8D3E0E0D}
{6F90867C-E092-4EDC-B3DE-600D39DF0335} = {A9CBE7DC-AD66-4891-9C4C-C18E8D3E0E0D}
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE} = {A9CBE7DC-AD66-4891-9C4C-C18E8D3E0E0D}
EndGlobalSection
EndGlobal
View
130 src/Samples/Starbucks/Starbucks.Barista/Program.cs
@@ -10,81 +10,81 @@
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.
+
namespace Starbucks.Barista
{
- using System;
- using System.Diagnostics;
- using System.IO;
- using Castle.MicroKernel.Registration;
- using Castle.Windsor;
- using log4net.Config;
- using Magnum;
- using Magnum.StateMachine;
- using MassTransit;
- using MassTransit.Saga;
- using Topshelf;
+ using System;
+ using System.Diagnostics;
+ using Castle.MicroKernel.Registration;
+ using Castle.Windsor;
+ using Magnum;
+ using Magnum.StateMachine;
+ using MassTransit;
+ using MassTransit.Log4NetIntegration.Logging;
+ using MassTransit.Saga;
+ using Topshelf;
- internal static class Program
- {
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- private static void Main(string[] args)
- {
- XmlConfigurator.Configure(new FileInfo("barista.log4net.xml"));
+ internal static class Program
+ {
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main(string[] args)
+ {
+ Log4NetLogger.Use("barista.log4net.xml");
- var container = new WindsorContainer();
- container.Register(
- Component.For(typeof (ISagaRepository<>))
- .ImplementedBy(typeof (InMemorySagaRepository<>))
- .LifeStyle.Singleton,
- Component.For<DrinkPreparationSaga>(),
- Component.For<BaristaService>()
- .LifeStyle.Singleton,
- Component.For<IServiceBus>().UsingFactoryMethod(() =>
- {
- return ServiceBusFactory.New(sbc =>
- {
- sbc.ReceiveFrom("msmq://localhost/starbucks_barista");
- sbc.UseMsmq();
- sbc.UseMulticastSubscriptionClient();
+ var container = new WindsorContainer();
+ container.Register(
+ Component.For(typeof (ISagaRepository<>))
+ .ImplementedBy(typeof (InMemorySagaRepository<>))
+ .LifeStyle.Singleton,
+ Component.For<DrinkPreparationSaga>(),
+ Component.For<BaristaService>()
+ .LifeStyle.Singleton,
+ Component.For<IServiceBus>().UsingFactoryMethod(() =>
+ {
+ return ServiceBusFactory.New(sbc =>
+ {
+ sbc.ReceiveFrom("msmq://localhost/starbucks_barista");
+ sbc.UseMsmq();
+ sbc.UseMulticastSubscriptionClient();
- sbc.UseControlBus();
+ sbc.UseControlBus();
- sbc.Subscribe(subs => { subs.LoadFrom(container); });
- });
- }).LifeStyle.Singleton);
+ sbc.Subscribe(subs => { subs.LoadFrom(container); });
+ });
+ }).LifeStyle.Singleton);
- HostFactory.Run(c =>
- {
- c.SetServiceName("StarbucksBarista");
- c.SetDisplayName("Starbucks Barista");
- c.SetDescription("a Mass Transit sample service for making orders of coffee.");
+ HostFactory.Run(c =>
+ {
+ c.SetServiceName("StarbucksBarista");
+ c.SetDisplayName("Starbucks Barista");
+ c.SetDescription("a Mass Transit sample service for making orders of coffee.");
- c.DependsOnMsmq();
- c.RunAsLocalService();
+ c.DependsOnMsmq();
+ c.RunAsLocalService();
- DisplayStateMachine();
+ DisplayStateMachine();
- c.Service<BaristaService>(s =>
- {
- s.ConstructUsing(builder => container.Resolve<BaristaService>());
- s.WhenStarted(o => o.Start());
- s.WhenStopped(o =>
- {
- o.Stop();
- container.Dispose();
- });
- });
- });
- }
+ c.Service<BaristaService>(s =>
+ {
+ s.ConstructUsing(builder => container.Resolve<BaristaService>());
+ s.WhenStarted(o => o.Start());
+ s.WhenStopped(o =>
+ {
+ o.Stop();
+ container.Dispose();
+ });
+ });
+ });
+ }
- private static void DisplayStateMachine()
- {
- Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
+ static void DisplayStateMachine()
+ {
+ Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
- StateMachineInspector.Trace(new DrinkPreparationSaga(CombGuid.Generate()));
- }
- }
+ StateMachineInspector.Trace(new DrinkPreparationSaga(CombGuid.Generate()));
+ }
+ }
}
View
30 src/Samples/Starbucks/Starbucks.Barista/Starbucks.Barista.csproj
@@ -60,18 +60,18 @@
<Reference Include="Castle.Windsor">
<HintPath>..\..\..\..\lib\Castle.Windsor\Castle.Windsor.dll</HintPath>
</Reference>
- <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
- <HintPath>..\..\..\..\lib\log4net\1.2.11\net35-full\log4net.dll</HintPath>
- </Reference>
- <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
- <HintPath>..\..\..\..\lib\log4net\1.2.11\net40-full\log4net.dll</HintPath>
- </Reference>
- <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
- <HintPath>..\..\..\..\lib\Magnum\net-3.5\Magnum.dll</HintPath>
- </Reference>
- <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
- <HintPath>..\..\..\..\lib\Magnum\net-4.0\Magnum.dll</HintPath>
- </Reference>
+ <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\..\..\lib\log4net\1.2.11\net35-full\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\..\..\lib\log4net\1.2.11\net40-full\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\..\..\lib\Magnum\net-3.5\Magnum.dll</HintPath>
+ </Reference>
+ <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\..\..\lib\Magnum\net-4.0\Magnum.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -100,6 +100,10 @@
<Project>{98D5A59C-96FA-4A1B-A653-EA5A35C45FC9}</Project>
<Name>MassTransit.WindsorIntegration</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\..\Loggers\MassTransit.Log4NetIntegration\MassTransit.Log4NetIntegration.csproj">
+ <Project>{8D2BE372-A756-4676-B2EA-ED7846809BFE}</Project>
+ <Name>MassTransit.Log4NetIntegration</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\..\MassTransit\MassTransit.csproj">
<Project>{6EFD69FC-CBCC-4F85-AEE0-EFBA73F4D273}</Project>
<Name>MassTransit</Name>
@@ -138,4 +142,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
82 src/Samples/Starbucks/Starbucks.Cashier/Program.cs
@@ -1,4 +1,4 @@
-// Copyright 2007-2008 The Apache Software Foundation.
+// Copyright 2007-2011 Chris Patterson, Dru Sellers, Travis Smith, et. al.
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
// this file except in compliance with the License. You may obtain a copy of the
@@ -10,56 +10,56 @@
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.
+
namespace Starbucks.Cashier
{
- using System;
- using System.Diagnostics;
- using System.IO;
- using log4net.Config;
- using Magnum;
- using Magnum.StateMachine;
- using Ninject;
- using Topshelf;
+ using System;
+ using System.Diagnostics;
+ using Magnum;
+ using Magnum.StateMachine;
+ using MassTransit.Log4NetIntegration.Logging;
+ using Ninject;
+ using Topshelf;
- internal static class Program
- {
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- private static void Main(string[] args)
- {
- XmlConfigurator.Configure(new FileInfo("cashier.log4net.xml"));
+ internal static class Program
+ {
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main(string[] args)
+ {
+ Log4NetLogger.Use("cashier.log4net.xml");
- HostFactory.Run(c =>
- {
- c.SetServiceName("StarbucksCashier");
- c.SetDisplayName("Starbucks Cashier");
- c.SetDescription("a Mass Transit sample service for handling orders of coffee.");
+ HostFactory.Run(c =>
+ {
+ c.SetServiceName("StarbucksCashier");
+ c.SetDisplayName("Starbucks Cashier");
+ c.SetDescription("a Mass Transit sample service for handling orders of coffee.");
- c.RunAsLocalSystem();
- c.DependsOnMsmq();
+ c.RunAsLocalSystem();
+ c.DependsOnMsmq();
- var kernel = new StandardKernel();
+ var kernel = new StandardKernel();
var module = new CashierRegistry();
kernel.Load(module);
- DisplayStateMachine();
+ DisplayStateMachine();
- c.Service<CashierService>(s =>
- {
- s.ConstructUsing(builder => kernel.Get<CashierService>());
- s.WhenStarted(o => o.Start());
- s.WhenStopped(o => o.Stop());
- });
- });
- }
+ c.Service<CashierService>(s =>
+ {
+ s.ConstructUsing(builder => kernel.Get<CashierService>());
+ s.WhenStarted(o => o.Start());
+ s.WhenStopped(o => o.Stop());
+ });
+ });
+ }
- private static void DisplayStateMachine()
- {
- Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
+ static void DisplayStateMachine()
+ {
+ Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
- StateMachineInspector.Trace(new CashierSaga(CombGuid.Generate()));
- }
- }
+ StateMachineInspector.Trace(new CashierSaga(CombGuid.Generate()));
+ }
+ }
}
View
30 src/Samples/Starbucks/Starbucks.Cashier/Starbucks.Cashier.csproj
@@ -53,18 +53,18 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
- <HintPath>..\..\..\..\lib\log4net\1.2.11\net35-full\log4net.dll</HintPath>
- </Reference>
- <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
- <HintPath>..\..\..\..\lib\log4net\1.2.11\net40-full\log4net.dll</HintPath>
- </Reference>
- <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
- <HintPath>..\..\..\..\lib\Magnum\net-3.5\Magnum.dll</HintPath>
- </Reference>
- <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
- <HintPath>..\..\..\..\lib\Magnum\net-4.0\Magnum.dll</HintPath>
- </Reference>
+ <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\..\..\lib\log4net\1.2.11\net35-full\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\..\..\lib\log4net\1.2.11\net40-full\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\..\..\lib\Magnum\net-3.5\Magnum.dll</HintPath>
+ </Reference>
+ <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\..\..\lib\Magnum\net-4.0\Magnum.dll</HintPath>
+ </Reference>
<Reference Include="Ninject">
<HintPath>..\..\..\..\lib\Ninject-2.0\net-3.5\Ninject.dll</HintPath>
</Reference>
@@ -96,6 +96,10 @@
<Project>{25A2A3C3-27D0-4C55-A9E9-0B82D6B6913F}</Project>
<Name>MassTransit.NinjectIntegration</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\..\Loggers\MassTransit.Log4NetIntegration\MassTransit.Log4NetIntegration.csproj">
+ <Project>{8D2BE372-A756-4676-B2EA-ED7846809BFE}</Project>
+ <Name>MassTransit.Log4NetIntegration</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\..\MassTransit\MassTransit.csproj">
<Project>{6EFD69FC-CBCC-4F85-AEE0-EFBA73F4D273}</Project>
<Name>MassTransit</Name>
@@ -134,4 +138,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
90 src/Samples/Starbucks/Starbucks.Customer/Program.cs
@@ -10,51 +10,51 @@
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.
+
namespace Starbucks.Customer
{
- using System;
- using System.IO;
- using System.Windows.Forms;
- using log4net.Config;
- using MassTransit;
- using StructureMap;
-
- internal static class Program
- {
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- private static void Main(string[] args)
- {
- XmlConfigurator.Configure(new FileInfo("customer.log4net.xml"));
-
- IContainer c = BootstrapContainer();
-
- Application.EnableVisualStyles();
- Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new OrderDrinkForm(c.GetInstance<IServiceBus>()));
- }
-
- private static IContainer BootstrapContainer()
- {
- var container = new Container(x => { x.AddType(typeof (OrderDrinkForm)); });
-
- container.Configure(cfg =>
- {
- cfg.For<IServiceBus>().Use(context => ServiceBusFactory.New(sbc =>
- {
- sbc.ReceiveFrom("msmq://localhost/starbucks_customer");
- sbc.UseMsmq();
- sbc.UseMulticastSubscriptionClient();
-
- sbc.UseControlBus();
-
- sbc.Subscribe(subs => { subs.LoadFrom(container); });
- }));
- });
-
- return container;
- }
- }
+ using System;
+ using System.Windows.Forms;
+ using MassTransit;
+ using MassTransit.Log4NetIntegration.Logging;
+ using StructureMap;
+
+ internal static class Program
+ {
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main(string[] args)
+ {
+ Log4NetLogger.Use("customer.log4net.xml");
+
+ IContainer c = BootstrapContainer();
+
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ Application.Run(new OrderDrinkForm(c.GetInstance<IServiceBus>()));
+ }
+
+ static IContainer BootstrapContainer()
+ {
+ var container = new Container(x => { x.AddType(typeof (OrderDrinkForm)); });
+
+ container.Configure(cfg =>
+ {
+ cfg.For<IServiceBus>().Use(context => ServiceBusFactory.New(sbc =>
+ {
+ sbc.ReceiveFrom("msmq://localhost/starbucks_customer");
+ sbc.UseMsmq();
+ sbc.UseMulticastSubscriptionClient();
+
+ sbc.UseControlBus();
+
+ sbc.Subscribe(subs => { subs.LoadFrom(container); });
+ }));
+ });
+
+ return container;
+ }
+ }
}
View
30 src/Samples/Starbucks/Starbucks.Customer/Starbucks.Customer.csproj
@@ -53,18 +53,18 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
- <HintPath>..\..\..\..\lib\log4net\1.2.11\net35-full\log4net.dll</HintPath>
- </Reference>
- <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
- <HintPath>..\..\..\..\lib\log4net\1.2.11\net40-full\log4net.dll</HintPath>
- </Reference>
- <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
- <HintPath>..\..\..\..\lib\Magnum\net-3.5\Magnum.dll</HintPath>
- </Reference>
- <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
- <HintPath>..\..\..\..\lib\Magnum\net-4.0\Magnum.dll</HintPath>
- </Reference>
+ <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\..\..\lib\log4net\1.2.11\net35-full\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="log4net" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\..\..\lib\log4net\1.2.11\net40-full\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v3.5'">
+ <HintPath>..\..\..\..\lib\Magnum\net-3.5\Magnum.dll</HintPath>
+ </Reference>
+ <Reference Include="Magnum" Condition="'$(TargetFrameworkVersion)' == 'v4.0'">
+ <HintPath>..\..\..\..\lib\Magnum\net-4.0\Magnum.dll</HintPath>
+ </Reference>
<Reference Include="StructureMap">
<HintPath>..\..\..\..\lib\StructureMap\StructureMap.dll</HintPath>
</Reference>
@@ -119,6 +119,10 @@
<Project>{F5E67502-2B30-484C-88C3-97710291F5AA}</Project>
<Name>MassTransit.StructureMapIntegration</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\..\Loggers\MassTransit.Log4NetIntegration\MassTransit.Log4NetIntegration.csproj">
+ <Project>{8D2BE372-A756-4676-B2EA-ED7846809BFE}</Project>
+ <Name>MassTransit.Log4NetIntegration</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\..\MassTransit\MassTransit.csproj">
<Project>{6EFD69FC-CBCC-4F85-AEE0-EFBA73F4D273}</Project>
<Name>MassTransit</Name>
@@ -163,4 +167,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
View
9 src/Samples/Starbucks/Starbucks.sln
@@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MassTransit.NinjectIntegrat
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MassTransit.WindsorIntegration", "..\..\Containers\MassTransit.WindsorIntegration\MassTransit.WindsorIntegration.csproj", "{98D5A59C-96FA-4A1B-A653-EA5A35C45FC9}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MassTransit.Log4NetIntegration", "..\..\Loggers\MassTransit.Log4NetIntegration\MassTransit.Log4NetIntegration.csproj", "{8D2BE372-A756-4676-B2EA-ED7846809BFE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Build|Any CPU = Build|Any CPU
@@ -79,6 +81,12 @@ Global
{98D5A59C-96FA-4A1B-A653-EA5A35C45FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98D5A59C-96FA-4A1B-A653-EA5A35C45FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{98D5A59C-96FA-4A1B-A653-EA5A35C45FC9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Build|Any CPU.ActiveCfg = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Build|Any CPU.Build.0 = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -89,5 +97,6 @@ Global
{F5E67502-2B30-484C-88C3-97710291F5AA} = {1FEFCD44-83A0-4240-B321-A73A53C6DC9E}
{25A2A3C3-27D0-4C55-A9E9-0B82D6B6913F} = {1FEFCD44-83A0-4240-B321-A73A53C6DC9E}
{98D5A59C-96FA-4A1B-A653-EA5A35C45FC9} = {1FEFCD44-83A0-4240-B321-A73A53C6DC9E}
+ {8D2BE372-A756-4676-B2EA-ED7846809BFE} = {1FEFCD44-83A0-4240-B321-A73A53C6DC9E}
EndGlobalSection
EndGlobal

0 comments on commit c536fcf

Please sign in to comment.
Something went wrong with that request. Please try again.