Moving controllers out of stock Orchard.Web app. Updating standard route provider to use package manager active entry information. (removes hardcoded entries.)

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4039327

src/Orchard.Web/Controllers/AccountController.cs

@@ -1,287 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Security.Principal;
-using System.Web.Mvc;
-using System.Web.Security;
-
-namespace Orchard.Web.Controllers {
-    [HandleError]
-    public class AccountController : Controller {
-        // This constructor is used by the MVC framework to instantiate the controller using
-        // the default forms authentication and membership providers.
-
-        public AccountController()
-            : this(null, null) {}
-
-        // This constructor is not used by the MVC framework but is instead provided for ease
-        // of unit testing this type. See the comments at the end of this file for more
-        // information.
-        public AccountController(IFormsAuthentication formsAuth, IMembershipService service) {
-            FormsAuth = formsAuth ?? new FormsAuthenticationService();
-            MembershipService = service ?? new AccountMembershipService();
-        }
-
-        public IFormsAuthentication FormsAuth { get; private set; }
-
-        public IMembershipService MembershipService { get; private set; }
-
-        public ActionResult LogOn() {
-            return View();
-        }
-
-        [AcceptVerbs(HttpVerbs.Post)]
-        [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings",
-            Justification = "Needs to take same parameter type as Controller.Redirect()")]
-        public ActionResult LogOn(string userName, string password, bool rememberMe, string returnUrl) {
-            if (!ValidateLogOn(userName, password)) {
-                return View();
-            }
-
-            FormsAuth.SignIn(userName, rememberMe);
-            if (!String.IsNullOrEmpty(returnUrl)) {
-                return Redirect(returnUrl);
-            }
-            else {
-                return RedirectToAction("Index", "Home");
-            }
-        }
-
-        public ActionResult LogOff() {
-            FormsAuth.SignOut();
-
-            return RedirectToAction("Index", "Home");
-        }
-
-        public ActionResult Register() {
-            ViewData["PasswordLength"] = MembershipService.MinPasswordLength;
-
-            return View();
-        }
-
-        [AcceptVerbs(HttpVerbs.Post)]
-        public ActionResult Register(string userName, string email, string password, string confirmPassword) {
-            ViewData["PasswordLength"] = MembershipService.MinPasswordLength;
-
-            if (ValidateRegistration(userName, email, password, confirmPassword)) {
-                // Attempt to register the user
-                var createStatus = MembershipService.CreateUser(userName, password, email);
-
-                if (createStatus == MembershipCreateStatus.Success) {
-                    FormsAuth.SignIn(userName, false /* createPersistentCookie */);
-                    return RedirectToAction("Index", "Home");
-                }
-                else {
-                    ModelState.AddModelError("_FORM", ErrorCodeToString(createStatus));
-                }
-            }
-
-            // If we got this far, something failed, redisplay form
-            return View();
-        }
-
-        [Authorize]
-        public ActionResult ChangePassword() {
-            ViewData["PasswordLength"] = MembershipService.MinPasswordLength;
-
-            return View();
-        }
-
-        [Authorize]
-        [AcceptVerbs(HttpVerbs.Post)]
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",
-            Justification = "Exceptions result in password not being changed.")]
-        public ActionResult ChangePassword(string currentPassword, string newPassword, string confirmPassword) {
-            ViewData["PasswordLength"] = MembershipService.MinPasswordLength;
-
-            if (!ValidateChangePassword(currentPassword, newPassword, confirmPassword)) {
-                return View();
-            }
-
-            try {
-                if (MembershipService.ChangePassword(User.Identity.Name, currentPassword, newPassword)) {
-                    return RedirectToAction("ChangePasswordSuccess");
-                }
-                else {
-                    ModelState.AddModelError("_FORM",
-                                             "The current password is incorrect or the new password is invalid.");
-                    return View();
-                }
-            }
-            catch {
-                ModelState.AddModelError("_FORM", "The current password is incorrect or the new password is invalid.");
-                return View();
-            }
-        }
-
-        public ActionResult ChangePasswordSuccess() {
-            return View();
-        }
-
-        protected override void OnActionExecuting(ActionExecutingContext filterContext) {
-            if (filterContext.HttpContext.User.Identity is WindowsIdentity) {
-                throw new InvalidOperationException("Windows authentication is not supported.");
-            }
-        }
-
-        #region Validation Methods
-
-        private bool ValidateChangePassword(string currentPassword, string newPassword, string confirmPassword) {
-            if (String.IsNullOrEmpty(currentPassword)) {
-                ModelState.AddModelError("currentPassword", "You must specify a current password.");
-            }
-            if (newPassword == null || newPassword.Length < MembershipService.MinPasswordLength) {
-                ModelState.AddModelError("newPassword",
-                                         String.Format(CultureInfo.CurrentCulture,
-                                                       "You must specify a new password of {0} or more characters.",
-                                                       MembershipService.MinPasswordLength));
-            }
-
-            if (!String.Equals(newPassword, confirmPassword, StringComparison.Ordinal)) {
-                ModelState.AddModelError("_FORM", "The new password and confirmation password do not match.");
-            }
-
-            return ModelState.IsValid;
-        }
-
-        private bool ValidateLogOn(string userName, string password) {
-            if (String.IsNullOrEmpty(userName)) {
-                ModelState.AddModelError("username", "You must specify a username.");
-            }
-            if (String.IsNullOrEmpty(password)) {
-                ModelState.AddModelError("password", "You must specify a password.");
-            }
-            if (!MembershipService.ValidateUser(userName, password)) {
-                ModelState.AddModelError("_FORM", "The username or password provided is incorrect.");
-            }
-
-            return ModelState.IsValid;
-        }
-
-        private bool ValidateRegistration(string userName, string email, string password, string confirmPassword) {
-            if (String.IsNullOrEmpty(userName)) {
-                ModelState.AddModelError("username", "You must specify a username.");
-            }
-            if (String.IsNullOrEmpty(email)) {
-                ModelState.AddModelError("email", "You must specify an email address.");
-            }
-            if (password == null || password.Length < MembershipService.MinPasswordLength) {
-                ModelState.AddModelError("password",
-                                         String.Format(CultureInfo.CurrentCulture,
-                                                       "You must specify a password of {0} or more characters.",
-                                                       MembershipService.MinPasswordLength));
-            }
-            if (!String.Equals(password, confirmPassword, StringComparison.Ordinal)) {
-                ModelState.AddModelError("_FORM", "The new password and confirmation password do not match.");
-            }
-            return ModelState.IsValid;
-        }
-
-        private static string ErrorCodeToString(MembershipCreateStatus createStatus) {
-            // See http://msdn.microsoft.com/en-us/library/system.web.security.membershipcreatestatus.aspx for
-            // a full list of status codes.
-            switch (createStatus) {
-                case MembershipCreateStatus.DuplicateUserName:
-                    return "Username already exists. Please enter a different user name.";
-
-                case MembershipCreateStatus.DuplicateEmail:
-                    return "A username for that e-mail address already exists. Please enter a different e-mail address.";
-
-                case MembershipCreateStatus.InvalidPassword:
-                    return "The password provided is invalid. Please enter a valid password value.";
-
-                case MembershipCreateStatus.InvalidEmail:
-                    return "The e-mail address provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.InvalidAnswer:
-                    return "The password retrieval answer provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.InvalidQuestion:
-                    return "The password retrieval question provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.InvalidUserName:
-                    return "The user name provided is invalid. Please check the value and try again.";
-
-                case MembershipCreateStatus.ProviderError:
-                    return
-                        "The authentication provider returned an error. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
-
-                case MembershipCreateStatus.UserRejected:
-                    return
-                        "The user creation request has been canceled. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
-
-                default:
-                    return
-                        "An unknown error occurred. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
-            }
-        }
-
-        #endregion
-    }
-
-    // The FormsAuthentication type is sealed and contains static members, so it is difficult to
-    // unit test code that calls its members. The interface and helper class below demonstrate
-    // how to create an abstract wrapper around such a type in order to make the AccountController
-    // code unit testable.
-
-    public interface IFormsAuthentication {
-        void SignIn(string userName, bool createPersistentCookie);
-        void SignOut();
-    }
-
-    public class FormsAuthenticationService : IFormsAuthentication {
-        #region IFormsAuthentication Members
-
-        public void SignIn(string userName, bool createPersistentCookie) {
-            FormsAuthentication.SetAuthCookie(userName, createPersistentCookie);
-        }
-
-        public void SignOut() {
-            FormsAuthentication.SignOut();
-        }
-
-        #endregion
-    }
-
-    public interface IMembershipService {
-        int MinPasswordLength { get; }
-
-        bool ValidateUser(string userName, string password);
-        MembershipCreateStatus CreateUser(string userName, string password, string email);
-        bool ChangePassword(string userName, string oldPassword, string newPassword);
-    }
-
-    public class AccountMembershipService : IMembershipService {
-        private readonly MembershipProvider _provider;
-
-        public AccountMembershipService()
-            : this(null) {}
-
-        public AccountMembershipService(MembershipProvider provider) {
-            _provider = provider ?? Membership.Provider;
-        }
-
-        #region IMembershipService Members
-
-        public int MinPasswordLength {
-            get { return _provider.MinRequiredPasswordLength; }
-        }
-
-        public bool ValidateUser(string userName, string password) {
-            return _provider.ValidateUser(userName, password);
-        }
-
-        public MembershipCreateStatus CreateUser(string userName, string password, string email) {
-            MembershipCreateStatus status;
-            _provider.CreateUser(userName, password, email, null, null, true, null, out status);
-            return status;
-        }
-
-        public bool ChangePassword(string userName, string oldPassword, string newPassword) {
-            var currentUser = _provider.GetUser(userName, true /* userIsOnline */);
-            return currentUser.ChangePassword(oldPassword, newPassword);
-        }
-
-        #endregion
-    }
-}

src/Orchard.Web/Controllers/HomeController.cs

@@ -1,54 +0,0 @@
-using System.Collections.Generic;
-using System.Web.Mvc;
-using Orchard.Mvc.ModelBinders;
-
-namespace Orchard.Web.Controllers {
-    [HandleError]
-    public class HomeController : Controller {
-
-        static HomeController() {
-            
-            var fooListBinder = new KeyedListModelBinder<Foo>(
-                ModelBinders.Binders, ModelMetadataProviders.Current, x => x.Name);
-
-            ModelBinders.Binders.Add(typeof(IList<Foo>), fooListBinder);
-        }
-
-        public ActionResult Index() {
-            ViewData["Message"] = "Welcome to ASP.NET MVC!";
-
-            return View();
-        }
-
-        public ActionResult About() {
-
-            var foos = new[] {
-                new Foo {Name = "one", Content = "uno"},
-                new Foo {Name = "two", Content = "dos"},
-                new Foo {Name = "three", Content = "tres"},
-            };
-            return View(new HomeAboutViewModel { Foos = foos });
-        }
-
-        [AcceptVerbs(HttpVerbs.Post)]
-        public ActionResult About(FormCollection input) {
-            var foos = new[] {
-                new Foo {Name = "one", Content = "uno"},
-                new Foo {Name = "two", Content = "dos"},
-                new Foo {Name = "three", Content = "tres"},
-            };
-            var vm = new HomeAboutViewModel { Foos = foos };
-            UpdateModel(vm, input.ToValueProvider());
-            return RedirectToAction("About");
-        }
-    }
-
-    public class Foo {
-        public string Name { get; set; }
-        public string Content { get; set; }
-    }
-
-    public class HomeAboutViewModel {
-        public IList<Foo> Foos { get; set; }
-    }
-}

src/Orchard.Web/Orchard.Web.csproj

@@ -82,8 +82,6 @@
     <Reference Include="System.Web.Mobile" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Controllers\AccountController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Default.aspx.cs">
       <DependentUpon>Default.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -134,6 +132,10 @@
       <Project>{79AED36E-ABD0-4747-93D3-8722B042454B}</Project>
       <Name>Orchard.Users</Name>
     </ProjectReference>
+    <ProjectReference Include="Packages\TinyMce\TinyMce.csproj">
+      <Project>{954CA994-D204-468B-9D69-51F6AD3E1C29}</Project>
+      <Name>TinyMce</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Admin\images\background_header.jpg" />
@@ -162,7 +164,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Models\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />

src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj

@@ -120,6 +120,7 @@
     <Content Include="Content\Admin\images\online.gif" />
     <Content Include="Content\Admin\images\published.gif" />
     <Content Include="Content\Admin\images\scheduled.gif" />
+    <Content Include="Package.txt" />
     <Content Include="Views\Admin\ChooseTemplate.aspx" />
     <Content Include="Views\Admin\BulkDeleteConfirm.aspx" />
     <Content Include="Views\Admin\BulkPublishLater.aspx" />

src/Orchard.Web/Packages/Orchard.Media/Orchard.Media.csproj

@@ -89,6 +89,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Admin\images\folder.gif" />
+    <Content Include="Package.txt" />
     <Content Include="Views\Admin\Add.aspx" />
     <Content Include="Views\Admin\Create.aspx" />
     <Content Include="Views\Admin\Edit.aspx" />

src/Orchard.Web/Packages/Orchard.Users/Orchard.Users.csproj

@@ -66,6 +66,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Package.txt" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>

src/Orchard.Web/Packages/Orchard.XmlRpc/Orchard.XmlRpc.csproj

@@ -64,6 +64,7 @@
     <Reference Include="System.Web.Mobile" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Package.txt" />
     <Content Include="Views\Home\Index.aspx" />
     <Content Include="Web.config" />
   </ItemGroup>

src/Orchard.Web/Packages/TinyMce/TinyMce.csproj

@@ -59,6 +59,7 @@
     <Reference Include="System.Web.Mobile" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Package.txt" />
     <Content Include="Scripts\langs\en.js" />
     <Content Include="Scripts\license.txt" />
     <Content Include="Scripts\plugins\autoresize\editor_plugin.js" />

src/Orchard.Web/Views/Home/About.aspx

@@ -1,6 +1,5 @@
-<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<HomeAboutViewModel>" %>
+<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
 
-<%@ Import Namespace="Orchard.Web.Controllers" %>
 <asp:Content ID="aboutTitle" ContentPlaceHolderID="TitleContent" runat="server">
     About Us
 </asp:Content>
@@ -10,13 +9,4 @@
     <p>
         Put content here.
     </p>
-    <%using (Html.BeginForm()) { %>
-    <%
-        foreach (var foo in Model.Foos) {%>
-    <%=Html.TextArea("Foos[" + foo.Name + "].Content", foo.Content)%>
-    <%
-        }%>
-        <input type="submit" />
-        <%
-      }%>
 </asp:Content>