Changing namespace of Migrations to Builders

Refactoring to be what's needed at the moment

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-02-15 12:57:52 -08:00
parent 91a34a35ff
commit 6a34dce4ef
14 changed files with 37 additions and 37 deletions

View File

@@ -7,7 +7,7 @@ using Autofac.Builder;
using JetBrains.Annotations; using JetBrains.Annotations;
using Moq; using Moq;
using NUnit.Framework; using NUnit.Framework;
using Orchard.Data.Migrations; using Orchard.Data.Builders;
using Orchard.Environment; using Orchard.Environment;
using Orchard.Environment.Configuration; using Orchard.Environment.Configuration;
using Orchard.Setup.Controllers; using Orchard.Setup.Controllers;

View File

@@ -1,13 +1,13 @@
using System.Data.SqlClient; using System.Data.SqlClient;
using System.IO; using System.IO;
using NUnit.Framework; using NUnit.Framework;
using Orchard.Data.Migrations; using Orchard.Data.Builders;
using Orchard.Environment; using Orchard.Environment;
using Orchard.Tests.Records; using Orchard.Tests.Records;
namespace Orchard.Tests.Data.Migrations { namespace Orchard.Tests.Data.Builders {
[TestFixture] [TestFixture]
public class DatabaseManagerTests { public class SessionFactoryBuilderTests {
private string _tempDataFolder; private string _tempDataFolder;
[SetUp] [SetUp]
@@ -47,16 +47,16 @@ namespace Orchard.Tests.Data.Migrations {
[Test] [Test]
public void SQLiteSchemaShouldBeGeneratedAndUsable() { public void SQLiteSchemaShouldBeGeneratedAndUsable() {
var recordDescriptors = new[] { var recordDescriptors = new[] {
new RecordDescriptor {Prefix = "Hello", Type = typeof (Foo)} new RecordDescriptor {Prefix = "Hello", Type = typeof (Foo)}
}; };
var manager = (ISessionFactoryBuilder)new SessionFactoryBuilder(); var manager = (ISessionFactoryBuilder)new SessionFactoryBuilder();
var sessionFactory = manager.BuildSessionFactory(new SessionFactoryParameters { var sessionFactory = manager.BuildSessionFactory(new SessionFactoryParameters {
Provider = "SQLite", Provider = "SQLite",
DataFolder = _tempDataFolder, DataFolder = _tempDataFolder,
UpdateSchema = true, UpdateSchema = true,
RecordDescriptors = recordDescriptors RecordDescriptors = recordDescriptors
}); });
var session = sessionFactory.OpenSession(); var session = sessionFactory.OpenSession();
@@ -77,17 +77,17 @@ namespace Orchard.Tests.Data.Migrations {
CreateSqlServerDatabase(databasePath); CreateSqlServerDatabase(databasePath);
var recordDescriptors = new[] { var recordDescriptors = new[] {
new RecordDescriptor {Prefix = "Hello", Type = typeof (Foo)} new RecordDescriptor {Prefix = "Hello", Type = typeof (Foo)}
}; };
var manager = (ISessionFactoryBuilder)new SessionFactoryBuilder(); var manager = (ISessionFactoryBuilder)new SessionFactoryBuilder();
var sessionFactory = manager.BuildSessionFactory(new SessionFactoryParameters { var sessionFactory = manager.BuildSessionFactory(new SessionFactoryParameters {
Provider = "SQLite", Provider = "SQLite",
DataFolder = _tempDataFolder, DataFolder = _tempDataFolder,
ConnectionString = "Data Source=.\\SQLEXPRESS;AttachDbFileName=" + databasePath + ";Integrated Security=True;User Instance=True;", ConnectionString = "Data Source=.\\SQLEXPRESS;AttachDbFileName=" + databasePath + ";Integrated Security=True;User Instance=True;",
UpdateSchema = true, UpdateSchema = true,
RecordDescriptors = recordDescriptors, RecordDescriptors = recordDescriptors,
}); });
@@ -102,4 +102,4 @@ namespace Orchard.Tests.Data.Migrations {
sessionFactory.Close(); sessionFactory.Close();
} }
} }
} }

View File

@@ -9,7 +9,7 @@ using FluentNHibernate.Cfg.Db;
using NHibernate; using NHibernate;
using NHibernate.Tool.hbm2ddl; using NHibernate.Tool.hbm2ddl;
using Orchard.Data; using Orchard.Data;
using Orchard.Data.Migrations; using Orchard.Data.Builders;
using Orchard.Environment; using Orchard.Environment;
namespace Orchard.Tests { namespace Orchard.Tests {

View File

@@ -135,7 +135,7 @@
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="DataUtility.cs" /> <Compile Include="DataUtility.cs" />
<Compile Include="Data\Migrations\DatabaseManagerTests.cs" /> <Compile Include="Data\Builders\SessionFactoryBuilderTests.cs" />
<Compile Include="Data\RepositoryTests.cs" /> <Compile Include="Data\RepositoryTests.cs" />
<Compile Include="Data\StubLocator.cs" /> <Compile Include="Data\StubLocator.cs" />
<Compile Include="Environment\Configuration\AppDataFolderTests.cs" /> <Compile Include="Environment\Configuration\AppDataFolderTests.cs" />

View File

@@ -13,7 +13,7 @@
<add name="WebPageTrace"/> <add name="WebPageTrace"/>
</listeners> </listeners>
</source> </source>
<source name="Orchard.Localization" switchValue="Information"> <source name="Orchard.Data.SessionLocator" switchValue="Information">
<listeners> <listeners>
<add name="OrchardDebugTextLog" /> <add name="OrchardDebugTextLog" />
<add name="WebPageTrace"/> <add name="WebPageTrace"/>

View File

@@ -7,7 +7,7 @@ using Orchard.Core.Common.Models;
using Orchard.Core.Navigation.Models; using Orchard.Core.Navigation.Models;
using Orchard.Core.Settings.Models; using Orchard.Core.Settings.Models;
using Orchard.Data; using Orchard.Data;
using Orchard.Data.Migrations; using Orchard.Data.Builders;
using Orchard.Environment; using Orchard.Environment;
using Orchard.Environment.Configuration; using Orchard.Environment.Configuration;
using Orchard.Security; using Orchard.Security;

View File

@@ -13,7 +13,7 @@ using Orchard.ContentManagement.Records;
using Orchard.Data.Conventions; using Orchard.Data.Conventions;
using Orchard.Environment; using Orchard.Environment;
namespace Orchard.Data.Migrations { namespace Orchard.Data.Builders {
public abstract class AbstractBuilder { public abstract class AbstractBuilder {
protected abstract IPersistenceConfigurer GetPersistenceConfigurer(); protected abstract IPersistenceConfigurer GetPersistenceConfigurer();

View File

@@ -2,7 +2,7 @@ using System.Collections.Generic;
using NHibernate; using NHibernate;
using Orchard.Environment; using Orchard.Environment;
namespace Orchard.Data.Migrations { namespace Orchard.Data.Builders {
public interface ISessionFactoryBuilder : IDependency { public interface ISessionFactoryBuilder : IDependency {
ISessionFactory BuildSessionFactory(SessionFactoryParameters sessionFactoryParameters); ISessionFactory BuildSessionFactory(SessionFactoryParameters sessionFactoryParameters);

View File

@@ -1,7 +1,7 @@
using System.IO; using System.IO;
using FluentNHibernate.Cfg.Db; using FluentNHibernate.Cfg.Db;
namespace Orchard.Data.Migrations { namespace Orchard.Data.Builders {
public class SQLiteBuilder : AbstractBuilder { public class SQLiteBuilder : AbstractBuilder {
private readonly string _dataFolder; private readonly string _dataFolder;
private readonly string _connectionString; private readonly string _connectionString;

View File

@@ -1,7 +1,7 @@
using System; using System;
using NHibernate; using NHibernate;
namespace Orchard.Data.Migrations { namespace Orchard.Data.Builders {
public class SessionFactoryBuilder : ISessionFactoryBuilder { public class SessionFactoryBuilder : ISessionFactoryBuilder {
public ISessionFactory BuildSessionFactory(SessionFactoryParameters sessionFactoryParameters) { public ISessionFactory BuildSessionFactory(SessionFactoryParameters sessionFactoryParameters) {
AbstractBuilder builder; AbstractBuilder builder;

View File

@@ -1,7 +1,7 @@
using System; using System;
using FluentNHibernate.Cfg.Db; using FluentNHibernate.Cfg.Db;
namespace Orchard.Data.Migrations { namespace Orchard.Data.Builders {
public class SqlServerBuilder : AbstractBuilder { public class SqlServerBuilder : AbstractBuilder {
private readonly string _dataFolder; private readonly string _dataFolder;
private readonly string _connectionString; private readonly string _connectionString;

View File

@@ -1,6 +1,6 @@
using System.IO; using System.IO;
using NHibernate; using NHibernate;
using Orchard.Data.Migrations; using Orchard.Data.Builders;
using Orchard.Environment; using Orchard.Environment;
using Orchard.Environment.Configuration; using Orchard.Environment.Configuration;
using Orchard.Logging; using Orchard.Logging;

View File

@@ -8,7 +8,7 @@ using System.Web.Routing;
using Autofac; using Autofac;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.Handlers;
using Orchard.Data.Migrations; using Orchard.Data.Builders;
using Orchard.Environment.Configuration; using Orchard.Environment.Configuration;
using Orchard.Extensions; using Orchard.Extensions;
using Orchard.Localization; using Orchard.Localization;

View File

@@ -133,11 +133,11 @@
<Compile Include="ContentManagement\Handlers\RemoveContentContext.cs" /> <Compile Include="ContentManagement\Handlers\RemoveContentContext.cs" />
<Compile Include="ContentManagement\Handlers\VersionContentContext.cs" /> <Compile Include="ContentManagement\Handlers\VersionContentContext.cs" />
<Compile Include="Data\Conventions\RecordTableNameConvention.cs" /> <Compile Include="Data\Conventions\RecordTableNameConvention.cs" />
<Compile Include="Data\Migrations\AbstractBuilder.cs" /> <Compile Include="Data\Builders\AbstractBuilder.cs" />
<Compile Include="Data\Migrations\SessionFactoryBuilder.cs" /> <Compile Include="Data\Builders\SessionFactoryBuilder.cs" />
<Compile Include="Data\Migrations\ISessionFactoryBuilder.cs" /> <Compile Include="Data\Builders\ISessionFactoryBuilder.cs" />
<Compile Include="Data\Migrations\SQLiteBuilder.cs" /> <Compile Include="Data\Builders\SQLiteBuilder.cs" />
<Compile Include="Data\Migrations\SqlServerBuilder.cs" /> <Compile Include="Data\Builders\SqlServerBuilder.cs" />
<Compile Include="Data\SessionFactoryHolder.cs" /> <Compile Include="Data\SessionFactoryHolder.cs" />
<Compile Include="Environment\Configuration\AppDataFolder.cs" /> <Compile Include="Environment\Configuration\AppDataFolder.cs" />
<Compile Include="Environment\Configuration\ShellSettingsLoader.cs" /> <Compile Include="Environment\Configuration\ShellSettingsLoader.cs" />