- Moving a few extension method classes out of the Orchard.Extensions namespace

- Orchard.Extensions is for Orchard extension classes such as extension managers and loaders.

--HG--
branch : dev

src/Orchard.Web/Core/Scheduling/Services/ScheduledTaskManager.cs

@@ -7,7 +7,7 @@ using Orchard.Core.Scheduling.Models;
 using Orchard.Data;
 using Orchard.Logging;
 using Orchard.Tasks.Scheduling;
-using Orchard.Utility;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Core.Scheduling.Services {
     [UsedImplicitly]

src/Orchard/ContentManagement/DefaultContentQuery.cs

@@ -8,7 +8,7 @@ using NHibernate.Impl;
 using NHibernate.Linq;
 using Orchard.ContentManagement.Records;
 using Orchard.Data;
-using Orchard.Utility;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.ContentManagement {
     public class DefaultContentQuery : IContentQuery {

src/Orchard/Data/Repository.cs

@@ -5,7 +5,7 @@ using System.Linq.Expressions;
 using NHibernate;
 using NHibernate.Linq;
 using Orchard.Logging;
-using Orchard.Utility;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Data {
     public class Repository<T> : IRepository<T> {

src/Orchard/Environment/DefaultCompositionStrategy.cs

@@ -6,7 +6,7 @@ using Autofac;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Records;
 using Orchard.Extensions;
-using Orchard.Utility;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Environment {
     //TEMP: This will be replaced by packaging system

src/Orchard/Extensions/HackInstallationGenerator.cs

@@ -1,7 +1,6 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using Orchard.Logging;
-using Orchard.Utility;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Extensions {
     public interface IHackInstallationGenerator  : IDependency {

src/Orchard/Mvc/Html/ContentItemExtensions.cs

@@ -2,7 +2,7 @@
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
 using Orchard.ContentManagement;
-using Orchard.Extensions;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Mvc.Html {
     public static class ContentItemExtensions {

src/Orchard/Mvc/Html/HtmlHelperExtensions.cs

@@ -7,11 +7,11 @@ using System.Text.RegularExpressions;
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
 using System.Web.Routing;
-using Orchard.Extensions;
 using Orchard.Mvc.ViewModels;
 using Orchard.Services;
 using Orchard.Settings;
 using Orchard.Utility;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.Mvc.Html {
     public static class HtmlHelperExtensions {

src/Orchard/Orchard.csproj

@@ -115,7 +115,6 @@
     <Compile Include="Mvc\Routes\StandardExtensionRouteProvider.cs" />
     <Compile Include="Mvc\Routes\RoutePublisher.cs" />
     <Compile Include="Mvc\Routes\RouteDescriptor.cs" />
-    <Compile Include="Utility\ReadOnlyCollectionExtensions.cs" />
     <Compile Include="Data\Repository.cs" />
     <Compile Include="Environment\DefaultCompositionStrategy.cs" />
     <Compile Include="Environment\DefaultOrchardHost.cs" />
@@ -151,10 +150,7 @@
     <Compile Include="Environment\StandaloneEnvironment.cs" />
     <Compile Include="Extensions\AreaFolders.cs" />
     <Compile Include="Extensions\ExtensionFolders.cs" />
-    <Compile Include="Extensions\RouteValueDictionaryExtensions.cs" />
     <Compile Include="Extensions\Loaders\AreaExtensionLoader.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="Extensions\UriExtensions.cs" />
     <Compile Include="Mvc\AntiForgery\ValidateAntiForgeryTokenOrchardAttribute.cs" />
     <Compile Include="Mvc\FollowReturnUrl\FollowReturnUrlFilter.cs" />
     <Compile Include="Mvc\Html\FileRegistrationContextExtensions.cs" />
@@ -366,6 +362,10 @@
     <Compile Include="Storage\IStorageFolder.cs" />
     <Compile Include="Storage\IStorageProvider.cs" />
     <Compile Include="UI\Zones\ZoneManager.cs" />
+    <Compile Include="Utility\Extensions\ReadOnlyCollectionExtensions.cs" />
+    <Compile Include="Utility\Extensions\RouteValueDictionaryExtensions.cs" />
+    <Compile Include="Utility\Extensions\StringExtensions.cs" />
+    <Compile Include="Utility\Extensions\UriExtensions.cs" />
     <Compile Include="Utility\Position.cs" />
     <Compile Include="Utility\Reflect.cs" />
     <Compile Include="Utility\ReflectOn.cs" />

src/Orchard/Utility/Extensions/ReadOnlyCollectionExtensions.cs

@@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace Orchard.Utility {
+namespace Orchard.Utility.Extensions {
     public static class ReadOnlyCollectionExtensions {
         public static IList<T> ToReadOnlyCollection<T>(this IEnumerable<T> enumerable) {
             return new ReadOnlyCollection<T>(enumerable.ToList());

src/Orchard/Utility/Extensions/RouteValueDictionaryExtensions.cs

@@ -1,6 +1,6 @@
 using System.Web.Routing;
 
-namespace Orchard.Extensions {
+namespace Orchard.Utility.Extensions {
     public static class RouteValueDictionaryExtensions {
         public static RouteValueDictionary Merge(this RouteValueDictionary dictionary, object values) {
             return values == null ? dictionary : dictionary.Merge(new RouteValueDictionary(values));

src/Orchard/Utility/Extensions/StringExtensions.cs

@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Text.RegularExpressions;
-using System.Text.RegularExpressions;
 
-namespace Orchard.Extensions {
+namespace Orchard.Utility.Extensions {
     public static class StringExtensions {
         public static string Ellipsize(this string text, int characterCount) {
             return text.Ellipsize(characterCount, " …");

src/Orchard/Utility/Extensions/UriExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Orchard.Extensions {
+namespace Orchard.Utility.Extensions {
     public static class UriExtensions {
         public static string ToRootString(this Uri uri) {
             return string.Format("{0}://{1}{2}", uri.Scheme, uri.Host, uri.Port != 80 ? ":" + uri.Port : "");