Renaming IContentProvider to IContentHandler

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

src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs

@@ -23,8 +23,8 @@ namespace Orchard.Core.Tests.Common.Providers {
 
         public override void Register(ContainerBuilder builder) {
             builder.Register<DefaultContentManager>().As<IContentManager>();
-            builder.Register<TestProvider>().As<IContentProvider>();
+            builder.Register<TestHandler>().As<IContentHandler>();
-            builder.Register<CommonAspectProvider>().As<IContentProvider>();
+            builder.Register<CommonAspectHandler>().As<IContentHandler>();
 
             _authn = new Mock<IAuthenticationService>();
             _authz = new Mock<IAuthorizationService>();
@@ -41,8 +41,8 @@ namespace Orchard.Core.Tests.Common.Providers {
             }
         }
 
-        class TestProvider : ContentProvider {
+        class TestHandler : ContentHandler {
-            public TestProvider() {
+            public TestHandler() {
                 Filters.Add(new ActivatingFilter<CommonAspect>("test-item"));
                 Filters.Add(new ActivatingFilter<TestUser>("user"));
             }

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

@@ -29,7 +29,7 @@ namespace Orchard.Tests.Packages.Users.Controllers {
             builder.Register<DefaultContentManager>().As<IContentManager>();
             builder.Register<DefaultContentQuery>().As<IContentQuery>().FactoryScoped();
             builder.Register<MembershipService>().As<IMembershipService>();
-            builder.Register<UserProvider>().As<IContentProvider>();
+            builder.Register<UserHandler>().As<IContentHandler>();
             builder.Register(new Mock<INotifier>().Object);
         }
 

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<UserProvider>().As<IContentProvider>();
+            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/ContentQueryTests.cs

@@ -46,12 +46,12 @@ namespace Orchard.Tests.Models {
             builder.RegisterModule(new ImplicitCollectionSupportModule());
             builder.RegisterModule(new ContentModule());
             builder.Register<DefaultContentManager>().As<IContentManager>();
-            builder.Register<AlphaProvider>().As<IContentProvider>();
+            builder.Register<AlphaHandler>().As<IContentHandler>();
-            builder.Register<BetaProvider>().As<IContentProvider>();
+            builder.Register<BetaHandler>().As<IContentHandler>();
-            builder.Register<GammaProvider>().As<IContentProvider>();
+            builder.Register<GammaHandler>().As<IContentHandler>();
-            builder.Register<DeltaProvider>().As<IContentProvider>();
+            builder.Register<DeltaHandler>().As<IContentHandler>();
-            builder.Register<FlavoredProvider>().As<IContentProvider>();
+            builder.Register<FlavoredHandler>().As<IContentHandler>();
-            builder.Register<StyledProvider>().As<IContentProvider>();
+            builder.Register<StyledHandler>().As<IContentHandler>();
 
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
 

src/Orchard.Tests/Models/DefaultModelManagerTests.cs

@@ -40,11 +40,11 @@ namespace Orchard.Tests.Models {
             var builder = new ContainerBuilder();
             builder.RegisterModule(new ImplicitCollectionSupportModule());
             builder.Register<DefaultContentManager>().As<IContentManager>();
-            builder.Register<AlphaProvider>().As<IContentProvider>();
+            builder.Register<AlphaHandler>().As<IContentHandler>();
-            builder.Register<BetaProvider>().As<IContentProvider>();
+            builder.Register<BetaHandler>().As<IContentHandler>();
-            builder.Register<GammaProvider>().As<IContentProvider>();
+            builder.Register<GammaHandler>().As<IContentHandler>();
-            builder.Register<FlavoredProvider>().As<IContentProvider>();
+            builder.Register<FlavoredHandler>().As<IContentHandler>();
-            builder.Register<StyledProvider>().As<IContentProvider>();
+            builder.Register<StyledHandler>().As<IContentHandler>();
 
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
 

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

@@ -8,22 +8,22 @@ namespace Orchard.Tests.Models.Drivers {
     public class ModelDriverTests {
         [Test]
         public void ModelDriverShouldUsePersistenceFilterToDelegateCreateAndLoad() {
-            var modelDriver = new TestModelProvider();
+            var modelDriver = new TestModelHandler();
 
             var contentItem = new ContentItem();
             var part = new TestModelPart();
             contentItem.Weld(part);
 
-            ((IContentProvider)modelDriver).Creating(new CreateContentContext { ContentItem = contentItem });
+            ((IContentHandler)modelDriver).Creating(new CreateContentContext { ContentItem = contentItem });
             Assert.That(part.CreatingCalled, Is.True);
         }
 
         [Test]
         public void PartShouldBeAddedBasedOnSimplePredicate() {
-            var modelDriver = new TestModelProvider();
+            var modelDriver = new TestModelHandler();
 
             var builder = new ContentItemBuilder("testing");
-            ((IContentProvider)modelDriver).Activating(new ActivatingContentContext { Builder = builder, ContentType = "testing" });
+            ((IContentHandler)modelDriver).Activating(new ActivatingContentContext { Builder = builder, ContentType = "testing" });
             var model = builder.Build();
             Assert.That(model.Is<TestModelPart>(), Is.True);
             Assert.That(model.As<TestModelPart>(), Is.Not.Null);
@@ -34,8 +34,8 @@ namespace Orchard.Tests.Models.Drivers {
         }
 
 
-        public class TestModelProvider : ContentProvider {
+        public class TestModelHandler : ContentHandler {
-            public TestModelProvider() {
+            public TestModelHandler() {
                 Filters.Add(new ActivatingFilter<TestModelPart>(x => x == "testing"));
                 Filters.Add(new TestModelStorageFilter());
             }

src/Orchard.Tests/Models/Stubs/AlphaHandler.cs

@@ -4,8 +4,8 @@ using Orchard.Models.Driver;
 using Orchard.Models.ViewModels;
 
 namespace Orchard.Tests.Models.Stubs {
-    public class AlphaProvider : ContentProvider {
+    public class AlphaHandler : ContentHandler {
-        public AlphaProvider() {
+        public AlphaHandler() {
             OnGetDisplayViewModel<Alpha>((ctx, part) => ctx.AddDisplay(new TemplateViewModel(part) { Position = "3" }));
         }
         public override IEnumerable<ContentType> GetContentTypes() {

src/Orchard.Tests/Models/Stubs/BetaHandler.cs

@@ -6,7 +6,7 @@ using Orchard.Models;
 using Orchard.Models.Driver;
 
 namespace Orchard.Tests.Models.Stubs {
-    public class BetaProvider : ContentProvider {
+    public class BetaHandler : ContentHandler {
         public override System.Collections.Generic.IEnumerable<Orchard.Models.ContentType> GetContentTypes() {
             return new[] { new ContentType { Name = "beta" } };
         }

src/Orchard.Tests/Models/Stubs/Delta.cs

@@ -12,12 +12,12 @@ namespace Orchard.Tests.Models.Stubs {
     }
 
 
-    public class DeltaProvider : ContentProvider {
+    public class DeltaHandler : ContentHandler {
         public override System.Collections.Generic.IEnumerable<Orchard.Models.ContentType> GetContentTypes() {
             return new[] { new ContentType { Name = "delta" } };
         }
 
-        public DeltaProvider(IRepository<DeltaRecord> repository) {
+        public DeltaHandler(IRepository<DeltaRecord> repository) {
             Filters.Add(new ActivatingFilter<Delta>(x => x == "delta"));
             Filters.Add(new StorageFilter<DeltaRecord>(repository));
         }

src/Orchard.Tests/Models/Stubs/FlavoredHandler.cs

@@ -2,8 +2,8 @@
 using Orchard.Models.ViewModels;
 
 namespace Orchard.Tests.Models.Stubs {
-    public class FlavoredProvider : ContentProvider {
+    public class FlavoredHandler : ContentHandler {
-        public FlavoredProvider() {
+        public FlavoredHandler() {
             OnGetDisplayViewModel<Flavored>((ctx, part) => ctx.AddDisplay(new TemplateViewModel(part)));
         }
         protected override void Activating(ActivatingContentContext context) {

src/Orchard.Tests/Models/Stubs/Gamma.cs

@@ -11,12 +11,12 @@ namespace Orchard.Tests.Models.Stubs {
     }
 
 
-    public class GammaProvider : ContentProvider {
+    public class GammaHandler : ContentHandler {
         public override System.Collections.Generic.IEnumerable<Orchard.Models.ContentType> GetContentTypes() {
             return new[] { new ContentType { Name = "gamma" } };
         }
 
-        public GammaProvider(IRepository<GammaRecord> repository) {
+        public GammaHandler(IRepository<GammaRecord> repository) {
             Filters.Add(new ActivatingFilter<Gamma>(x => x == "gamma"));
             Filters.Add(new StorageFilter<GammaRecord>(repository));
         }

src/Orchard.Tests/Models/Stubs/StyledHandler.cs

@@ -2,8 +2,8 @@
 using Orchard.Models.ViewModels;
 
 namespace Orchard.Tests.Models.Stubs {
-    public class StyledProvider : ContentProvider {
+    public class StyledHandler : ContentHandler {
-        public StyledProvider() {
+        public StyledHandler() {
             OnGetDisplayViewModel<Styled>((ctx, part) => ctx.AddDisplay(new TemplateViewModel(part) { Position = "10" }));
         }
 

src/Orchard.Tests/Orchard.Tests.csproj

@@ -113,17 +113,17 @@
     <Compile Include="Models\Drivers\ModelBuilderTests.cs" />
     <Compile Include="Models\Drivers\ModelDriverTests.cs" />
     <Compile Include="Models\Stubs\Alpha.cs" />
-    <Compile Include="Models\Stubs\AlphaProvider.cs" />
+    <Compile Include="Models\Stubs\AlphaHandler.cs" />
     <Compile Include="Models\Stubs\Beta.cs" />
-    <Compile Include="Models\Stubs\BetaProvider.cs" />
+    <Compile Include="Models\Stubs\BetaHandler.cs" />
     <Compile Include="Models\Stubs\Delta.cs" />
     <Compile Include="Models\Records\DeltaRecord.cs" />
     <Compile Include="Models\Stubs\Flavored.cs" />
-    <Compile Include="Models\Stubs\FlavoredProvider.cs" />
+    <Compile Include="Models\Stubs\FlavoredHandler.cs" />
     <Compile Include="Models\Stubs\Gamma.cs" />
     <Compile Include="Models\Records\GammaRecord.cs" />
     <Compile Include="Models\Stubs\Styled.cs" />
-    <Compile Include="Models\Stubs\StyledProvider.cs" />
+    <Compile Include="Models\Stubs\StyledHandler.cs" />
     <Compile Include="Mvc\ModelBinders\KeyedListModelBinderTests.cs" />
     <Compile Include="Mvc\OrchardControllerFactoryTests.cs" />
     <Compile Include="Mvc\OrchardControllerIdentificationStrategyTests.cs" />

src/Orchard.Web/Core/Common/Providers/BodyAspectHandler.cs

@@ -6,12 +6,12 @@ using Orchard.Models.Driver;
 using Orchard.Models.ViewModels;
 
 namespace Orchard.Core.Common.Providers {
-    public class BodyAspectProvider : ContentProvider {
+    public class BodyAspectHandler : ContentHandler {
         private const string TemplatePrefix = "Body";
         private const string TemplateName = "BodyAspect";
         private const string DefaultTextEditorTemplate = "TinyMceTextEditor";
 
-        public BodyAspectProvider(IRepository<BodyRecord> bodyRepository) {
+        public BodyAspectHandler(IRepository<BodyRecord> bodyRepository) {
             Filters.Add(new StorageFilter<BodyRecord>(bodyRepository) { AutomaticallyCreateMissingRecord = true });
 
             OnGetDisplayViewModel<BodyAspect>((context, body) => {

src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs

@@ -12,14 +12,14 @@ using Orchard.Security;
 using Orchard.Services;
 
 namespace Orchard.Core.Common.Providers {
-    public class CommonAspectProvider : ContentProvider {
+    public class CommonAspectHandler : ContentHandler {
         private readonly IClock _clock;
         private readonly IAuthenticationService _authenticationService;
         private readonly IAuthorizationService _authorizationService;
         private readonly IMembershipService _membershipService;
         private readonly IContentManager _contentManager;
 
-        public CommonAspectProvider(
+        public CommonAspectHandler(
             IRepository<CommonRecord> repository,
             IClock clock,
             IAuthenticationService authenticationService,

src/Orchard.Web/Core/Common/Providers/RoutableAspectHandler.cs

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

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

@@ -63,12 +63,12 @@
   <ItemGroup>
     <Compile Include="Common\Permissions.cs" />
     <Compile Include="Common\Utilities\LazyField.cs" />
-    <Compile Include="Common\Providers\CommonAspectProvider.cs" />
+    <Compile Include="Common\Providers\CommonAspectHandler.cs" />
     <Compile Include="Common\Models\CommonAspect.cs" />
-    <Compile Include="Common\Providers\BodyAspectProvider.cs" />
+    <Compile Include="Common\Providers\BodyAspectHandler.cs" />
     <Compile Include="Common\Models\BodyAspect.cs" />
     <Compile Include="Common\Models\RoutableAspect.cs" />
-    <Compile Include="Common\Providers\RoutableAspectProvider.cs" />
+    <Compile Include="Common\Providers\RoutableAspectHandler.cs" />
     <Compile Include="Common\Records\BodyRecord.cs" />
     <Compile Include="Common\Records\CommonRecord.cs" />
     <Compile Include="Common\Records\RoutableRecord.cs" />
@@ -78,7 +78,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings\AdminMenu.cs" />
     <Compile Include="Settings\Controllers\AdminController.cs" />
-    <Compile Include="Settings\Models\SiteSettingsProvider.cs" />
+    <Compile Include="Settings\Models\SiteSettingsHandler.cs" />
     <Compile Include="Settings\Models\SiteSettings.cs" />
     <Compile Include="Settings\Records\SiteSettingsRecord.cs" />
     <Compile Include="Settings\Services\SiteService.cs" />

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

@@ -5,13 +5,13 @@ using Orchard.Models;
 using Orchard.Models.Driver;
 
 namespace Orchard.Core.Settings.Models {
-    public class SiteSettingsProvider : ContentProvider {
+    public class SiteSettingsHandler : ContentHandler {
 
         public override IEnumerable<ContentType> GetContentTypes() {
             return new[] {SiteSettings.ContentType};
         }
 
-        public SiteSettingsProvider(IRepository<SiteSettingsRecord> repository){
+        public SiteSettingsHandler(IRepository<SiteSettingsRecord> repository){
             Filters.Add(new ActivatingFilter<SiteSettings>("site"));
             Filters.Add(new StorageFilter<SiteSettingsRecord>(repository));
         }

src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs

@@ -9,12 +9,12 @@ using Orchard.Models.Driver;
 using Orchard.Models.ViewModels;
 
 namespace Orchard.Blogs.Models {
-    public class BlogPostProvider : ContentProvider {
+    public class BlogPostHandler : ContentHandler {
         public override IEnumerable<ContentType> GetContentTypes() {
             return new[] { BlogPost.ContentType };
         }
 
-        public BlogPostProvider(
+        public BlogPostHandler(
             IRepository<BlogPostRecord> repository,
             IContentManager contentManager,
             IBlogPostService blogPostService) {

src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogProvider.cs

@@ -5,7 +5,7 @@ using Orchard.Models;
 using Orchard.Models.Driver;
 
 namespace Orchard.Blogs.Models {
-    public class BlogProvider : ContentProvider {
+    public class BlogProvider : ContentHandler {
         public override IEnumerable<ContentType> GetContentTypes() {
             return new[] { Blog.ContentType };
         }

src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj

@@ -79,7 +79,7 @@
     <Compile Include="Models\Blog.cs" />
     <Compile Include="Models\BlogProvider.cs" />
     <Compile Include="Models\BlogPost.cs" />
-    <Compile Include="Models\BlogPostProvider.cs" />
+    <Compile Include="Models\BlogPostHandler.cs" />
     <Compile Include="Models\BlogPostRecord.cs" />
     <Compile Include="Models\BlogRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettingsHandler.cs

@@ -2,10 +2,10 @@ using Orchard.Data;
 using Orchard.Models.Driver;
 
 namespace Orchard.Comments.Models {
-    public class CommentSettingsProvider : ContentProvider {
+    public class CommentSettingsHandler : ContentHandler {
         private readonly IRepository<CommentSettingsRecord> _commentSettingsRepository;
 
-        public CommentSettingsProvider(IRepository<CommentSettingsRecord> repository) {
+        public CommentSettingsHandler(IRepository<CommentSettingsRecord> repository) {
             _commentSettingsRepository = repository;
             Filters.Add(new ActivatingFilter<CommentSettings>("site"));
             Filters.Add(new StorageFilter<CommentSettingsRecord>(_commentSettingsRepository) { AutomaticallyCreateMissingRecord = true });

src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs

@@ -6,12 +6,12 @@ using Orchard.Models.ViewModels;
 using Orchard.Comments.Services;
 
 namespace Orchard.Comments.Models {
-    public class HasCommentsProvider : ContentProvider {
+    public class HasCommentsHandler : ContentHandler {
         private readonly IRepository<Comment> _commentsRepository;
         private readonly IRepository<ClosedComments> _closedCommentsRepository;
         private readonly ICommentService _commentService;
 
-        public HasCommentsProvider(IRepository<Comment> commentsRepository, IRepository<ClosedComments> closedCommentsRepository, ICommentService commentService) {
+        public HasCommentsHandler(IRepository<Comment> commentsRepository, IRepository<ClosedComments> closedCommentsRepository, ICommentService commentService) {
             _commentsRepository = commentsRepository;
             _closedCommentsRepository = closedCommentsRepository;
             _commentService = commentService;

src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj

@@ -69,7 +69,7 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Models\Comment.cs" />
     <Compile Include="Models\CommentSettings.cs" />
-    <Compile Include="Models\CommentSettingsProvider.cs" />
+    <Compile Include="Models\CommentSettingsHandler.cs" />
     <Compile Include="Models\CommentSettingsRecord.cs" />
     <Compile Include="Models\CommentsHandler.cs" />
     <Compile Include="Models\HasComments.cs" />

src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkHandler.cs

@@ -2,7 +2,7 @@
 using Orchard.Models.ViewModels;
 
 namespace Orchard.DevTools.Models {
-    public class DebugLinkProvider : ContentProvider {
+    public class DebugLinkHandler : ContentHandler {
         protected override void GetDisplayViewModel(GetDisplayViewModelContext context) {
             context.AddDisplay(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "9999" });
         }

src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj

@@ -64,7 +64,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\ContentController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Models\DebugLinkProvider.cs" />
+    <Compile Include="Models\DebugLinkHandler.cs" />
     <Compile Include="Models\ShowDebugLink.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewModels\ContentIndexViewModel.cs" />

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 MediaSettingsProvider : ContentProvider {
+    public class MediaSettingsHandler : ContentHandler {
-        public MediaSettingsProvider(IRepository<MediaSettingsRecord> repository) {
+        public MediaSettingsHandler(IRepository<MediaSettingsRecord> repository) {
             Filters.Add(new ActivatingFilter<MediaSettings>("site"));
             Filters.Add(new StorageFilter<MediaSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
             OnActivated<MediaSettings>(DefaultSettings);

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

@@ -11,12 +11,12 @@ using Orchard.Security;
 using Orchard.UI.Notify;
 
 namespace Orchard.Roles.Models {
-    public class UserRolesProvider : ContentProvider {
+    public class UserRolesHandler : ContentHandler {
         private readonly IRepository<UserRolesRecord> _userRolesRepository;
         private readonly IRoleService _roleService;
         private readonly INotifier _notifier;
 
-        public UserRolesProvider(IRepository<UserRolesRecord> userRolesRepository, IRoleService roleService, INotifier notifier) {
+        public UserRolesHandler(IRepository<UserRolesRecord> userRolesRepository, IRoleService roleService, INotifier notifier) {
             _userRolesRepository = userRolesRepository;
             _roleService = roleService;
             _notifier = notifier;

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

@@ -66,7 +66,7 @@
     <Compile Include="Records\PermissionRecord.cs" />
     <Compile Include="Records\RoleRecord.cs" />
     <Compile Include="Models\UserRoles.cs" />
-    <Compile Include="Models\UserRolesProvider.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.Sandbox/Models/SandboxContentHandler.cs

@@ -7,13 +7,13 @@ using Orchard.Models.Driver;
 using Orchard.Models.ViewModels;
 
 namespace Orchard.Sandbox.Models {
-    public class SandboxContentProvider : ContentProvider {
+    public class SandboxContentHandler : ContentHandler {
 
         public override IEnumerable<ContentType> GetContentTypes() {
             return new[] { SandboxPage.ContentType };
         }
 
-        public SandboxContentProvider(
+        public SandboxContentHandler(
             IRepository<SandboxPageRecord> pageRepository,
             IRepository<SandboxSettingsRecord> settingsRepository) {
 

src/Orchard.Web/Packages/Orchard.Sandbox/Orchard.Sandbox.csproj

@@ -64,7 +64,7 @@
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\PageController.cs" />
     <Compile Include="Models\SandboxPage.cs" />
-    <Compile Include="Models\SandboxContentProvider.cs" />
+    <Compile Include="Models\SandboxContentHandler.cs" />
     <Compile Include="Models\SandboxPageRecord.cs" />
     <Compile Include="Models\SandboxSettingsRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/Orchard.Web/Packages/Orchard.Tags/Models/TagSettings.cs

@@ -11,8 +11,8 @@ namespace Orchard.Tags.Models {
         public virtual bool EnableTagsOnPages { get; set; }
     }
 
-    public class TagSettingsProvider : ContentProvider {
+    public class TagSettingsHandler : ContentHandler {
-        public TagSettingsProvider(IRepository<TagSettingsRecord> repository) {
+        public TagSettingsHandler(IRepository<TagSettingsRecord> repository) {
             Filters.Add(new ActivatingFilter<TagSettings>("site"));
             Filters.Add(new StorageFilter<TagSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
             Filters.Add(new TemplateFilterForRecord<TagSettingsRecord>("TagSettings"));

src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs

@@ -19,12 +19,12 @@ namespace Orchard.Tags.Models {
         public IList<Tag> CurrentTags { get; set; }
     }
 
-    public class HasTagsProvider : ContentProvider {
+    public class HasTagsHandler : ContentHandler {
         private readonly IRepository<Tag> _tagsRepository;
         private readonly IRepository<TagsContentItems> _tagsContentItemsRepository;
         private readonly ITagService _tagService;
 
-        public HasTagsProvider(IRepository<Tag> tagsRepository, IRepository<TagsContentItems> tagsContentItemsRepository, ITagService tagService) {
+        public HasTagsHandler(IRepository<Tag> tagsRepository, IRepository<TagsContentItems> tagsContentItemsRepository, ITagService tagService) {
             _tagsRepository = tagsRepository;
             _tagsContentItemsRepository = tagsContentItemsRepository;
             _tagService = tagService;

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

@@ -4,12 +4,12 @@ using Orchard.Models;
 using Orchard.Models.Driver;
 
 namespace Orchard.Users.Models {
-    public class UserProvider : ContentProvider {
+    public class UserHandler : ContentHandler {
         public override IEnumerable<ContentType> GetContentTypes() {
             return new[] { User.ContentType };
         }
 
-        public UserProvider(IRepository<UserRecord> repository) {
+        public UserHandler(IRepository<UserRecord> repository) {
             Filters.Add(new ActivatingFilter<User>("user"));
             Filters.Add(new StorageFilter<UserRecord>(repository));
         }

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

@@ -64,7 +64,7 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Models\User.cs" />
-    <Compile Include="Models\UserProvider.cs" />
+    <Compile Include="Models\UserHandler.cs" />
     <Compile Include="Models\UserRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\MembershipService.cs" />

src/Orchard/Models/DefaultContentManager.cs

@@ -23,19 +23,19 @@ namespace Orchard.Models {
             _contentTypeRepository = contentTypeRepository;
         }
 
-        private IEnumerable<IContentProvider> _drivers;
+        private IEnumerable<IContentHandler> _handlers;
-        public IEnumerable<IContentProvider> Drivers {
+        public IEnumerable<IContentHandler> Handlers {
             get {
-                if (_drivers == null)
+                if (_handlers == null)
-                    _drivers = _context.Resolve<IEnumerable<IContentProvider>>();
+                    _handlers = _context.Resolve<IEnumerable<IContentHandler>>();
-                return _drivers;
+                return _handlers;
             }
         }
 
         public IEnumerable<ContentType> GetContentTypes() {
-            return Drivers.Aggregate(
+            return Handlers.Aggregate(
                 Enumerable.Empty<ContentType>(),
-                (contentTypes, contentProvider) => contentTypes.Concat(contentProvider.GetContentTypes()));
+                (types, handler) => types.Concat(handler.GetContentTypes()));
         }
 
         public virtual ContentItem New(string contentType) {
@@ -46,9 +46,9 @@ namespace Orchard.Models {
                 Builder = new ContentItemBuilder(contentType)
             };
 
-            // invoke drivers to weld aspects onto kernel
+            // invoke handlers to weld aspects onto kernel
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.Activating(context);
+                handler.Activating(context);
             }
             var context2 = new ActivatedContentContext {
                 ContentType = contentType,
@@ -58,8 +58,8 @@ namespace Orchard.Models {
             // back-reference for convenience (e.g. getting metadata when in a view)
             context2.ContentItem.ContentManager = this;
 
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.Activated(context2);
+                handler.Activated(context2);
             }
 
             // composite result is returned
@@ -87,12 +87,12 @@ namespace Orchard.Models {
                 ContentItem = contentItem,
             };
 
-            // invoke drivers to acquire state, or at least establish lazy loading callbacks
+            // invoke handlers to acquire state, or at least establish lazy loading callbacks
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.Loading(context);
+                handler.Loading(context);
             }
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.Loaded(context);
+                handler.Loaded(context);
             }
 
             return context.ContentItem;
@@ -116,12 +116,12 @@ namespace Orchard.Models {
             context.ContentItem.Id = context.Id;
 
 
-            // invoke drivers to add information to persistent stores
+            // invoke handlers to add information to persistent stores
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.Creating(context);
+                handler.Creating(context);
             }
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.Created(context);
+                handler.Created(context);
             }
         }
 
@@ -130,8 +130,8 @@ namespace Orchard.Models {
                 ContentItem = content.ContentItem,
                 Metadata = new ContentItemMetadata()
             };
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.GetItemMetadata(context);
+                handler.GetItemMetadata(context);
             }
             return context.Metadata;
         }
@@ -139,8 +139,8 @@ namespace Orchard.Models {
         public ItemDisplayViewModel<TContentPart> GetDisplayViewModel<TContentPart>(TContentPart content, string groupName, string displayType) where TContentPart : IContent {
             var itemView = new ItemDisplayViewModel<TContentPart> {Item = content, Displays = Enumerable.Empty<TemplateViewModel>()};
             var context = new GetDisplayViewModelContext(itemView, groupName, displayType);
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.GetDisplayViewModel(context);
+                handler.GetDisplayViewModel(context);
             }
             context.ViewModel.Displays = OrderTemplates(context.ViewModel.Displays);
             return itemView;
@@ -149,8 +149,8 @@ namespace Orchard.Models {
         public ItemEditorViewModel<TContentPart> GetEditorViewModel<TContentPart>(TContentPart content, string groupName) where TContentPart : IContent {
             var itemView = new ItemEditorViewModel<TContentPart> { Item = content, Editors = Enumerable.Empty<TemplateViewModel>() };
             var context = new GetEditorViewModelContext(itemView, groupName);
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.GetEditorViewModel(context);
+                handler.GetEditorViewModel(context);
             }
             context.ViewModel.Editors = OrderTemplates(context.ViewModel.Editors);
             return itemView;
@@ -160,8 +160,8 @@ namespace Orchard.Models {
             var itemView = new ItemEditorViewModel<TContentPart> { Item = content, Editors = Enumerable.Empty<TemplateViewModel>() };
 
             var context = new UpdateEditorViewModelContext(itemView, groupName, updater);
-            foreach (var driver in Drivers) {
+            foreach (var handler in Handlers) {
-                driver.UpdateEditorViewModel(context);
+                handler.UpdateEditorViewModel(context);
             }
             context.ViewModel.Editors = OrderTemplates(context.ViewModel.Editors);
             return itemView;

src/Orchard/Models/Diagram.cd

@@ -6,7 +6,7 @@
       <Property Name="IContent.ContentItem" Hidden="true" />
     </Members>
     <TypeIdentifier>
-      <HashCode>AAACAAAAAAACAAhAABAAAAAAAAAAQAAAAAAQAAAEBAA=</HashCode>
+      <HashCode>AAACAAAAAAACAAhAABAAAAAAAAAAQABAAAAQAAAEBAA=</HashCode>
       <FileName>Models\ContentItem.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -28,11 +28,11 @@
     </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Orchard.Models.ContentPartForRecord&lt;TRecord&gt;">
+  <Class Name="Orchard.Models.ContentPart&lt;TRecord&gt;">
     <Position X="5.25" Y="4" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAA=</HashCode>
-      <FileName>Models\ContentPartForRecord.cs</FileName>
+      <FileName>Models\ContentPart.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Orchard.Models.Records.ContentItemRecord">
@@ -62,15 +62,15 @@
   <Interface Name="Orchard.Models.IContentManager">
     <Position X="4" Y="5.75" Width="6" />
     <TypeIdentifier>
-      <HashCode>AAAACAAAAAAIACBAAACAAAAAAAAAAEAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAEAAAAAAAACBBAIAAAAAAAAEAAEgAAACAAAAAAAA=</HashCode>
       <FileName>Models\IContentManager.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Orchard.Models.Driver.IContentProvider">
+  <Interface Name="Orchard.Models.Driver.IContentHandler">
-    <Position X="4.25" Y="8.5" Width="3.75" />
+    <Position X="4.5" Y="8.75" Width="4.75" />
     <TypeIdentifier>
-      <HashCode>AAAACAAAAAEIAABAAACAAIAAACAAAAQAAAAAAAAAAAg=</HashCode>
+      <HashCode>AAAAEAAAAAEAAABBAIAAAIAAACEAAAQAAACAAAAAAAg=</HashCode>
-      <FileName>Models\Driver\IContentProvider.cs</FileName>
+      <FileName>Models\Driver\IContentHandler.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Font Name="Segoe UI" Size="9" />

src/Orchard/Models/Driver/ContentHandler.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using Orchard.Logging;
 
 namespace Orchard.Models.Driver {
-    public abstract class ContentProvider : IContentProvider {
+    public abstract class ContentHandler : IContentHandler {
-        protected ContentProvider() {
+        protected ContentHandler() {
             Filters = new List<IContentFilter>();
             Logger = NullLogger.Instance;
         }
@@ -94,59 +94,59 @@ namespace Orchard.Models.Driver {
             return Enumerable.Empty<ContentType>();
         }
 
-        void IContentProvider.Activating(ActivatingContentContext context) {
+        void IContentHandler.Activating(ActivatingContentContext context) {
             foreach (var filter in Filters.OfType<IContentActivatingFilter>())
                 filter.Activating(context);
             Activating(context);
         }
 
-        void IContentProvider.Activated(ActivatedContentContext context) {
+        void IContentHandler.Activated(ActivatedContentContext context) {
             foreach (var filter in Filters.OfType<IContentStorageFilter>())
                 filter.Activated(context);
             Activated(context);
         }
 
-        void IContentProvider.Creating(CreateContentContext context) {
+        void IContentHandler.Creating(CreateContentContext context) {
             foreach (var filter in Filters.OfType<IContentStorageFilter>())
                 filter.Creating(context);
             Creating(context);
         }
 
-        void IContentProvider.Created(CreateContentContext context) {
+        void IContentHandler.Created(CreateContentContext context) {
             foreach (var filter in Filters.OfType<IContentStorageFilter>())
                 filter.Created(context);
             Created(context);
         }
 
-        void IContentProvider.Loading(LoadContentContext context) {
+        void IContentHandler.Loading(LoadContentContext context) {
             foreach (var filter in Filters.OfType<IContentStorageFilter>())
                 filter.Loading(context);
             Loading(context);
         }
 
-        void IContentProvider.Loaded(LoadContentContext context) {
+        void IContentHandler.Loaded(LoadContentContext context) {
             foreach (var filter in Filters.OfType<IContentStorageFilter>())
                 filter.Loaded(context);
             Loaded(context);
         }
 
 
-        void IContentProvider.GetItemMetadata(GetItemMetadataContext context) {
+        void IContentHandler.GetItemMetadata(GetItemMetadataContext context) {
             foreach (var filter in Filters.OfType<IContentTemplateFilter>())
                 filter.GetItemMetadata(context);
             GetItemMetadata(context);
         }
-        void IContentProvider.GetDisplayViewModel(GetDisplayViewModelContext context) {
+        void IContentHandler.GetDisplayViewModel(GetDisplayViewModelContext context) {
             foreach (var filter in Filters.OfType<IContentTemplateFilter>())
                 filter.GetDisplayViewModel(context);
             GetDisplayViewModel(context);
         }
-        void IContentProvider.GetEditorViewModel(GetEditorViewModelContext context) {
+        void IContentHandler.GetEditorViewModel(GetEditorViewModelContext context) {
             foreach (var filter in Filters.OfType<IContentTemplateFilter>())
                 filter.GetEditorViewModel(context);
             GetEditorViewModel(context);
         }
-        void IContentProvider.UpdateEditorViewModel(UpdateEditorViewModelContext context) {
+        void IContentHandler.UpdateEditorViewModel(UpdateEditorViewModelContext context) {
             foreach (var filter in Filters.OfType<IContentTemplateFilter>())
                 filter.UpdateEditorViewModel(context);
             UpdateEditorViewModel(context);

src/Orchard/Models/Driver/IContentHandler.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
 namespace Orchard.Models.Driver {
-    public interface IContentProvider : IDependency {
+    public interface IContentHandler : IEvents {
         IEnumerable<ContentType> GetContentTypes();
 
         void Activating(ActivatingContentContext context);

src/Orchard/Orchard.csproj

@@ -155,7 +155,7 @@
     <Compile Include="Models\Driver\CreateContentContext.cs" />
     <Compile Include="Models\Driver\LoadContentContext.cs" />
     <Compile Include="Models\Driver\ContentItemBuilder.cs" />
-    <Compile Include="Models\Driver\ContentProvider.cs" />
+    <Compile Include="Models\Driver\ContentHandler.cs" />
     <Compile Include="Models\Driver\ActivatingContentContext.cs" />
     <Compile Include="Models\Driver\GetEditorViewModelContext.cs" />
     <Compile Include="Models\Driver\StorageFilter.cs" />
@@ -164,7 +164,7 @@
     <Compile Include="Models\Driver\TemplateFilterForRecord.cs" />
     <Compile Include="Models\IContentDisplayInfo.cs" />
     <Compile Include="Models\IContentManager.cs" />
-    <Compile Include="Models\Driver\IContentProvider.cs" />
+    <Compile Include="Models\Driver\IContentHandler.cs" />
     <Compile Include="Models\ContentExtensions.cs" />
     <Compile Include="Models\ContentPart.cs" />
     <Compile Include="Models\IContent.cs" />