yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More dependency cleanup, less singleton usages, better testing implementations

Browse Source
This commit is contained in:
Shannon
2015-01-09 15:27:47 +11:00
parent 3f233ad4a4
commit 5bef3593dd
66 changed files with 682 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Standalone/ServiceContextManager.cs
View File

@@ -17,13 +17,15 @@ namespace Umbraco.Web.Standalone
{
private readonly string _connectionString;
private readonly string _providerName;
private readonly ILogger _logger;
private ServiceContext _serviceContext;
private readonly StandaloneApplication _application;
public ServiceContextManager(string connectionString, string providerName, string baseDirectory)
public ServiceContextManager(string connectionString, string providerName, string baseDirectory, ILogger logger)
{
_connectionString = connectionString;
_providerName = providerName;
_logger = logger;
Trace.WriteLine("Current AppDomain: " + AppDomain.CurrentDomain.FriendlyName);
Trace.WriteLine("Current AppDomain: " + AppDomain.CurrentDomain.BaseDirectory);
@@ -47,8 +49,8 @@ namespace Umbraco.Web.Standalone
// just not quite sure what this standalone stuff is.
new NullCacheProvider());
var dbFactory = new DefaultDatabaseFactory(_connectionString, _providerName);
var dbContext = new DatabaseContext(dbFactory);
var dbFactory = new DefaultDatabaseFactory(_connectionString, _providerName, _logger);
var dbContext = new DatabaseContext(dbFactory, _logger);
Database.Mapper = new PetaPocoMapper();
_serviceContext = new ServiceContext(
new PetaPocoUnitOfWorkProvider(dbFactory),