Changing Orchard.Models namespace to Orchard.ContentManagement

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

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

@@ -8,9 +8,9 @@ using NUnit.Framework;
 using Orchard.Core.Common.Models;
 using Orchard.Core.Common.Providers;
 using Orchard.Core.Common.Records;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Security;
 using Orchard.Tests.Packages;
 

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

@@ -10,9 +10,9 @@ using Moq;
 using NUnit.Framework;
 using Orchard.Data;
 using Orchard.Environment;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Security;
 using Orchard.UI.Notify;
 using Orchard.Users.Controllers;

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

@@ -9,9 +9,9 @@ using Autofac.Modules;
 using NHibernate;
 using NUnit.Framework;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Security;
 using Orchard.Users.Models;
 using Orchard.Users.Services;

src/Orchard.Tests/Models/ContentQueryTests.cs

@@ -8,9 +8,9 @@ using Autofac.Modules;
 using NHibernate;
 using NUnit.Framework;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Tests.Models.Records;
 using Orchard.Tests.Models.Stubs;
 

src/Orchard.Tests/Models/DefaultModelManagerTests.cs

@@ -6,9 +6,9 @@ using Autofac.Modules;
 using NHibernate;
 using NUnit.Framework;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Tests.Models.Records;
 using Orchard.Tests.Models.Stubs;
 

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

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Tests.Models.Stubs;
 
 namespace Orchard.Tests.Models.Drivers {

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

@@ -1,6 +1,6 @@
 using NUnit.Framework;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Tests.Models.Drivers {
 

src/Orchard.Tests/Models/PartDriverHandlerTests.cs

@@ -8,9 +8,9 @@ using Autofac.Builder;
 using Autofac.Modules;
 using Moq;
 using NUnit.Framework;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Tests.Models {
     [TestFixture]

src/Orchard.Tests/Models/Records/DeltaRecord.cs

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Tests.Models.Records {
     public class DeltaRecord : ContentPartRecord {

src/Orchard.Tests/Models/Records/GammaRecord.cs

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Tests.Models.Records {
     public class GammaRecord : ContentPartRecord {

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

@@ -1,4 +1,4 @@
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Tests.Models.Stubs {
     public class Alpha : ContentPart {        

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Tests.Models.Stubs {
     public class AlphaHandler : ContentHandler {

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

@@ -1,4 +1,4 @@
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Tests.Models.Stubs {
     public class Beta : ContentPart {

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

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Tests.Models.Stubs {
     public class BetaHandler : ContentHandler {
-        public override System.Collections.Generic.IEnumerable<Orchard.Models.ContentType> GetContentTypes() {
+        public override System.Collections.Generic.IEnumerable<Orchard.ContentManagement.ContentType> GetContentTypes() {
             return new[] { new ContentType { Name = "beta" } };
         }
 

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

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Tests.Models.Records;
 
 namespace Orchard.Tests.Models.Stubs {
@@ -13,7 +13,7 @@ namespace Orchard.Tests.Models.Stubs {
 
 
     public class DeltaHandler : ContentHandler {
-        public override System.Collections.Generic.IEnumerable<Orchard.Models.ContentType> GetContentTypes() {
+        public override System.Collections.Generic.IEnumerable<Orchard.ContentManagement.ContentType> GetContentTypes() {
             return new[] { new ContentType { Name = "delta" } };
         }
 

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Tests.Models.Stubs {
     class Flavored : ContentPart {

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

@@ -1,5 +1,5 @@
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Tests.Models.Stubs {
     public class FlavoredHandler : ContentHandler {

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

@@ -2,8 +2,8 @@
 using FluentNHibernate.Automapping;
 using FluentNHibernate.Automapping.Alterations;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Tests.Models.Records;
 
 namespace Orchard.Tests.Models.Stubs {
@@ -12,7 +12,7 @@ namespace Orchard.Tests.Models.Stubs {
 
 
     public class GammaHandler : ContentHandler {
-        public override System.Collections.Generic.IEnumerable<Orchard.Models.ContentType> GetContentTypes() {
+        public override System.Collections.Generic.IEnumerable<Orchard.ContentManagement.ContentType> GetContentTypes() {
             return new[] { new ContentType { Name = "gamma" } };
         }
 

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Tests.Models.Stubs {
     public class Styled : ContentPart {

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

@@ -1,5 +1,5 @@
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Tests.Models.Stubs {
     public class StyledHandler : ContentHandler {

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

@@ -1,5 +1,5 @@
 using Orchard.Core.Common.Records;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Core.Common.Models {
     public class BodyAspect : ContentPart<BodyRecord> {

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

@@ -1,8 +1,8 @@
 using System;
 using Orchard.Core.Common.Records;
 using Orchard.Core.Common.Utilities;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Aspects;
+using Orchard.ContentManagement.Aspects;
 using Orchard.Security;
 
 namespace Orchard.Core.Common.Models {

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

@@ -1,5 +1,5 @@
 using Orchard.Core.Common.Records;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Core.Common.Models {
     public class RoutableAspect : ContentPart<RoutableRecord> {

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

@@ -2,8 +2,8 @@ using Orchard.Core.Common.Models;
 using Orchard.Core.Common.Records;
 using Orchard.Core.Common.ViewModels;
 using Orchard.Data;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Core.Common.Providers {
     public class BodyAspectHandler : ContentHandler {

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

@@ -4,10 +4,10 @@ using Orchard.Core.Common.Records;
 using Orchard.Core.Common.ViewModels;
 using Orchard.Data;
 using Orchard.Localization;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Aspects;
+using Orchard.ContentManagement.Aspects;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Security;
 using Orchard.Services;
 

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

@@ -1,6 +1,6 @@
 using Orchard.Core.Common.Records;
 using Orchard.Data;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Core.Common.Providers {
     public class RoutableAspectHandler : ContentHandler {

src/Orchard.Web/Core/Common/Records/BodyRecord.cs

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Common.Records {
     public class BodyRecord : ContentPartRecord {

src/Orchard.Web/Core/Common/Records/CommonRecord.cs

@@ -1,5 +1,5 @@
 using System;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Common.Records {
     public class CommonRecord : ContentPartRecord {

src/Orchard.Web/Core/Common/Records/RoutableRecord.cs

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Common.Records {
     public class RoutableRecord : ContentPartRecord {

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

@@ -2,10 +2,10 @@
 using Orchard.Core.Settings.Models;
 using Orchard.Core.Settings.ViewModels;
 using Orchard.Localization;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Settings;
 using Orchard.UI.Notify;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Core.Settings.Controllers {
     [ValidateInput(false)]

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

@@ -1,6 +1,6 @@
 using System;
 using Orchard.Core.Settings.Records;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {

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

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using Orchard.Core.Settings.Records;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Core.Settings.Models {
     public class SiteSettingsHandler : ContentHandler {

src/Orchard.Web/Core/Settings/Records/SiteSettingsRecord.cs

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Settings.Records {
     public class SiteSettingsRecord : ContentPartRecord {

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

@@ -3,7 +3,7 @@ using Orchard.Core.Settings.Models;
 using Orchard.Core.Settings.Records;
 using Orchard.Data;
 using Orchard.Logging;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Settings;
 using System.Web;
 

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Web.Mvc;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 using Orchard.Core.Settings.Models;
 

src/Orchard.Web/Core/Themes/Models/Theme.cs

@@ -1,5 +1,5 @@
 using Orchard.Core.Themes.Records;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Themes;
 
 namespace Orchard.Core.Themes.Models {

src/Orchard.Web/Core/Themes/Models/ThemeSiteSettings.cs

@@ -1,5 +1,5 @@
 using Orchard.Core.Themes.Records;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Core.Themes.Models {
     public class ThemeSiteSettings : ContentPart<ThemeSiteSettingsRecord> {

src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs

@@ -1,6 +1,6 @@
 using Orchard.Core.Themes.Records;
 using Orchard.Data;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Core.Themes.Models {
     public class ThemeSiteSettingsHandler : ContentHandler {

src/Orchard.Web/Core/Themes/Records/ThemeRecord.cs

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Themes.Records {
     public class ThemeRecord : ContentPartRecord {

src/Orchard.Web/Core/Themes/Records/ThemeSiteSettingsRecord.cs

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Themes.Records {
     public class ThemeSiteSettingsRecord : ContentPartRecord {

src/Orchard.Web/Core/Themes/Services/SiteThemeSelector.cs

@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.Routing;
 using JetBrains.Annotations;
 using Orchard.Core.Themes.Models;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Settings;
 using Orchard.Themes;
 

src/Orchard.Web/Core/Themes/Services/ThemeService.cs

@@ -6,7 +6,7 @@ using System.Web.Routing;
 using JetBrains.Annotations;
 using Orchard.Extensions;
 using Orchard.Logging;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Settings;
 using Orchard.Themes;
 using Orchard.Core.Themes.Models;

src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogAdminController.cs

@@ -3,7 +3,7 @@ using System.Web.Mvc;
 using Orchard.Blogs.Models;
 using Orchard.Blogs.Services;
 using Orchard.Blogs.ViewModels;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Mvc.Results;
 
 namespace Orchard.Blogs.Controllers {

src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogController.cs

@@ -6,8 +6,8 @@ using Orchard.Blogs.Services;
 using Orchard.Blogs.ViewModels;
 using Orchard.Data;
 using Orchard.Localization;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Mvc.Results;
 using Orchard.Security;
 using Orchard.UI.Notify;

src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs

@@ -6,8 +6,8 @@ using Orchard.Blogs.Services;
 using Orchard.Blogs.ViewModels;
 using Orchard.Data;
 using Orchard.Localization;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Mvc.Results;
 using Orchard.Security;
 using Orchard.UI.Notify;

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Orchard.Core.Common.Models;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Blogs.Models {
     public class Blog : ContentPart<BlogRecord> {

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

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Blogs.Models {
     public class BlogHandler : ContentHandler {

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

@@ -2,7 +2,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
 using Orchard.Core.Common.Models;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Security;
 
 namespace Orchard.Blogs.Models {

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

@@ -4,9 +4,9 @@ using System.Web.Routing;
 using Orchard.Blogs.Services;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Blogs.Models {
     public class BlogPostHandler : ContentHandler {

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

@@ -1,5 +1,5 @@
 using System;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Blogs.Models {
     public class BlogPostRecord : ContentPartRecord {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Orchard.Data.Conventions;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Blogs.Models {
     public class BlogRecord : ContentPartRecord {

src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogPostService.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using Orchard.Blogs.Models;
 using Orchard.Core.Common.Records;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Blogs.Services {
     public class BlogPostService : IBlogPostService {

src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogService.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using Orchard.Blogs.Models;
 using Orchard.Core.Common.Records;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Blogs.Services {
     public class BlogService : IBlogService {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/AdminBlogsViewModel.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogEditViewModel.cs

@@ -1,5 +1,5 @@
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs

@@ -1,5 +1,5 @@
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs

@@ -1,5 +1,5 @@
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostViewModel.cs

@@ -1,5 +1,5 @@
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogViewModel.cs

@@ -1,5 +1,5 @@
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsViewModel.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs

@@ -1,5 +1,5 @@
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs

@@ -1,5 +1,5 @@
 using Orchard.Blogs.Models;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Blogs.ViewModels {

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <% Html.Title(Model.Item.Name); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx

@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h3><a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Name) %></a></h3>

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx

@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <% Html.Title(Model.Item.Name); %>
 <div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit">edit</a></div>
 <h1><%=Html.Encode(Model.Item.Name) %></h1>

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -1,7 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Models"%>
+<%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Core.Common.Models"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h3><a href="<%=Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Title) %></a></h3>

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx

@@ -1,7 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Models"%>
+<%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Core.Common.Models"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h3><a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Title)%></a></h3>

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <% Html.Title(Model.Item.Title); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx

@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayModel<BlogPost>>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%=Html.UnorderedList(Model, (bp, i) => Html.DisplayForItem(bp).ToHtmlString(), "blogPosts contentItems") %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.Blog.ascx

@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <% Html.Title(Model.Item.Name); %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.BlogPost.ascx

@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
+<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <% Html.Title(Model.Item.Title); %>

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

@@ -7,7 +7,7 @@ using JetBrains.Annotations;
 using Orchard.Comments.Models;
 using Orchard.Localization;
 using Orchard.Logging;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Settings;
 using Orchard.UI.Notify;
 using Orchard.Security;

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

@@ -1,4 +1,4 @@
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Comments.Models {
     public class CommentSettings : ContentPart<CommentSettingsRecord> {

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

@@ -1,5 +1,5 @@
 using Orchard.Data;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Comments.Models {
     public class CommentSettingsHandler : ContentHandler {

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

@@ -1,4 +1,4 @@
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Comments.Models {
     public class CommentSettingsRecord : ContentPartRecord {

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

@@ -1,8 +1,8 @@
 using System;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Comments.Services;
 
 namespace Orchard.Comments.Models {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Comments.Models {
     public class HasComments : ContentPart {

src/Orchard.Web/Packages/Orchard.Comments/Services/CommentService.cs

@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Orchard.Comments.Models;
 using Orchard.Data;
 using Orchard.Logging;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Security;
 using Orchard.Settings;
 using Orchard.UI.Notify;

src/Orchard.Web/Packages/Orchard.Comments/Services/CommentValidator.cs

@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Orchard.Comments.Models;
 using Orchard.Localization;
 using Orchard.Logging;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Settings;
 using Orchard.UI.Notify;
 using Joel.Net;

src/Orchard.Web/Packages/Orchard.DevTools/Controllers/ContentController.cs

@@ -6,8 +6,8 @@ using System.Web.Mvc;
 using System.Web.Mvc.Ajax;
 using Orchard.Data;
 using Orchard.DevTools.ViewModels;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.DevTools.Controllers {
     public class ContentController : Controller {

src/Orchard.Web/Packages/Orchard.DevTools/Controllers/HomeController.cs

@@ -6,8 +6,8 @@ using System.Web.Mvc;
 using System.Web.Mvc.Ajax;
 using Orchard.Data;
 using Orchard.DevTools.ViewModels;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.DevTools.Controllers

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

@@ -1,5 +1,5 @@
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.DevTools.Models {
     public class DebugLinkHandler : ContentHandler {

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

@@ -1,4 +1,4 @@
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.DevTools.Models {
     public class ShowDebugLink {

src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.DevTools.ViewModels {

src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentIndexViewModel.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 using Orchard.Mvc.ViewModels;
 
 namespace Orchard.DevTools.ViewModels {

src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx

@@ -1,5 +1,5 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.DevTools.ViewModels.ContentDetailsViewModel>" %>
-<%@ Import Namespace="Orchard.Models"%>
+<%@ Import Namespace="Orchard.ContentManagement"%>
 
 <%@ Import Namespace="System.Reflection" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>

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

@@ -1,8 +1,8 @@
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Media.Models {
     public class MediaSettings : ContentPart<MediaSettingsRecord> {

src/Orchard.Web/Packages/Orchard.Roles/Controllers/UserRolesDriver.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Roles.Models.NoRecord;
 using Orchard.Roles.Records;
 using Orchard.Roles.Services;

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

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Roles.Models.NoRecord {
     public interface IUserRoles : IContent {

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

@@ -1,8 +1,8 @@
 using System.Linq;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Roles.Models.NoRecord;
 using Orchard.Roles.Records;
 using Orchard.Roles.Services;

src/Orchard.Web/Packages/Orchard.Roles/Services/RolesBasedAuthorizationService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Orchard.Logging;
-using Orchard.Models;
+using Orchard.ContentManagement;
 using Orchard.Roles.Models.NoRecord;
 using Orchard.Roles.Records;
 using Orchard.Security;

src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/HomeController.cs

@@ -2,8 +2,8 @@ using System;
 using System.Linq;
 using System.Web.Mvc;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Sandbox.Models;
 using Orchard.Sandbox.ViewModels;
 

src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs

@@ -5,8 +5,8 @@ using JetBrains.Annotations;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
 using Orchard.Localization;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Sandbox.Models;
 using Orchard.Sandbox.ViewModels;
 using Orchard.Security;

src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxContentHandler.cs

@@ -2,9 +2,9 @@
 using System.Web.Routing;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 
 namespace Orchard.Sandbox.Models {
     public class SandboxContentHandler : ContentHandler {

src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxPage.cs

@@ -1,5 +1,5 @@
 using System.Web.Routing;
-using Orchard.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Sandbox.Models {
     public class SandboxPage : ContentPart<SandboxPageRecord> {

src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxPageRecord.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Sandbox.Models {
     public class SandboxPageRecord : ContentPartRecord{

src/Orchard.Web/Packages/Orchard.Sandbox/Models/SandboxSettingsRecord.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using Orchard.Data;
-using Orchard.Models;
+using Orchard.ContentManagement;
-using Orchard.Models.Driver;
+using Orchard.ContentManagement.Handlers;
-using Orchard.Models.Records;
+using Orchard.ContentManagement.Records;
 
 namespace Orchard.Sandbox.Models {
     public class SandboxSettingsRecord : ContentPartRecord {

src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageEditViewModel.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 using Orchard.Sandbox.Models;
 

src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Orchard.Models.ViewModels;
+using Orchard.ContentManagement.ViewModels;
 using Orchard.Mvc.ViewModels;
 using Orchard.Sandbox.Models;