Adding request url data to settings struct and making name of prefix more specific

--HG--
branch : dev

src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs

@@ -263,7 +263,7 @@ namespace Orchard.Tests.Environment {
         [Test]
         public void DataPrefixChangesTableName() {
             var settings = BuildDefaultSettings();
-            settings.DataPrefix = "Yadda";
+            settings.DataTablePrefix = "Yadda";
             var descriptor = Build.TopologyDescriptor().WithFeatures("Foo Plus", "Bar", "Bar Minus");
 
             _extensionDescriptors = new[] {

src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs

@@ -11,6 +11,7 @@ using Orchard.Environment;
 using Orchard.Environment.Configuration;
 using Orchard.Mvc.Routes;
 using Orchard.Tests.Stubs;
+using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Mvc.Routes {
     [TestFixture]
@@ -27,6 +28,7 @@ namespace Orchard.Tests.Mvc.Routes {
             var settings = new ShellSettings { Name = "Alpha" };
             var builder = new ContainerBuilder();
             builder.RegisterType<ShellRoute>().InstancePerDependency();
+            builder.RegisterAutoMocking();
             builder.Register(ctx => settings);
 
             var container = builder.Build();
@@ -51,7 +53,7 @@ namespace Orchard.Tests.Mvc.Routes {
 
         private void Init() {
             _settingsA = new ShellSettings {Name = "Alpha"};
-            _settingsB = new ShellSettings {Name = "Beta"};
+            _settingsB = new ShellSettings {Name = "Beta", };
             _routes = new RouteCollection();
 
             var rootBuilder = new ContainerBuilder();

src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs

@@ -31,7 +31,7 @@ namespace Orchard.MultiTenancy.Commands {
                 Context.Output.WriteLine(T("Name: ") + tenant.Name);
                 Context.Output.WriteLine(T("Provider: ") + tenant.DataProvider);
                 Context.Output.WriteLine(T("ConnectionString: ") + tenant.DataConnectionString);
-                Context.Output.WriteLine(T("Prefix: ") + tenant.DataPrefix);
+                Context.Output.WriteLine(T("Prefix: ") + tenant.DataTablePrefix);
                 Context.Output.WriteLine(T("---------------------------"));
             }
         }
@@ -46,7 +46,7 @@ namespace Orchard.MultiTenancy.Commands {
                         Name = tenantName,
                         DataProvider = providerName,
                         DataConnectionString = ConnectionString,
-                        DataPrefix = prefix
+                        DataTablePrefix = prefix
                     });
         }
 
@@ -64,7 +64,7 @@ namespace Orchard.MultiTenancy.Commands {
                 Context.Output.WriteLine(T("Name: ") + tenant.Name);
                 Context.Output.WriteLine(T("Provider: ") + tenant.DataProvider);
                 Context.Output.WriteLine(T("ConnectionString: ") + tenant.DataConnectionString);
-                Context.Output.WriteLine(T("Prefix: ") + tenant.DataPrefix);
+                Context.Output.WriteLine(T("Prefix: ") + tenant.DataTablePrefix);
                 Context.Output.WriteLine(T("---------------------------"));
             }
         }

src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs

@@ -42,7 +42,7 @@ namespace Orchard.MultiTenancy.Controllers {
                         Name = viewModel.Name,
                         DataProvider = viewModel.DataProvider,
                         DataConnectionString = viewModel.ConnectionString,
-                        DataPrefix = viewModel.Prefix
+                        DataTablePrefix = viewModel.Prefix
                     });
 
                 return RedirectToAction("List");

src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/List.ascx

@@ -24,7 +24,7 @@
             <td><%= tenant.Name %></td>
             <td><%= tenant.DataProvider %></td>
             <td><%= tenant.DataConnectionString %></td>
-            <td><%= tenant.DataPrefix %></td>
+            <td><%= tenant.DataTablePrefix %></td>
        </tr><%
     } %>
     </tbody>

src/Orchard/Environment/Configuration/ShellSettings.cs

@@ -6,8 +6,12 @@
     /// </summary>
     public class ShellSettings {
         public string Name { get; set; }
+
         public string DataProvider { get; set; }
         public string DataConnectionString { get; set; }
-        public string DataPrefix { get; set; }
+        public string DataTablePrefix { get; set; }
+
+        public string RequestUrlHost { get; set; }
+        public string RequestUrlPrefix { get; set; }
     }
 }

src/Orchard/Environment/Configuration/ShellSettingsManager.cs

@@ -59,7 +59,7 @@ namespace Orchard.Environment.Configuration {
                 Name = content.Name,
                 DataProvider = content.DataProvider,
                 DataConnectionString = content.DataConnectionString,
-                DataPrefix = content.DataPrefix,
+                DataTablePrefix = content.DataPrefix,
             };
         }
 
@@ -72,7 +72,7 @@ namespace Orchard.Environment.Configuration {
                 Name = settings.Name,
                 DataProvider = settings.DataProvider,
                 DataConnectionString = settings.DataConnectionString,
-                DataPrefix = settings.DataPrefix,
+                DataPrefix = settings.DataTablePrefix,
             });
         }
     }

src/Orchard/Environment/Topology/CompositionStrategy.cs

@@ -134,14 +134,14 @@ namespace Orchard.Environment.Topology {
             var extensionDescriptor = feature.Descriptor.Extension;
             var extensionName = extensionDescriptor.Name.Replace('.', '_');
 
-            var dataPrefix = "";
+            var dataTablePrefix = "";
-            if (!string.IsNullOrEmpty(settings.DataPrefix))
+            if (!string.IsNullOrEmpty(settings.DataTablePrefix))
-                dataPrefix = settings.DataPrefix + "_";
+                dataTablePrefix = settings.DataTablePrefix + "_";
 
             return new RecordTopology {
                 Type = type,
                 Feature = feature,
-                TableName = dataPrefix + extensionName + '_' + type.Name,
+                TableName = dataTablePrefix + extensionName + '_' + type.Name,
             };
         }
     }