From 417ab3eadf1e298bc56606e95bb62c07332d0f8c Mon Sep 17 00:00:00 2001
From: Suha Can <Suha.Can@microsoft.com>
Date: Tue, 1 Jun 2010 17:09:26 -0700
Subject: [PATCH] - Refactoring in the Orchard.Localization namespace and
 folders before things grow out of control.

--HG--
branch : dev
---
 .../Localization/CultureManagerTests.cs              |  3 +--
 .../Modules/Orchard.Setup/Services/SetupService.cs   |  2 +-
 src/Orchard/Localization/LocalizationModule.cs       |  3 ---
 .../{ => Services}/DefaultCultureManager.cs          |  2 +-
 .../{ => Services}/DefaultResourceManager.cs         |  2 +-
 .../Localization/{ => Services}/ICultureManager.cs   |  2 +-
 .../Localization/{ => Services}/ICultureSelector.cs  |  2 +-
 .../Localization/{ => Services}/IResourceManager.cs  |  2 +-
 .../{ => Services}/SiteCultureSelector.cs            |  2 +-
 src/Orchard/Localization/Text.cs                     |  1 +
 src/Orchard/Orchard.Framework.csproj                 | 12 ++++++------
 11 files changed, 15 insertions(+), 18 deletions(-)
 rename src/Orchard/Localization/{ => Services}/DefaultCultureManager.cs (95%)
 rename src/Orchard/Localization/{ => Services}/DefaultResourceManager.cs (85%)
 rename src/Orchard/Localization/{ => Services}/ICultureManager.cs (83%)
 rename src/Orchard/Localization/{ => Services}/ICultureSelector.cs (84%)
 rename src/Orchard/Localization/{ => Services}/IResourceManager.cs (72%)
 rename src/Orchard/Localization/{ => Services}/SiteCultureSelector.cs (90%)

diff --git a/src/Orchard.Tests/Localization/CultureManagerTests.cs b/src/Orchard.Tests/Localization/CultureManagerTests.cs
index 3c734b143..cf19a11bd 100644
--- a/src/Orchard.Tests/Localization/CultureManagerTests.cs
+++ b/src/Orchard.Tests/Localization/CultureManagerTests.cs
@@ -3,13 +3,12 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Web;
-using System.Web.Routing;
 using Autofac;
 using NHibernate;
 using NUnit.Framework;
 using Orchard.Data;
-using Orchard.Localization;
 using Orchard.Localization.Records;
+using Orchard.Localization.Services;
 using Orchard.Tests.ContentManagement;
 
 namespace Orchard.Tests.Localization {
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 72837f422..587f2b6fc 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -9,12 +9,12 @@ using Orchard.Core.Settings.Models;
 using Orchard.Data;
 using Orchard.Environment;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Extensions;
 using Orchard.Environment.ShellBuilders;
 using Orchard.Environment.Topology;
 using Orchard.Environment.Topology.Models;
 using Orchard.Localization;
 using Orchard.ContentManagement.MetaData.Services;
+using Orchard.Localization.Services;
 using Orchard.Security;
 using Orchard.Settings;
 using Orchard.Themes;
diff --git a/src/Orchard/Localization/LocalizationModule.cs b/src/Orchard/Localization/LocalizationModule.cs
index 7b6a822d9..6dd193a1f 100644
--- a/src/Orchard/Localization/LocalizationModule.cs
+++ b/src/Orchard/Localization/LocalizationModule.cs
@@ -19,9 +19,6 @@ namespace Orchard.Localization {
                 var scope = registration.Activator.LimitType.FullName;
 
                 registration.Activated += (sender, e) => {
-                    //var authenticationService = e.Context.Resolve<IAuthenticationService>();
-                    //var currentUser = authenticationService.GetAuthenticatedUser();
-
                     var localizer = LocalizationUtilities.Resolve(e.Context, scope);
                     userProperty.SetValue(e.Instance, localizer, null);
                 };
diff --git a/src/Orchard/Localization/DefaultCultureManager.cs b/src/Orchard/Localization/Services/DefaultCultureManager.cs
similarity index 95%
rename from src/Orchard/Localization/DefaultCultureManager.cs
rename to src/Orchard/Localization/Services/DefaultCultureManager.cs
index a7dce546e..8983636d0 100644
--- a/src/Orchard/Localization/DefaultCultureManager.cs
+++ b/src/Orchard/Localization/Services/DefaultCultureManager.cs
@@ -7,7 +7,7 @@ using System.Web.Routing;
 using Orchard.Data;
 using Orchard.Localization.Records;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class DefaultCultureManager : ICultureManager {
         private readonly IRepository<CultureRecord> _cultureRepository;
         private readonly IEnumerable<ICultureSelector> _cultureSelectors;
diff --git a/src/Orchard/Localization/DefaultResourceManager.cs b/src/Orchard/Localization/Services/DefaultResourceManager.cs
similarity index 85%
rename from src/Orchard/Localization/DefaultResourceManager.cs
rename to src/Orchard/Localization/Services/DefaultResourceManager.cs
index 29d6afe9e..9c7aa35bb 100644
--- a/src/Orchard/Localization/DefaultResourceManager.cs
+++ b/src/Orchard/Localization/Services/DefaultResourceManager.cs
@@ -1,4 +1,4 @@
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class DefaultResourceManager : IResourceManager {
         // This will use the .po files shortly.
         public string GetLocalizedString(string key, string cultureName) {
diff --git a/src/Orchard/Localization/ICultureManager.cs b/src/Orchard/Localization/Services/ICultureManager.cs
similarity index 83%
rename from src/Orchard/Localization/ICultureManager.cs
rename to src/Orchard/Localization/Services/ICultureManager.cs
index cbdb305c8..2a55558f1 100644
--- a/src/Orchard/Localization/ICultureManager.cs
+++ b/src/Orchard/Localization/Services/ICultureManager.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Web;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public interface ICultureManager : IDependency {
         IEnumerable<string> ListCultures();
         void AddCulture(string cultureName);
diff --git a/src/Orchard/Localization/ICultureSelector.cs b/src/Orchard/Localization/Services/ICultureSelector.cs
similarity index 84%
rename from src/Orchard/Localization/ICultureSelector.cs
rename to src/Orchard/Localization/Services/ICultureSelector.cs
index 4d0c48307..3495e1606 100644
--- a/src/Orchard/Localization/ICultureSelector.cs
+++ b/src/Orchard/Localization/Services/ICultureSelector.cs
@@ -1,6 +1,6 @@
 using System.Web;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class CultureSelectorResult {
         public int Priority { get; set; }
         public string CultureName { get; set; }
diff --git a/src/Orchard/Localization/IResourceManager.cs b/src/Orchard/Localization/Services/IResourceManager.cs
similarity index 72%
rename from src/Orchard/Localization/IResourceManager.cs
rename to src/Orchard/Localization/Services/IResourceManager.cs
index ef4263e15..e9753df52 100644
--- a/src/Orchard/Localization/IResourceManager.cs
+++ b/src/Orchard/Localization/Services/IResourceManager.cs
@@ -1,4 +1,4 @@
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public interface IResourceManager : IDependency {
         string GetLocalizedString(string key, string cultureName);
     }
diff --git a/src/Orchard/Localization/SiteCultureSelector.cs b/src/Orchard/Localization/Services/SiteCultureSelector.cs
similarity index 90%
rename from src/Orchard/Localization/SiteCultureSelector.cs
rename to src/Orchard/Localization/Services/SiteCultureSelector.cs
index 7ce1e044b..87b74f760 100644
--- a/src/Orchard/Localization/SiteCultureSelector.cs
+++ b/src/Orchard/Localization/Services/SiteCultureSelector.cs
@@ -3,7 +3,7 @@ using System.Web;
 using JetBrains.Annotations;
 using Orchard.Settings;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class SiteCultureSelector : ICultureSelector {
        protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
 
diff --git a/src/Orchard/Localization/Text.cs b/src/Orchard/Localization/Text.cs
index da94640ad..08fb94356 100644
--- a/src/Orchard/Localization/Text.cs
+++ b/src/Orchard/Localization/Text.cs
@@ -1,4 +1,5 @@
 using System.Web;
+using Orchard.Localization.Services;
 using Orchard.Logging;
 
 namespace Orchard.Localization {
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index 92e21efd7..810cff1aa 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -143,13 +143,13 @@
     <Compile Include="Environment\State\IShellStateManager.cs" />
     <Compile Include="Environment\State\ShellStateCoordinator.cs" />
     <Compile Include="IDependency.cs" />
-    <Compile Include="Localization\DefaultCultureManager.cs" />
-    <Compile Include="Localization\DefaultResourceManager.cs" />
-    <Compile Include="Localization\ICultureManager.cs" />
-    <Compile Include="Localization\ICultureSelector.cs" />
-    <Compile Include="Localization\IResourceManager.cs" />
+    <Compile Include="Localization\Services\DefaultCultureManager.cs" />
+    <Compile Include="Localization\Services\DefaultResourceManager.cs" />
+    <Compile Include="Localization\Services\ICultureManager.cs" />
+    <Compile Include="Localization\Services\ICultureSelector.cs" />
+    <Compile Include="Localization\Services\IResourceManager.cs" />
     <Compile Include="Localization\Records\CultureRecord.cs" />
-    <Compile Include="Localization\SiteCultureSelector.cs" />
+    <Compile Include="Localization\Services\SiteCultureSelector.cs" />
     <Compile Include="Mvc\Html\ThemeExtensions.cs" />
     <Compile Include="Mvc\Routes\IRoutePublisher.cs" />
     <Compile Include="Mvc\Routes\IRouteProvider.cs" />