From e2af46ed7165f76b5e8710397f6840b503a9006a Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Fri, 11 Jun 2010 17:28:46 -0700 Subject: [PATCH] Changing folder paths to follow namespaces --HG-- branch : dev --- src/Orchard.Specs/Bindings/OrchardSiteFactory.cs | 4 ++-- src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj | 2 +- .../ShellDescriptorManagerTests.cs | 4 ++-- .../Data/Builders/SessionFactoryBuilderTests.cs | 5 +++-- src/Orchard.Tests/DataUtility.cs | 3 ++- .../DefaultShellDescriptorCacheTests.cs | 4 ++-- .../Environment/DefaultCompositionStrategyTests.cs | 3 ++- .../Environment/DefaultOrchardHostTests.cs | 4 ++-- .../ShellBuilders/DefaultShellContainerFactoryTests.cs | 3 ++- .../ShellBuilders/DefaultShellContextFactoryTests.cs | 5 +++-- .../Environment/State/DefaultProcessingEngineTests.cs | 2 +- src/Orchard.Tests/Environment/Utility/Build.cs | 2 +- .../Mvc/Routes/StandardExtensionRouteProviderTests.cs | 3 ++- src/Orchard.Tests/Orchard.Framework.Tests.csproj | 2 +- src/Orchard.Web/Core/Orchard.Core.csproj | 8 ++++---- .../Records/ShellDescriptorRecord.cs | 0 .../Records/ShellFeatureRecord.cs | 0 .../Records/ShellParameterRecord.cs | 0 .../{Topology => Descriptor}/ShellDescriptorManager.cs | 4 ++-- .../Core/Settings/State/ShellStateManager.cs | 2 +- .../Modules/Orchard.Modules/Services/ModuleService.cs | 4 ++-- .../Orchard.Setup/Controllers/SetupController.cs | 4 ++-- .../Modules/Orchard.Setup/Services/SetupService.cs | 4 ++-- .../ContentManagement/Records/ContentItemAlteration.cs | 5 +++-- src/Orchard/Data/Builders/AbstractBuilder.cs | 5 +++-- src/Orchard/Data/Builders/ISessionFactoryBuilder.cs | 5 +++-- .../Data/Conventions/RecordTableNameConvention.cs | 5 +++-- src/Orchard/Data/SessionFactoryHolder.cs | 5 +++-- src/Orchard/Environment/DefaultOrchardHost.cs | 4 ++-- .../IShellDescriptorManager.cs | 4 ++-- .../{Topology => Descriptor}/Models/ShellDescriptor.cs | 2 +- .../{Topology => Descriptor}/ShellDescriptorCache.cs | 4 ++-- src/Orchard/Environment/IOrchardHost.cs | 2 +- src/Orchard/Environment/OrchardStarter.cs | 2 +- .../{Topology => ShellBuilders}/CompositionStrategy.cs | 5 +++-- .../Models/ShellBlueprint.cs | 3 ++- .../Environment/ShellBuilders/ShellContainerFactory.cs | 3 ++- src/Orchard/Environment/ShellBuilders/ShellContext.cs | 3 ++- .../Environment/ShellBuilders/ShellContextFactory.cs | 4 ++-- .../Environment/State/DefaultProcessingEngine.cs | 2 +- src/Orchard/Environment/State/IProcessingEngine.cs | 2 +- src/Orchard/Environment/State/ShellStateCoordinator.cs | 4 ++-- .../Mvc/Routes/StandardExtensionRouteProvider.cs | 3 ++- src/Orchard/Orchard.Framework.csproj | 10 +++++----- 44 files changed, 85 insertions(+), 69 deletions(-) rename src/Orchard.Tests.Modules/Settings/{Topology => Blueprint}/ShellDescriptorManagerTests.cs (96%) rename src/Orchard.Tests/Environment/{Topology => Blueprint}/DefaultShellDescriptorCacheTests.cs (95%) rename src/Orchard.Web/Core/Settings/{Topology => Descriptor}/Records/ShellDescriptorRecord.cs (100%) rename src/Orchard.Web/Core/Settings/{Topology => Descriptor}/Records/ShellFeatureRecord.cs (100%) rename src/Orchard.Web/Core/Settings/{Topology => Descriptor}/Records/ShellParameterRecord.cs (100%) rename src/Orchard.Web/Core/Settings/{Topology => Descriptor}/ShellDescriptorManager.cs (95%) rename src/Orchard/Environment/{Topology => Descriptor}/IShellDescriptorManager.cs (90%) rename src/Orchard/Environment/{Topology => Descriptor}/Models/ShellDescriptor.cs (92%) rename src/Orchard/Environment/{Topology => Descriptor}/ShellDescriptorCache.cs (95%) rename src/Orchard/Environment/{Topology => ShellBuilders}/CompositionStrategy.cs (95%) rename src/Orchard/Environment/{Topology => ShellBuilders}/Models/ShellBlueprint.cs (89%) diff --git a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs index a57e2063e..f7d7e61e2 100644 --- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs +++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Text; using Orchard.Environment.Configuration; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.Specs.Hosting.Orchard.Web; using TechTalk.SpecFlow; diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 76a1e904d..adec09cb8 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -111,7 +111,7 @@ - + diff --git a/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs b/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs similarity index 96% rename from src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs rename to src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs index 647391d19..6a2d67d09 100644 --- a/src/Orchard.Tests.Modules/Settings/Topology/ShellDescriptorManagerTests.cs +++ b/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs @@ -7,8 +7,8 @@ using Orchard.Core.Settings.State; using Orchard.Core.Settings.Descriptor; using Orchard.Core.Settings.Descriptor.Records; using Orchard.Environment.State; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.Events; namespace Orchard.Tests.Modules.Settings.Blueprint { diff --git a/src/Orchard.Tests/Data/Builders/SessionFactoryBuilderTests.cs b/src/Orchard.Tests/Data/Builders/SessionFactoryBuilderTests.cs index 1e8444c19..4ba18c3b0 100644 --- a/src/Orchard.Tests/Data/Builders/SessionFactoryBuilderTests.cs +++ b/src/Orchard.Tests/Data/Builders/SessionFactoryBuilderTests.cs @@ -2,8 +2,9 @@ using System.IO; using NUnit.Framework; using Orchard.Data.Builders; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; using Orchard.Tests.Records; namespace Orchard.Tests.Data.Builders { diff --git a/src/Orchard.Tests/DataUtility.cs b/src/Orchard.Tests/DataUtility.cs index 200b48b26..bc49e502d 100644 --- a/src/Orchard.Tests/DataUtility.cs +++ b/src/Orchard.Tests/DataUtility.cs @@ -9,7 +9,8 @@ using NHibernate; using NHibernate.Tool.hbm2ddl; using Orchard.Data; using Orchard.Data.Builders; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.Tests { public static class DataUtility { diff --git a/src/Orchard.Tests/Environment/Topology/DefaultShellDescriptorCacheTests.cs b/src/Orchard.Tests/Environment/Blueprint/DefaultShellDescriptorCacheTests.cs similarity index 95% rename from src/Orchard.Tests/Environment/Topology/DefaultShellDescriptorCacheTests.cs rename to src/Orchard.Tests/Environment/Blueprint/DefaultShellDescriptorCacheTests.cs index 853d55faa..4add91826 100644 --- a/src/Orchard.Tests/Environment/Topology/DefaultShellDescriptorCacheTests.cs +++ b/src/Orchard.Tests/Environment/Blueprint/DefaultShellDescriptorCacheTests.cs @@ -3,8 +3,8 @@ using System.Runtime.Serialization; using System.Xml; using Autofac; using NUnit.Framework; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.FileSystems.AppData; namespace Orchard.Tests.Environment.Blueprint { diff --git a/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs b/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs index 21c7d4999..6898c4a0d 100644 --- a/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs +++ b/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs @@ -11,7 +11,8 @@ using Orchard.ContentManagement.Records; using Orchard.Environment.Configuration; using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; -using Orchard.Environment.Blueprint; +using Orchard.Environment.Descriptor; +using Orchard.Environment.ShellBuilders; using Orchard.Tests.Environment.Utility; using Orchard.Tests.Records; using Orchard.Tests.Utility; diff --git a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs index 8b7b02f58..009999c5a 100644 --- a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs +++ b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs @@ -16,8 +16,8 @@ using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Folders; using Orchard.Environment.Extensions.Models; using Orchard.Environment.ShellBuilders; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.FileSystems.AppData; using Orchard.Mvc; using Orchard.Mvc.ModelBinders; diff --git a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContainerFactoryTests.cs b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContainerFactoryTests.cs index 4d51ab6d9..d23c93dc7 100644 --- a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContainerFactoryTests.cs +++ b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContainerFactoryTests.cs @@ -14,7 +14,8 @@ using Orchard.Environment.AutofacUtil.DynamicProxy2; using Orchard.Environment.Configuration; using Orchard.Environment.Extensions.Models; using Orchard.Environment.ShellBuilders; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.Tests.Environment.ShellBuilders { [TestFixture] diff --git a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs index cbb000ec8..dfe2395df 100644 --- a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs +++ b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs @@ -5,8 +5,9 @@ using NUnit.Framework; using Orchard.Environment; using Orchard.Environment.Configuration; using Orchard.Environment.ShellBuilders; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; using Orchard.Tests.Utility; namespace Orchard.Tests.Environment.ShellBuilders { diff --git a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs index 8d483e2cf..55ed31bdf 100644 --- a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs +++ b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using Orchard.Environment.Configuration; using Orchard.Environment.ShellBuilders; using Orchard.Environment.State; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; using Orchard.Events; using Orchard.Tests.Utility; diff --git a/src/Orchard.Tests/Environment/Utility/Build.cs b/src/Orchard.Tests/Environment/Utility/Build.cs index a4c8daccf..9c1394852 100644 --- a/src/Orchard.Tests/Environment/Utility/Build.cs +++ b/src/Orchard.Tests/Environment/Utility/Build.cs @@ -1,6 +1,6 @@ using System.Linq; using Orchard.Environment.Extensions.Models; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; namespace Orchard.Tests.Environment.Utility { static class Build { diff --git a/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs b/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs index 97b3ddcdf..479fde7aa 100644 --- a/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs +++ b/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs @@ -6,7 +6,8 @@ using System.Web.Routing; using NUnit.Framework; using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; using Orchard.Mvc.Routes; namespace Orchard.Tests.Mvc.Routes { diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 4b9753276..2204f2df9 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -203,7 +203,7 @@ - + diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 9a47f9649..8d934667a 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -182,10 +182,10 @@ - - - - + + + + diff --git a/src/Orchard.Web/Core/Settings/Topology/Records/ShellDescriptorRecord.cs b/src/Orchard.Web/Core/Settings/Descriptor/Records/ShellDescriptorRecord.cs similarity index 100% rename from src/Orchard.Web/Core/Settings/Topology/Records/ShellDescriptorRecord.cs rename to src/Orchard.Web/Core/Settings/Descriptor/Records/ShellDescriptorRecord.cs diff --git a/src/Orchard.Web/Core/Settings/Topology/Records/ShellFeatureRecord.cs b/src/Orchard.Web/Core/Settings/Descriptor/Records/ShellFeatureRecord.cs similarity index 100% rename from src/Orchard.Web/Core/Settings/Topology/Records/ShellFeatureRecord.cs rename to src/Orchard.Web/Core/Settings/Descriptor/Records/ShellFeatureRecord.cs diff --git a/src/Orchard.Web/Core/Settings/Topology/Records/ShellParameterRecord.cs b/src/Orchard.Web/Core/Settings/Descriptor/Records/ShellParameterRecord.cs similarity index 100% rename from src/Orchard.Web/Core/Settings/Topology/Records/ShellParameterRecord.cs rename to src/Orchard.Web/Core/Settings/Descriptor/Records/ShellParameterRecord.cs diff --git a/src/Orchard.Web/Core/Settings/Topology/ShellDescriptorManager.cs b/src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs similarity index 95% rename from src/Orchard.Web/Core/Settings/Topology/ShellDescriptorManager.cs rename to src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs index 966ab9c43..d4ccfd91a 100644 --- a/src/Orchard.Web/Core/Settings/Topology/ShellDescriptorManager.cs +++ b/src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using Orchard.Core.Settings.Descriptor.Records; using Orchard.Data; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.Localization; namespace Orchard.Core.Settings.Descriptor { diff --git a/src/Orchard.Web/Core/Settings/State/ShellStateManager.cs b/src/Orchard.Web/Core/Settings/State/ShellStateManager.cs index 9f44bee2b..7dd61c081 100644 --- a/src/Orchard.Web/Core/Settings/State/ShellStateManager.cs +++ b/src/Orchard.Web/Core/Settings/State/ShellStateManager.cs @@ -3,7 +3,7 @@ using Orchard.Core.Settings.State.Records; using Orchard.Data; using Orchard.Environment.State; using Orchard.Environment.State.Models; -using Orchard.Environment.Blueprint; +using Orchard.Environment.Descriptor; using Orchard.Logging; namespace Orchard.Core.Settings.State { diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs index e43ed90ae..09a86ae87 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs +++ b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Web; using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.Localization; using Orchard.Modules.Models; using Orchard.UI.Notify; diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs index 43b886293..800d0e2bb 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs @@ -10,8 +10,8 @@ using Orchard.Data; using Orchard.Environment; using Orchard.Environment.Extensions; using Orchard.Environment.ShellBuilders; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.FileSystems.AppData; using Orchard.Security; using Orchard.Settings; diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index e750e6e88..e843ebf1c 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -12,8 +12,8 @@ using Orchard.Data; using Orchard.Environment; using Orchard.Environment.Configuration; using Orchard.Environment.ShellBuilders; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.Localization; using Orchard.ContentManagement.MetaData.Services; using Orchard.Localization.Services; diff --git a/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs b/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs index 8af2090a5..c9c87de08 100644 --- a/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs +++ b/src/Orchard/ContentManagement/Records/ContentItemAlteration.cs @@ -8,8 +8,9 @@ using System.Reflection.Emit; using FluentNHibernate.Automapping; using FluentNHibernate.Automapping.Alterations; using JetBrains.Annotations; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.ContentManagement.Records { class ContentItemAlteration : IAutoMappingAlteration { diff --git a/src/Orchard/Data/Builders/AbstractBuilder.cs b/src/Orchard/Data/Builders/AbstractBuilder.cs index 5274d06c4..6a4e9bceb 100644 --- a/src/Orchard/Data/Builders/AbstractBuilder.cs +++ b/src/Orchard/Data/Builders/AbstractBuilder.cs @@ -11,8 +11,9 @@ using NHibernate.Cfg; using NHibernate.Tool.hbm2ddl; using Orchard.ContentManagement.Records; using Orchard.Data.Conventions; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.Data.Builders { public abstract class AbstractBuilder { diff --git a/src/Orchard/Data/Builders/ISessionFactoryBuilder.cs b/src/Orchard/Data/Builders/ISessionFactoryBuilder.cs index 55fc495c8..57fe5152f 100644 --- a/src/Orchard/Data/Builders/ISessionFactoryBuilder.cs +++ b/src/Orchard/Data/Builders/ISessionFactoryBuilder.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using NHibernate; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.Data.Builders { diff --git a/src/Orchard/Data/Conventions/RecordTableNameConvention.cs b/src/Orchard/Data/Conventions/RecordTableNameConvention.cs index d646bf4aa..e6c3c139f 100644 --- a/src/Orchard/Data/Conventions/RecordTableNameConvention.cs +++ b/src/Orchard/Data/Conventions/RecordTableNameConvention.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using System.Linq; using FluentNHibernate.Conventions; using FluentNHibernate.Conventions.Instances; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.Data.Conventions { public class RecordTableNameConvention : IClassConvention { diff --git a/src/Orchard/Data/SessionFactoryHolder.cs b/src/Orchard/Data/SessionFactoryHolder.cs index 2f9af4f53..47353cb7f 100644 --- a/src/Orchard/Data/SessionFactoryHolder.cs +++ b/src/Orchard/Data/SessionFactoryHolder.cs @@ -3,8 +3,9 @@ using System.IO; using NHibernate; using Orchard.Data.Builders; using Orchard.Environment.Configuration; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; using Orchard.FileSystems.AppData; using Orchard.Logging; diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs index f3f3f6229..36100deb2 100644 --- a/src/Orchard/Environment/DefaultOrchardHost.cs +++ b/src/Orchard/Environment/DefaultOrchardHost.cs @@ -9,8 +9,8 @@ using Orchard.Environment.Configuration; using Orchard.Environment.Extensions; using Orchard.Environment.ShellBuilders; using Orchard.Environment.State; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.Logging; using Orchard.Mvc; using Orchard.Mvc.ViewEngines; diff --git a/src/Orchard/Environment/Topology/IShellDescriptorManager.cs b/src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs similarity index 90% rename from src/Orchard/Environment/Topology/IShellDescriptorManager.cs rename to src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs index b00c810da..aa6a03e1e 100644 --- a/src/Orchard/Environment/Topology/IShellDescriptorManager.cs +++ b/src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; using Orchard.Events; -namespace Orchard.Environment.Blueprint { +namespace Orchard.Environment.Descriptor { /// /// Service resolved out of the shell container. Primarily used by host. /// diff --git a/src/Orchard/Environment/Topology/Models/ShellDescriptor.cs b/src/Orchard/Environment/Descriptor/Models/ShellDescriptor.cs similarity index 92% rename from src/Orchard/Environment/Topology/Models/ShellDescriptor.cs rename to src/Orchard/Environment/Descriptor/Models/ShellDescriptor.cs index 5ee9d4a52..5d718457b 100644 --- a/src/Orchard/Environment/Topology/Models/ShellDescriptor.cs +++ b/src/Orchard/Environment/Descriptor/Models/ShellDescriptor.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Orchard.Environment.Blueprint.Models { +namespace Orchard.Environment.Descriptor.Models { /// /// Contains a snapshot of a tenant's enabled features. diff --git a/src/Orchard/Environment/Topology/ShellDescriptorCache.cs b/src/Orchard/Environment/Descriptor/ShellDescriptorCache.cs similarity index 95% rename from src/Orchard/Environment/Topology/ShellDescriptorCache.cs rename to src/Orchard/Environment/Descriptor/ShellDescriptorCache.cs index 89182dcd9..8f718b746 100644 --- a/src/Orchard/Environment/Topology/ShellDescriptorCache.cs +++ b/src/Orchard/Environment/Descriptor/ShellDescriptorCache.cs @@ -2,12 +2,12 @@ using System.IO; using System.Runtime.Serialization; using System.Xml; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; using Orchard.FileSystems.AppData; using Orchard.Localization; using Orchard.Logging; -namespace Orchard.Environment.Blueprint { +namespace Orchard.Environment.Descriptor { /// /// Single service instance registered at the host level. Provides storage /// and recall of shell descriptor information. Default implementation uses diff --git a/src/Orchard/Environment/IOrchardHost.cs b/src/Orchard/Environment/IOrchardHost.cs index 07b082e97..6d688ada7 100644 --- a/src/Orchard/Environment/IOrchardHost.cs +++ b/src/Orchard/Environment/IOrchardHost.cs @@ -1,5 +1,5 @@ using Orchard.Environment.Configuration; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; namespace Orchard.Environment { public interface IOrchardHost { diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs index bbb43b8b7..ba5a808ce 100644 --- a/src/Orchard/Environment/OrchardStarter.cs +++ b/src/Orchard/Environment/OrchardStarter.cs @@ -12,7 +12,7 @@ using Orchard.Environment.Extensions.Folders; using Orchard.Environment.Extensions.Loaders; using Orchard.Environment.ShellBuilders; using Orchard.Environment.State; -using Orchard.Environment.Blueprint; +using Orchard.Environment.Descriptor; using Orchard.Events; using Orchard.FileSystems.AppData; using Orchard.FileSystems.Dependencies; diff --git a/src/Orchard/Environment/Topology/CompositionStrategy.cs b/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs similarity index 95% rename from src/Orchard/Environment/Topology/CompositionStrategy.cs rename to src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs index 596557fe3..cdbcf23e1 100644 --- a/src/Orchard/Environment/Topology/CompositionStrategy.cs +++ b/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs @@ -6,12 +6,13 @@ using System.Web.Mvc; using Autofac.Core; using Orchard.ContentManagement; using Orchard.ContentManagement.Records; -using Orchard.Environment.Blueprint.Models; using Orchard.Environment.Configuration; +using Orchard.Environment.Descriptor.Models; using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; +using Orchard.Environment.ShellBuilders.Models; -namespace Orchard.Environment.Blueprint { +namespace Orchard.Environment.ShellBuilders { /// /// Service at the host level to transform the cachable descriptor into the loadable blueprint. /// diff --git a/src/Orchard/Environment/Topology/Models/ShellBlueprint.cs b/src/Orchard/Environment/ShellBuilders/Models/ShellBlueprint.cs similarity index 89% rename from src/Orchard/Environment/Topology/Models/ShellBlueprint.cs rename to src/Orchard/Environment/ShellBuilders/Models/ShellBlueprint.cs index 038bf6379..027d9012e 100644 --- a/src/Orchard/Environment/Topology/Models/ShellBlueprint.cs +++ b/src/Orchard/Environment/ShellBuilders/Models/ShellBlueprint.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; +using Orchard.Environment.Descriptor.Models; using Orchard.Environment.Extensions.Models; -namespace Orchard.Environment.Blueprint.Models { +namespace Orchard.Environment.ShellBuilders.Models { /// /// Contains the information necessary to initialize an IoC container diff --git a/src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs b/src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs index a4e2533e4..eda04c918 100644 --- a/src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs +++ b/src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs @@ -11,7 +11,8 @@ using Autofac.Features.Indexed; using Autofac.Integration.Web.Mvc; using Orchard.Environment.AutofacUtil.DynamicProxy2; using Orchard.Environment.Configuration; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; using Orchard.Events; namespace Orchard.Environment.ShellBuilders { diff --git a/src/Orchard/Environment/ShellBuilders/ShellContext.cs b/src/Orchard/Environment/ShellBuilders/ShellContext.cs index b90a08d80..ede74b266 100644 --- a/src/Orchard/Environment/ShellBuilders/ShellContext.cs +++ b/src/Orchard/Environment/ShellBuilders/ShellContext.cs @@ -1,6 +1,7 @@ using Autofac; using Orchard.Environment.Configuration; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.Environment.ShellBuilders { public class ShellContext { diff --git a/src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs b/src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs index a7cc3a37a..27e09bac4 100644 --- a/src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs +++ b/src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs @@ -2,8 +2,8 @@ using System; using System.Linq; using Autofac; using Orchard.Environment.Configuration; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; using Orchard.Logging; namespace Orchard.Environment.ShellBuilders { diff --git a/src/Orchard/Environment/State/DefaultProcessingEngine.cs b/src/Orchard/Environment/State/DefaultProcessingEngine.cs index 11e278d47..0504f0b6f 100644 --- a/src/Orchard/Environment/State/DefaultProcessingEngine.cs +++ b/src/Orchard/Environment/State/DefaultProcessingEngine.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using Orchard.Environment.Configuration; using Orchard.Environment.ShellBuilders; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; using Orchard.Events; using Orchard.Logging; diff --git a/src/Orchard/Environment/State/IProcessingEngine.cs b/src/Orchard/Environment/State/IProcessingEngine.cs index ee5407b23..42088d355 100644 --- a/src/Orchard/Environment/State/IProcessingEngine.cs +++ b/src/Orchard/Environment/State/IProcessingEngine.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Orchard.Environment.Configuration; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; namespace Orchard.Environment.State { diff --git a/src/Orchard/Environment/State/ShellStateCoordinator.cs b/src/Orchard/Environment/State/ShellStateCoordinator.cs index e231b0b21..637ae8a0d 100644 --- a/src/Orchard/Environment/State/ShellStateCoordinator.cs +++ b/src/Orchard/Environment/State/ShellStateCoordinator.cs @@ -5,8 +5,8 @@ using Orchard.Environment.Configuration; using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; using Orchard.Environment.State.Models; -using Orchard.Environment.Blueprint; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor; +using Orchard.Environment.Descriptor.Models; namespace Orchard.Environment.State { public class ShellStateCoordinator : IShellStateManagerEventHandler, IShellDescriptorManagerEventHandler { diff --git a/src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs b/src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs index 0891404fc..a15ad07ae 100644 --- a/src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs +++ b/src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs @@ -3,7 +3,8 @@ using System.Linq; using System.Web.Mvc; using System.Web.Routing; using Orchard.Environment.Extensions; -using Orchard.Environment.Blueprint.Models; +using Orchard.Environment.Descriptor.Models; +using Orchard.Environment.ShellBuilders.Models; namespace Orchard.Mvc.Routes { public class StandardExtensionRouteProvider : IRouteProvider { diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index fae5062e5..f4bd5bc58 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -390,7 +390,7 @@ - + @@ -455,10 +455,10 @@ - - - - + + + +