Continuing to refactor ModelDriver concept into ContentHandler

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

src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs

@@ -28,7 +28,7 @@ namespace Orchard.Tests.Packages.Users.Controllers {
             builder.Register<AdminController>();
             builder.Register<DefaultContentManager>().As<IContentManager>();
             builder.Register<MembershipService>().As<IMembershipService>();
-            builder.Register<UserDriver>().As<IContentHandler>();
+            builder.Register<UserHandler>().As<IContentHandler>();
             builder.Register(new Mock<INotifier>().Object);
         }
 
@@ -43,15 +43,15 @@ namespace Orchard.Tests.Packages.Users.Controllers {
 
             var manager = _container.Resolve<IContentManager>();
 
-            var userOne = manager.New("user").As<UserModel>();
+            var userOne = manager.New("user").As<User>();
             userOne.Record = new UserRecord { UserName = "one" };
             manager.Create(userOne);
 
-            var userTwo = manager.New("user").As<UserModel>();
+            var userTwo = manager.New("user").As<User>();
             userTwo.Record = new UserRecord { UserName = "two" };
             manager.Create(userTwo);
 
-            var userThree = manager.New("user").As<UserModel>();
+            var userThree = manager.New("user").As<User>();
             userThree.Record = new UserRecord { UserName = "three" };
             manager.Create(userThree);
 

src/Orchard.Tests.Packages/Users/Services/MembershipServiceTests.cs

@@ -58,7 +58,7 @@ namespace Orchard.Tests.Packages.Users.Services {
             builder.RegisterModule(new ImplicitCollectionSupportModule());
             builder.Register<MembershipService>().As<IMembershipService>();
             builder.Register<DefaultContentManager>().As<IContentManager>();
-            builder.Register<UserDriver>().As<IContentHandler>();
+            builder.Register<UserHandler>().As<IContentHandler>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
             _session = _sessionFactory.OpenSession();
             builder.Register(new TestSessionLocator(_session)).As<ISessionLocator>();

src/Orchard.Tests/Models/Drivers/ModelDriverTests.cs

@@ -8,7 +8,7 @@ namespace Orchard.Tests.Models.Drivers {
     public class ModelDriverTests {
         [Test]
         public void ModelDriverShouldUsePersistenceFilterToDelegateCreateAndLoad() {
-            var modelDriver = new TestModelDriver();
+            var modelDriver = new TestModelHandler();
 
             var contentItem = new ContentItem();
             var part = new TestModelPart();
@@ -20,7 +20,7 @@ namespace Orchard.Tests.Models.Drivers {
 
         [Test]
         public void PartShouldBeAddedBasedOnSimplePredicate() {
-            var modelDriver = new TestModelDriver();
+            var modelDriver = new TestModelHandler();
 
             var builder = new ContentItemBuilder("testing");
             ((IContentHandler)modelDriver).Activating(new ActivatingContentContext { Builder = builder, ContentType = "testing" });
@@ -34,8 +34,8 @@ namespace Orchard.Tests.Models.Drivers {
         }
 
 
-        public class TestModelDriver : ContentHandler {
+        public class TestModelHandler : ContentHandler {
-            public TestModelDriver() {
+            public TestModelHandler() {
                 Filters.Add(new ActivatingFilter<TestModelPart>(x => x == "testing"));
                 Filters.Add(new TestModelStorageFilter());
             }

src/Orchard.Web/Core/Common/Models/CommonPart.cs

@@ -3,7 +3,7 @@ using Orchard.Models;
 using Orchard.Security;
 
 namespace Orchard.Core.Common.Models {
-    public class CommonModel : ContentItemPartWithRecord<CommonRecord> {
+    public class CommonPart : ContentItemPartWithRecord<CommonRecord> {
         public IUser Owner { get; set; }
     }
 }

src/Orchard.Web/Core/Common/Models/CommonPartHandler.cs

@@ -6,12 +6,12 @@ using Orchard.Security;
 using Orchard.Services;
 
 namespace Orchard.Core.Common.Models {
-    public class CommonDriver : Orchard.Models.Driver.ContentHandler {
+    public class CommonPartHandler : ContentHandler {
         private readonly IClock _clock;
         private readonly IAuthenticationService _authenticationService;
         private readonly IContentManager _contentManager;
 
-        public CommonDriver(
+        public CommonPartHandler(
             IRepository<CommonRecord> repository,
             IClock clock,
             IAuthenticationService authenticationService,
@@ -21,12 +21,12 @@ namespace Orchard.Core.Common.Models {
             _authenticationService = authenticationService;
             _contentManager = contentManager;
 
-            AddOnCreating<CommonModel>(SetCreateTimesAndAuthor);
+            AddOnCreating<CommonPart>(SetCreateTimesAndAuthor);
             Filters.Add(new StorageFilterForRecord<CommonRecord>(repository));
-            AddOnLoaded<CommonModel>(LoadOwnerModel);
+            AddOnLoaded<CommonPart>(LoadOwnerModel);
         }
 
-        void SetCreateTimesAndAuthor(CreateContentContext context, CommonModel instance) {
+        void SetCreateTimesAndAuthor(CreateContentContext context, CommonPart instance) {
             if (instance.Record.CreatedUtc == null) {
                 instance.Record.CreatedUtc = _clock.UtcNow;
             }
@@ -40,7 +40,7 @@ namespace Orchard.Core.Common.Models {
             }
         }
 
-        void LoadOwnerModel(LoadContentContext context, CommonModel instance) {
+        void LoadOwnerModel(LoadContentContext context, CommonPart instance) {
             if (instance.Record.OwnerId != 0) {
                 instance.Owner = _contentManager.Get(instance.Record.OwnerId).As<IUser>();
             }

src/Orchard.Web/Core/Common/Models/ContentDriver.cs

@@ -1,7 +0,0 @@
-using Orchard.Models.Driver;
-
-namespace Orchard.Core.Common.Models {
-    public class ContentDriver : Orchard.Models.Driver.ContentHandler {
-
-    }
-}

src/Orchard.Web/Core/Common/Models/ContentPart.cs

@@ -1,7 +1,7 @@
 using Orchard.Models;
 
 namespace Orchard.Core.Common.Models {
-    public class ContentModel : ContentItemPart {
+    public class ContentPart : ContentItemPart {
         public string Body { get; set; }
         public string Format { get; set; }
     }

src/Orchard.Web/Core/Common/Models/ContentPartHandler.cs

@@ -0,0 +1,7 @@
+using Orchard.Models.Driver;
+
+namespace Orchard.Core.Common.Models {
+    public class ContentPartHandler : ContentHandler {
+
+    }
+}

src/Orchard.Web/Core/Common/Models/RoutablePart.cs

@@ -2,6 +2,6 @@ using Orchard.Core.Common.Records;
 using Orchard.Models;
 
 namespace Orchard.Core.Common.Models {
-    public class RoutableModel : ContentItemPartWithRecord<RoutableRecord> {
+    public class RoutablePart : ContentItemPartWithRecord<RoutableRecord> {
     }
 }

src/Orchard.Web/Core/Common/Models/RoutablePartHandler.cs

@@ -3,8 +3,8 @@ using Orchard.Data;
 using Orchard.Models.Driver;
 
 namespace Orchard.Core.Common.Models {
-    public class RoutableDriver : Orchard.Models.Driver.ContentHandler {
+    public class RoutablePartHandler : Orchard.Models.Driver.ContentHandler {
-        public RoutableDriver(IRepository<RoutableRecord> repository) {
+        public RoutablePartHandler(IRepository<RoutableRecord> repository) {
             Filters.Add(new StorageFilterForRecord<RoutableRecord>(repository));
         }
     }

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -61,19 +61,19 @@
     <Reference Include="System.Web.Mobile" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Common\Models\CommonDriver.cs" />
+    <Compile Include="Common\Models\CommonPartHandler.cs" />
-    <Compile Include="Common\Models\CommonModel.cs" />
+    <Compile Include="Common\Models\CommonPart.cs" />
-    <Compile Include="Common\Models\ContentDriver.cs" />
+    <Compile Include="Common\Models\ContentPartHandler.cs" />
-    <Compile Include="Common\Models\ContentModel.cs" />
+    <Compile Include="Common\Models\ContentPart.cs" />
-    <Compile Include="Common\Models\RoutableModel.cs" />
+    <Compile Include="Common\Models\RoutablePart.cs" />
-    <Compile Include="Common\Models\RoutableDriver.cs" />
+    <Compile Include="Common\Models\RoutablePartHandler.cs" />
     <Compile Include="Common\Records\CommonRecord.cs" />
     <Compile Include="Common\Records\RoutableRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings\AdminMenu.cs" />
     <Compile Include="Settings\Controllers\AdminController.cs" />
-    <Compile Include="Settings\Models\SiteDriver.cs" />
+    <Compile Include="Settings\Models\SiteSettingsHandler.cs" />
-    <Compile Include="Settings\Models\SiteModel.cs" />
+    <Compile Include="Settings\Models\SiteSettings.cs" />
     <Compile Include="Settings\Records\SiteSettingsRecord.cs" />
     <Compile Include="Settings\Services\SiteService.cs" />
     <Compile Include="Settings\ViewModels\SettingsIndexViewModel.cs" />

src/Orchard.Web/Core/Settings/Controllers/AdminController.cs

@@ -25,14 +25,14 @@ namespace Orchard.Core.Settings.Controllers {
 
         public ActionResult Index() {
             var model = new Orchard.Core.Settings.ViewModels.SettingsIndexViewModel { 
-                Site = _siteService.GetSiteSettings().As<SiteModel>() };
+                Site = _siteService.GetSiteSettings().As<SiteSettings>() };
             model.Editors = _modelManager.GetEditors(model.Site.ContentItem);
             return View(model);
         }
 
         [AcceptVerbs(HttpVerbs.Post)]
         public ActionResult Index(FormCollection input) {
-            var viewModel = new SettingsIndexViewModel { Site = _siteService.GetSiteSettings().As<SiteModel>() };
+            var viewModel = new SettingsIndexViewModel { Site = _siteService.GetSiteSettings().As<SiteSettings>() };
             viewModel.Editors = _modelManager.UpdateEditors(viewModel.Site.ContentItem, this);
 
             if (!TryUpdateModel(viewModel, input.ToValueProvider())) {

src/Orchard.Web/Core/Settings/Models/SiteSettings.cs

@@ -3,7 +3,7 @@ using Orchard.Models;
 using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {
-    public sealed class SiteModel : ContentItemPartWithRecord<SiteSettingsRecord>, ISite {
+    public sealed class SiteSettings : ContentItemPartWithRecord<SiteSettingsRecord>, ISite {
         public string SiteName {
             get { return Record.SiteName; }
             set { Record.SiteName = value; }

src/Orchard.Web/Core/Settings/Models/SiteSettingsHandler.cs

@@ -3,9 +3,9 @@ using Orchard.Data;
 using Orchard.Models.Driver;
 
 namespace Orchard.Core.Settings.Models {
-    public class SiteDriver : ContentHandler {
+    public class SiteSettingsHandler : ContentHandler {
-        public SiteDriver(IRepository<SiteSettingsRecord> repository){
+        public SiteSettingsHandler(IRepository<SiteSettingsRecord> repository){
-            Filters.Add(new ActivatingFilter<SiteModel>("site"));
+            Filters.Add(new ActivatingFilter<SiteSettings>("site"));
             Filters.Add(new StorageFilterForRecord<SiteSettingsRecord>(repository));
         }
     }

src/Orchard.Web/Core/Settings/Services/SiteService.cs

@@ -25,7 +25,7 @@ namespace Orchard.Core.Settings.Services {
             string applicationName = HttpContext.Current.Request.ApplicationPath;
             SiteSettingsRecord record = _siteSettingsRepository.Get(x => x.SiteUrl == applicationName);
             if (record == null) {
-                SiteModel site = _contentManager.New("site").As<SiteModel>();
+                SiteSettings site = _contentManager.New("site").As<SiteSettings>();
                 site.Record.SiteUrl = applicationName;
                 _contentManager.Create(site);
                 return site;

src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs

@@ -7,7 +7,7 @@ using Orchard.UI.Models;
 
 namespace Orchard.Core.Settings.ViewModels {
     public class SettingsIndexViewModel : AdminViewModel {
-        public SiteModel Site { get; set; }
+        public SiteSettings Site { get; set; }
         public IEnumerable<ModelTemplate> Editors { get; set; }
 
         [HiddenInput(DisplayValue = false)]
@@ -16,13 +16,13 @@ namespace Orchard.Core.Settings.ViewModels {
         }
 
         public string SiteName {
-            get { return Site.As<SiteModel>().Record.SiteName; }
+            get { return Site.As<SiteSettings>().Record.SiteName; }
-            set { Site.As<SiteModel>().Record.SiteName = value; }
+            set { Site.As<SiteSettings>().Record.SiteName = value; }
         }
 
         public string SuperUser {
-            get { return Site.As<SiteModel>().Record.SuperUser; }
+            get { return Site.As<SiteSettings>().Record.SuperUser; }
-            set { Site.As<SiteModel>().Record.SuperUser = value; }
+            set { Site.As<SiteSettings>().Record.SuperUser = value; }
         }
     }
 }

src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs

@@ -12,8 +12,8 @@ namespace Orchard.Media.Models {
         public virtual string RootMediaFolder { get; set; }
     }
 
-    public class MediaSettingsDriver : ContentHandler {
+    public class MediaSettingsHandler : ContentHandler {
-        public MediaSettingsDriver(IRepository<MediaSettingsRecord> repository) {
+        public MediaSettingsHandler(IRepository<MediaSettingsRecord> repository) {
             Filters.Add(new ActivatingFilter<MediaSettings>("site"));
             Filters.Add(new StorageFilterForRecord<MediaSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
         }

src/Orchard.Web/Packages/Orchard.Roles/Models/UserRoles.cs

@@ -6,8 +6,8 @@ namespace Orchard.Roles.Models.NoRecord {
         IList<string> Roles { get; }
     }
 
-    public class UserRolesModel : ContentItemPart, IUserRoles {
+    public class UserRoles : ContentItemPart, IUserRoles {
-        public UserRolesModel() {
+        public UserRoles() {
             Roles = new List<string>();
         }
 

src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesHandler.cs

@@ -11,12 +11,12 @@ using Orchard.UI.Models;
 using Orchard.UI.Notify;
 
 namespace Orchard.Roles.Models {
-    public class UserRolesDriver : ContentHandler {
+    public class UserRolesHandler : ContentHandler {
         private readonly IRepository<UserRolesRecord> _userRolesRepository;
         private readonly IRoleService _roleService;
         private readonly INotifier _notifier;
 
-        public UserRolesDriver(IRepository<UserRolesRecord> userRolesRepository, IRoleService roleService, INotifier notifier) {
+        public UserRolesHandler(IRepository<UserRolesRecord> userRolesRepository, IRoleService roleService, INotifier notifier) {
             _userRolesRepository = userRolesRepository;
             _roleService = roleService;
             _notifier = notifier;
@@ -24,18 +24,18 @@ namespace Orchard.Roles.Models {
 
         protected override void Activating(ActivatingContentContext context) {
             if (context.ContentType == "user") {
-                context.Builder.Weld<UserRolesModel>();
+                context.Builder.Weld<UserRoles>();
             }
         }
 
         protected override void Creating(CreateContentContext context) {
-            var userRoles = context.ContentItem.As<UserRolesModel>();
+            var userRoles = context.ContentItem.As<UserRoles>();
             if (userRoles != null) {
             }
         }
 
         protected override void Loading(LoadContentContext context) {
-            var userRoles = context.ContentItem.As<UserRolesModel>();
+            var userRoles = context.ContentItem.As<UserRoles>();
             if (userRoles != null) {
                 userRoles.Roles = _userRolesRepository.Fetch(x => x.UserId == context.ContentItem.Id)
                     .Select(x => x.Role.Name).ToList();
@@ -43,7 +43,7 @@ namespace Orchard.Roles.Models {
         }
 
         protected override void GetEditors(GetContentEditorsContext context) {
-            var userRoles = context.ContentItem.As<UserRolesModel>();
+            var userRoles = context.ContentItem.As<UserRoles>();
             if (userRoles != null) {
                 var roles =
                     _roleService.GetRoles().Select(
@@ -64,7 +64,7 @@ namespace Orchard.Roles.Models {
         }
 
         protected override void UpdateEditors(UpdateContentContext context) {
-            var userRoles = context.ContentItem.As<UserRolesModel>();
+            var userRoles = context.ContentItem.As<UserRoles>();
             if (userRoles != null) {
                 var viewModel = new UserRolesViewModel();
                 if (context.Updater.TryUpdateModel(viewModel, "UserRoles", null, null)) {

src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj

@@ -65,8 +65,8 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Records\PermissionRecord.cs" />
     <Compile Include="Records\RoleRecord.cs" />
-    <Compile Include="Models\UserRolesModel.cs" />
+    <Compile Include="Models\UserRoles.cs" />
-    <Compile Include="Models\UserRolesDriver.cs" />
+    <Compile Include="Models\UserRolesHandler.cs" />
     <Compile Include="Records\RolesPermissions.cs" />
     <Compile Include="Records\UserRolesRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs

@@ -38,7 +38,7 @@ namespace Orchard.Users.Controllers {
             var model = new UsersIndexViewModel();
             model.Rows = _userRepository.Fetch(x => x.UserName != null)
                 .Select(x => new UsersIndexViewModel.Row {
-                    User = _contentManager.Get(x.Id).As<UserModel>()
+                    User = _contentManager.Get(x.Id).As<User>()
                 })
                 .ToList();
 
@@ -67,14 +67,14 @@ namespace Orchard.Users.Controllers {
         }
 
         public ActionResult Edit(int id) {
-            var model = new UserEditViewModel { User = _contentManager.Get<UserModel>(id) };
+            var model = new UserEditViewModel { User = _contentManager.Get<User>(id) };
             model.Editors = _contentManager.GetEditors(model.User.ContentItem);
             return View(model);
         }
 
         [HttpPost]
         public ActionResult Edit(int id, FormCollection input) {
-            var model = new UserEditViewModel { User = _contentManager.Get<UserModel>(id) };
+            var model = new UserEditViewModel { User = _contentManager.Get<User>(id) };
             model.Editors = _contentManager.UpdateEditors(model.User.ContentItem, this);
 
             if (!TryUpdateModel(model, input.ToValueProvider())) {

src/Orchard.Web/Packages/Orchard.Users/Models/User.cs

@@ -2,7 +2,7 @@
 using Orchard.Security;
 
 namespace Orchard.Users.Models {
-    public sealed class UserModel : ContentItemPartWithRecord<UserRecord>, IUser {
+    public sealed class User : ContentItemPartWithRecord<UserRecord>, IUser {
         public int Id {
             get { return ContentItem.Id; }
         }

src/Orchard.Web/Packages/Orchard.Users/Models/UserDriver.cs

@@ -1,11 +0,0 @@
-using Orchard.Data;
-using Orchard.Models.Driver;
-
-namespace Orchard.Users.Models {
-    public class UserDriver : ContentHandler {
-        public UserDriver(IRepository<UserRecord> repository) {
-            Filters.Add(new ActivatingFilter<UserModel>("user"));
-            Filters.Add(new StorageFilterForRecord<UserRecord>(repository));
-        }
-    }
-}

src/Orchard.Web/Packages/Orchard.Users/Models/UserHandler.cs

@@ -0,0 +1,11 @@
+using Orchard.Data;
+using Orchard.Models.Driver;
+
+namespace Orchard.Users.Models {
+    public class UserHandler : ContentHandler {
+        public UserHandler(IRepository<UserRecord> repository) {
+            Filters.Add(new ActivatingFilter<User>("user"));
+            Filters.Add(new StorageFilterForRecord<UserRecord>(repository));
+        }
+    }
+}

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

@@ -63,8 +63,8 @@
   <ItemGroup>
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Models\UserModel.cs" />
+    <Compile Include="Models\User.cs" />
-    <Compile Include="Models\UserDriver.cs" />
+    <Compile Include="Models\UserHandler.cs" />
     <Compile Include="Models\UserRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\MembershipService.cs" />

src/Orchard.Web/Packages/Orchard.Users/Services/MembershipService.cs

@@ -37,7 +37,7 @@ namespace Orchard.Users.Services {
             SetPassword(record, createUserParams.Password);
 
             var user = _contentManager.New("user");
-            user.As<UserModel>().Record = record;
+            user.As<User>().Record = record;
             _contentManager.Create(user);
             return user.As<IUser>();
         }
@@ -61,10 +61,10 @@ namespace Orchard.Users.Services {
 
 
         public void SetPassword(IUser user, string password) {
-            if (!user.Is<UserModel>())
+            if (!user.Is<User>())
                 throw new InvalidCastException();
 
-            var userRecord = user.As<UserModel>().Record;
+            var userRecord = user.As<User>().Record;
             SetPassword(userRecord, password);
         }
 

src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs

@@ -8,7 +8,7 @@ using Orchard.Users.Models;
 
 namespace Orchard.Users.ViewModels {
     public class UserEditViewModel : AdminViewModel {
-        public UserModel User { get; set; }
+        public User User { get; set; }
         public IEnumerable<ModelTemplate> Editors { get; set; }
 
         [HiddenInput(DisplayValue = false)]
@@ -18,14 +18,14 @@ namespace Orchard.Users.ViewModels {
 
         [Required]
         public string UserName {
-            get { return User.As<UserModel>().Record.UserName; }
+            get { return User.As<User>().Record.UserName; }
-            set { User.As<UserModel>().Record.UserName = value; }
+            set { User.As<User>().Record.UserName = value; }
         }
 
         [Required]
         public string Email {
-            get { return User.As<UserModel>().Record.Email; }
+            get { return User.As<User>().Record.Email; }
-            set { User.As<UserModel>().Record.Email = value; }
+            set { User.As<User>().Record.Email = value; }
         }
     }
 }

src/Orchard.Web/Packages/Orchard.Users/ViewModels/UsersIndexViewModel.cs

@@ -6,7 +6,7 @@ namespace Orchard.Users.ViewModels {
 
     public class UsersIndexViewModel : AdminViewModel {
         public class Row {
-            public UserModel User { get; set; }
+            public User User { get; set; }
         }
 
         public IList<Row> Rows { get; set; }

src/Orchard.Web/Packages/Orchard.Wikis/Controllers/AdminController.cs

@@ -26,7 +26,7 @@ namespace Orchard.Wikis.Controllers {
         }
 
         public ActionResult View(int id) {
-            var page = _contentManager.Get(id).As<CommonModel>();
+            var page = _contentManager.Get(id).As<CommonPart>();
             return View(page);
         }
     }

src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiPageDriver.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Orchard.Core.Common.Models;
-using Orchard.Models.Driver;
-
-namespace Orchard.Wikis.Models {
-    public class WikiPageDriver : ContentHandler {
-        protected override void Activating(ActivatingContentContext context) {
-            if (context.ContentType == "wikipage") {
-                context.Builder
-                    .Weld<CommonModel>()
-                    .Weld<RoutableModel>()
-                    .Weld<ContentModel>();
-            }
-        }
-    }
-}

src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiPageHandler.cs

@@ -0,0 +1,15 @@
+using Orchard.Core.Common.Models;
+using Orchard.Models.Driver;
+
+namespace Orchard.Wikis.Models {
+    public class WikiPageHandler : ContentHandler {
+        protected override void Activating(ActivatingContentContext context) {
+            if (context.ContentType == "wikipage") {
+                context.Builder
+                    .Weld<CommonPart>()
+                    .Weld<RoutablePart>()
+                    .Weld<ContentPart>();
+            }
+        }
+    }
+}

src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiSettings.cs

@@ -16,8 +16,8 @@ namespace Orchard.Wikis.Models {
         public virtual string WikiEditTheme { get; set; }
     }
 
-    public class WikiSettingsDriver : ContentHandler {
+    public class WikiSettingsHandler : ContentHandler {
-        public WikiSettingsDriver(IRepository<WikiSettingsRecord> repository) {
+        public WikiSettingsHandler(IRepository<WikiSettingsRecord> repository) {
             Filters.Add(new ActivatingFilter<WikiSettings>("site"));
             Filters.Add(new StorageFilterForRecord<WikiSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
 

src/Orchard.Web/Packages/Orchard.Wikis/Orchard.Wikis.csproj

@@ -63,7 +63,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Models\WikiPageDriver.cs" />
+    <Compile Include="Models\WikiPageHandler.cs" />
     <Compile Include="Models\WikiSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>