From 68fd501b24efad6b57b2565dc32c346d1203b9a8 Mon Sep 17 00:00:00 2001 From: loudej Date: Tue, 10 Nov 2009 03:54:12 +0000 Subject: [PATCH] Organizing classes into .Routes and .DataBinders namespaces --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4039306 --- .../Environment/DefaultOrchardHostTests.cs | 2 ++ .../Environment/DefaultOrchardShellTests.cs | 3 ++- .../Mvc/RouteCollectionPublisherTests.cs | 2 +- .../Models/ContentItemListModelBinder.cs | 1 - .../Packages/Orchard.CmsPages/Routes.cs | 2 +- .../Models/ModelBinderProvider.cs | 2 +- .../Environment/DefaultOrchardShell.cs | 3 ++- .../IModelBinderProvider.cs | 4 ++-- .../IModelBinderPublisher.cs | 2 +- .../ModelBinderDescriptor.cs | 2 +- .../ModelBinderPublisher.cs | 4 ++-- .../DefaultRouteProvider.cs | 4 ++-- .../Mvc/{ => Routes}/IRouteProvider.cs | 4 ++-- .../Mvc/{ => Routes}/IRoutePublisher.cs | 3 +-- .../Mvc/{ => Routes}/RouteDescriptor.cs | 2 +- .../Mvc/{ => Routes}/RoutePublisher.cs | 8 +++----- .../StandardPackageRouteProvider.cs | 8 ++++---- src/Orchard/Orchard.csproj | 20 +++++++++---------- 18 files changed, 38 insertions(+), 38 deletions(-) rename src/Orchard/Mvc/{ => ModelBinders}/IModelBinderProvider.cs (78%) rename src/Orchard/Mvc/{ => ModelBinders}/IModelBinderPublisher.cs (79%) rename src/Orchard/Mvc/{ => ModelBinders}/ModelBinderDescriptor.cs (80%) rename src/Orchard/Mvc/{ => ModelBinders}/ModelBinderPublisher.cs (90%) rename src/Orchard/Mvc/{RouteProviders => Routes}/DefaultRouteProvider.cs (96%) rename src/Orchard/Mvc/{ => Routes}/IRouteProvider.cs (79%) rename src/Orchard/Mvc/{ => Routes}/IRoutePublisher.cs (72%) rename src/Orchard/Mvc/{ => Routes}/RouteDescriptor.cs (83%) rename src/Orchard/Mvc/{ => Routes}/RoutePublisher.cs (92%) rename src/Orchard/Mvc/{RouteProviders => Routes}/StandardPackageRouteProvider.cs (96%) diff --git a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs index b07871558..b96dc0485 100644 --- a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs +++ b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs @@ -13,6 +13,8 @@ using Autofac.Modules; using NUnit.Framework; using Orchard.Environment; using Orchard.Mvc; +using Orchard.Mvc.ModelBinders; +using Orchard.Mvc.Routes; using Orchard.Tests.Stubs; namespace Orchard.Tests.Environment { diff --git a/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs index 93f7c0f8a..e79b609bd 100644 --- a/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs +++ b/src/Orchard.Tests/Environment/DefaultOrchardShellTests.cs @@ -6,7 +6,8 @@ using System.Web.Mvc; using System.Web.Routing; using NUnit.Framework; using Orchard.Environment; -using Orchard.Mvc; +using Orchard.Mvc.ModelBinders; +using Orchard.Mvc.Routes; namespace Orchard.Tests.Environment { [TestFixture] diff --git a/src/Orchard.Tests/Mvc/RouteCollectionPublisherTests.cs b/src/Orchard.Tests/Mvc/RouteCollectionPublisherTests.cs index 98220a2ed..bfc72a5db 100644 --- a/src/Orchard.Tests/Mvc/RouteCollectionPublisherTests.cs +++ b/src/Orchard.Tests/Mvc/RouteCollectionPublisherTests.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Web.Mvc; using System.Web.Routing; using NUnit.Framework; -using Orchard.Mvc; +using Orchard.Mvc.Routes; using Orchard.Tests.Stubs; namespace Orchard.Tests.Mvc { diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItemListModelBinder.cs b/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItemListModelBinder.cs index 69a6d90e5..bd6de904d 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItemListModelBinder.cs +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItemListModelBinder.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Web.Mvc; -using Orchard.Mvc; using Orchard.Mvc.ModelBinders; namespace Orchard.CmsPages.Models { diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Routes.cs b/src/Orchard.Web/Packages/Orchard.CmsPages/Routes.cs index 14b0c9fa5..b9a7258fe 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Routes.cs +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Routes.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; using Orchard.CmsPages.Services; -using Orchard.Mvc; +using Orchard.Mvc.Routes; namespace Orchard.CmsPages { public class Routes : IRouteProvider, IRouteConstraint { diff --git a/src/Orchard.Web/Packages/Orchard.XmlRpc/Models/ModelBinderProvider.cs b/src/Orchard.Web/Packages/Orchard.XmlRpc/Models/ModelBinderProvider.cs index cb8f374d9..c04da2e11 100644 --- a/src/Orchard.Web/Packages/Orchard.XmlRpc/Models/ModelBinderProvider.cs +++ b/src/Orchard.Web/Packages/Orchard.XmlRpc/Models/ModelBinderProvider.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.Mvc; using System.Xml; using System.Xml.Linq; -using Orchard.Mvc; +using Orchard.Mvc.ModelBinders; namespace Orchard.XmlRpc.Models { public class ModelBinderProvider : IModelBinderProvider, IModelBinder { diff --git a/src/Orchard/Environment/DefaultOrchardShell.cs b/src/Orchard/Environment/DefaultOrchardShell.cs index fc91409ba..3d477e563 100644 --- a/src/Orchard/Environment/DefaultOrchardShell.cs +++ b/src/Orchard/Environment/DefaultOrchardShell.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; -using Orchard.Mvc; +using Orchard.Mvc.ModelBinders; +using Orchard.Mvc.Routes; namespace Orchard.Environment { public class DefaultOrchardShell : IOrchardShell { diff --git a/src/Orchard/Mvc/IModelBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/IModelBinderProvider.cs similarity index 78% rename from src/Orchard/Mvc/IModelBinderProvider.cs rename to src/Orchard/Mvc/ModelBinders/IModelBinderProvider.cs index 189daef96..354744b50 100644 --- a/src/Orchard/Mvc/IModelBinderProvider.cs +++ b/src/Orchard/Mvc/ModelBinders/IModelBinderProvider.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -namespace Orchard.Mvc { +namespace Orchard.Mvc.ModelBinders { public interface IModelBinderProvider : IDependency { IEnumerable GetModelBinders(); } -} +} \ No newline at end of file diff --git a/src/Orchard/Mvc/IModelBinderPublisher.cs b/src/Orchard/Mvc/ModelBinders/IModelBinderPublisher.cs similarity index 79% rename from src/Orchard/Mvc/IModelBinderPublisher.cs rename to src/Orchard/Mvc/ModelBinders/IModelBinderPublisher.cs index 3c7c004f5..696c0a186 100644 --- a/src/Orchard/Mvc/IModelBinderPublisher.cs +++ b/src/Orchard/Mvc/ModelBinders/IModelBinderPublisher.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Orchard.Mvc { +namespace Orchard.Mvc.ModelBinders { public interface IModelBinderPublisher : IDependency { void Publish(IEnumerable binders); } diff --git a/src/Orchard/Mvc/ModelBinderDescriptor.cs b/src/Orchard/Mvc/ModelBinders/ModelBinderDescriptor.cs similarity index 80% rename from src/Orchard/Mvc/ModelBinderDescriptor.cs rename to src/Orchard/Mvc/ModelBinders/ModelBinderDescriptor.cs index 6fda40b3d..68d401e4f 100644 --- a/src/Orchard/Mvc/ModelBinderDescriptor.cs +++ b/src/Orchard/Mvc/ModelBinders/ModelBinderDescriptor.cs @@ -1,7 +1,7 @@ using System; using System.Web.Mvc; -namespace Orchard.Mvc { +namespace Orchard.Mvc.ModelBinders { public class ModelBinderDescriptor { public Type Type { get; set; } public IModelBinder ModelBinder { get; set; } diff --git a/src/Orchard/Mvc/ModelBinderPublisher.cs b/src/Orchard/Mvc/ModelBinders/ModelBinderPublisher.cs similarity index 90% rename from src/Orchard/Mvc/ModelBinderPublisher.cs rename to src/Orchard/Mvc/ModelBinders/ModelBinderPublisher.cs index 66cf6787a..011616ceb 100644 --- a/src/Orchard/Mvc/ModelBinderPublisher.cs +++ b/src/Orchard/Mvc/ModelBinders/ModelBinderPublisher.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Web.Mvc; -namespace Orchard.Mvc { +namespace Orchard.Mvc.ModelBinders { public class ModelBinderPublisher : IModelBinderPublisher { private readonly ModelBinderDictionary _binders; @@ -15,4 +15,4 @@ namespace Orchard.Mvc { } } } -} +} \ No newline at end of file diff --git a/src/Orchard/Mvc/RouteProviders/DefaultRouteProvider.cs b/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs similarity index 96% rename from src/Orchard/Mvc/RouteProviders/DefaultRouteProvider.cs rename to src/Orchard/Mvc/Routes/DefaultRouteProvider.cs index 18225f130..4559e45ca 100644 --- a/src/Orchard/Mvc/RouteProviders/DefaultRouteProvider.cs +++ b/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs @@ -6,7 +6,7 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; -namespace Orchard.Mvc.RouteProviders { +namespace Orchard.Mvc.Routes { public class DefaultRouteProvider : IRouteProvider { public IEnumerable GetRoutes() { return new[] { @@ -41,4 +41,4 @@ namespace Orchard.Mvc.RouteProviders { } } } -} +} \ No newline at end of file diff --git a/src/Orchard/Mvc/IRouteProvider.cs b/src/Orchard/Mvc/Routes/IRouteProvider.cs similarity index 79% rename from src/Orchard/Mvc/IRouteProvider.cs rename to src/Orchard/Mvc/Routes/IRouteProvider.cs index e212d1746..7eb459e2b 100644 --- a/src/Orchard/Mvc/IRouteProvider.cs +++ b/src/Orchard/Mvc/Routes/IRouteProvider.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -namespace Orchard.Mvc { +namespace Orchard.Mvc.Routes { public interface IRouteProvider : IDependency { IEnumerable GetRoutes(); } -} +} \ No newline at end of file diff --git a/src/Orchard/Mvc/IRoutePublisher.cs b/src/Orchard/Mvc/Routes/IRoutePublisher.cs similarity index 72% rename from src/Orchard/Mvc/IRoutePublisher.cs rename to src/Orchard/Mvc/Routes/IRoutePublisher.cs index 64879980e..47675aa7a 100644 --- a/src/Orchard/Mvc/IRoutePublisher.cs +++ b/src/Orchard/Mvc/Routes/IRoutePublisher.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using System.Web.Routing; -namespace Orchard.Mvc { +namespace Orchard.Mvc.Routes { public interface IRoutePublisher : IDependency { void Publish(IEnumerable routes); } diff --git a/src/Orchard/Mvc/RouteDescriptor.cs b/src/Orchard/Mvc/Routes/RouteDescriptor.cs similarity index 83% rename from src/Orchard/Mvc/RouteDescriptor.cs rename to src/Orchard/Mvc/Routes/RouteDescriptor.cs index ba7c3fc55..dc906d211 100644 --- a/src/Orchard/Mvc/RouteDescriptor.cs +++ b/src/Orchard/Mvc/Routes/RouteDescriptor.cs @@ -1,6 +1,6 @@ using System.Web.Routing; -namespace Orchard.Mvc { +namespace Orchard.Mvc.Routes { public class RouteDescriptor { public string Name { get; set; } public int Priority { get; set; } diff --git a/src/Orchard/Mvc/RoutePublisher.cs b/src/Orchard/Mvc/Routes/RoutePublisher.cs similarity index 92% rename from src/Orchard/Mvc/RoutePublisher.cs rename to src/Orchard/Mvc/Routes/RoutePublisher.cs index 32c5e533e..89cfc9885 100644 --- a/src/Orchard/Mvc/RoutePublisher.cs +++ b/src/Orchard/Mvc/Routes/RoutePublisher.cs @@ -1,11 +1,9 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; using System.Web.Routing; using Autofac.Integration.Web; -namespace Orchard.Mvc { +namespace Orchard.Mvc.Routes { public class RoutePublisher : IRoutePublisher { private readonly RouteCollection _routeCollection; private readonly IContainerProvider _containerProvider; @@ -42,4 +40,4 @@ namespace Orchard.Mvc { } } } -} +} \ No newline at end of file diff --git a/src/Orchard/Mvc/RouteProviders/StandardPackageRouteProvider.cs b/src/Orchard/Mvc/Routes/StandardPackageRouteProvider.cs similarity index 96% rename from src/Orchard/Mvc/RouteProviders/StandardPackageRouteProvider.cs rename to src/Orchard/Mvc/Routes/StandardPackageRouteProvider.cs index 087aa9955..a1c63ae7b 100644 --- a/src/Orchard/Mvc/RouteProviders/StandardPackageRouteProvider.cs +++ b/src/Orchard/Mvc/Routes/StandardPackageRouteProvider.cs @@ -2,7 +2,7 @@ using System.Web.Mvc; using System.Web.Routing; -namespace Orchard.Mvc.RouteProviders { +namespace Orchard.Mvc.Routes { public class StandardPackageRouteProvider : IRouteProvider { public IEnumerable GetRoutes() { //TEMP: Need to rely on a service that gives the list of active packages @@ -39,7 +39,7 @@ namespace Orchard.Mvc.RouteProviders { }, new MvcRouteHandler()) }, - new RouteDescriptor { + new RouteDescriptor { Priority = -10, Route = new Route( "Admin/Media/{action}/{id}", @@ -54,7 +54,7 @@ namespace Orchard.Mvc.RouteProviders { {"area", "Orchard.Media"} }, new MvcRouteHandler()) - }, + }, new RouteDescriptor { Priority = -10, Route = new Route( @@ -75,4 +75,4 @@ namespace Orchard.Mvc.RouteProviders { }; } } -} +} \ No newline at end of file diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj index c9cd59869..44ecd06d7 100644 --- a/src/Orchard/Orchard.csproj +++ b/src/Orchard/Orchard.csproj @@ -95,12 +95,12 @@ - - - - - - + + + + + + @@ -138,11 +138,11 @@ - - - + + + - +