From 5f164f09786df6a1f7e00e6940b952164349f473 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Mon, 1 Mar 2010 08:01:56 -0800 Subject: [PATCH] Pulling default route and extra assembly concat (from MvcModule) - Both no longer necessary since the default HomeController was removed --HG-- branch : dev --- src/Orchard.Web/Global.asax.cs | 6 ------ src/Orchard/Mvc/MvcModule.cs | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Orchard.Web/Global.asax.cs b/src/Orchard.Web/Global.asax.cs index 9886c450b..1ac2cccbf 100644 --- a/src/Orchard.Web/Global.asax.cs +++ b/src/Orchard.Web/Global.asax.cs @@ -16,12 +16,6 @@ namespace Orchard.Web { public static void RegisterRoutes(RouteCollection routes) { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - - routes.MapRoute( - "Default", // Route name - "{controller}/{action}/{id}", // URL with parameters - new { controller = "Home", action = "Index", id = "" } // Parameter defaults - ); } protected void Application_Start() { diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs index dcfecdd29..ee92a6c89 100644 --- a/src/Orchard/Mvc/MvcModule.cs +++ b/src/Orchard/Mvc/MvcModule.cs @@ -18,7 +18,7 @@ namespace Orchard.Mvc { protected override void Load(ContainerBuilder moduleBuilder) { var extensions = _extensionManager.ActiveExtensions(); - var assemblies = extensions.Select(x => x.Assembly).Concat(new[] { typeof(MvcModule).Assembly }); + var assemblies = extensions.Select(x => x.Assembly); var module = new AutofacControllerModule(assemblies.ToArray()) { ActionInvokerType = typeof(FilterResolvingActionInvoker),