lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge perf => dev

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-11-29 16:44:10 -08:00
parent 47725ae961 0a5a48cf1d
commit 24ef2adb9e
22 changed files with 159 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
View File

@@ -46,7 +46,7 @@ namespace Orchard.Core.Tests.Routable.Services {
builder.RegisterInstance(new Mock<INotifier>().Object);
builder.RegisterInstance(new Mock<IContentDisplay>().Object);
builder.RegisterType<StubHttpContextAccessor>().As<IHttpContextAccessor>();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterType<ThingHandler>().As<IContentHandler>();

7
src/Orchard.Profile/Tests/Profiling.feature
View File

@@ -22,5 +22,8 @@ Scenario: Hitting blogs
When I go to "/blog4" 10 times
Scenario: Hitting home page
Given I am logged in
When I go to "/" 40 times
//Given I am logged in
When I go to "/" 10 times
When I go to "/" 10 times
When I go to "/" 10 times
When I go to "/" 10 times

42
src/Orchard.Profile/Tests/Profiling.feature.cs generated
View File

@@ -1,7 +1,7 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.3.2.0
// SpecFlow Version:1.4.0.0
// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
@@ -9,12 +9,12 @@
// </auto-generated>
// ------------------------------------------------------------------------------
#region Designer generated code
namespace Orchard.Specs.Le.Tests
namespace Orchard.Profile.Tests
{
using TechTalk.SpecFlow;
[System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.2.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.4.0.0")]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[NUnit.Framework.TestFixtureAttribute()]
[NUnit.Framework.DescriptionAttribute("Profiling")]
@@ -31,7 +31,7 @@ namespace Orchard.Specs.Le.Tests
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Profiling", "In order to profile the site\r\nAs a developer\r\nI want to generate a fixed number o" +
"f repeatable requests", ((string[])(null)));
"f repeatable requests", GenerationTargetLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -61,13 +61,13 @@ namespace Orchard.Specs.Le.Tests
#line 6
this.ScenarioSetup(scenarioInfo);
#line 7
testRunner.Given("I am logged in");
testRunner.Given("I am logged in");
#line 8
testRunner.When("I go to \"/admin\"");
testRunner.When("I go to \"/admin\"");
#line 9
testRunner.When("I go to \"/blog0\"");
testRunner.When("I go to \"/blog0\"");
#line 10
testRunner.When("I go to \"/\"");
testRunner.When("I go to \"/\"");
#line hidden
testRunner.CollectScenarioErrors();
}
@@ -80,9 +80,9 @@ testRunner.When("I go to \"/\"");
#line 12
this.ScenarioSetup(scenarioInfo);
#line 13
testRunner.Given("I am logged in");
testRunner.Given("I am logged in");
#line 14
testRunner.When("I go to \"/admin\" 40 times");
testRunner.When("I go to \"/admin\" 40 times");
#line hidden
testRunner.CollectScenarioErrors();
}
@@ -95,17 +95,17 @@ testRunner.When("I go to \"/admin\" 40 times");
#line 16
this.ScenarioSetup(scenarioInfo);
#line 17
testRunner.Given("I am logged in");
testRunner.Given("I am logged in");
#line 18
testRunner.When("I go to \"/blog0\" 10 times");
testRunner.When("I go to \"/blog0\" 10 times");
#line 19
testRunner.When("I go to \"/blog1\" 10 times");
testRunner.When("I go to \"/blog1\" 10 times");
#line 20
testRunner.When("I go to \"/blog2\" 10 times");
testRunner.When("I go to \"/blog2\" 10 times");
#line 21
testRunner.When("I go to \"/blog3\" 10 times");
testRunner.When("I go to \"/blog3\" 10 times");
#line 22
testRunner.When("I go to \"/blog4\" 10 times");
testRunner.When("I go to \"/blog4\" 10 times");
#line hidden
testRunner.CollectScenarioErrors();
}
@@ -117,10 +117,14 @@ testRunner.When("I go to \"/blog4\" 10 times");
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Hitting home page", ((string[])(null)));
#line 24
this.ScenarioSetup(scenarioInfo);
#line 25
testRunner.Given("I am logged in");
#line 26
testRunner.When("I go to \"/\" 40 times");
testRunner.When("I go to \"/\" 10 times");
#line 27
testRunner.When("I go to \"/\" 10 times");
#line 28
testRunner.When("I go to \"/\" 10 times");
#line 29
testRunner.When("I go to \"/\" 10 times");
#line hidden
testRunner.CollectScenarioErrors();
}

2
src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
View File

@@ -22,7 +22,7 @@ namespace Orchard.Tests.Environment {
}
protected override void Register(ContainerBuilder builder) {
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterAutoMocking();
}

2
src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
View File

@@ -21,7 +21,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
public void Init() {
var builder = new ContainerBuilder();
builder.RegisterType<ShellContextFactory>().As<IShellContextFactory>();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterAutoMocking(Moq.MockBehavior.Strict);
_container = builder.Build();
}

2
src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
View File

@@ -23,7 +23,7 @@ namespace Orchard.Tests.Environment.State {
public void Init() {
var builder = new ContainerBuilder();
builder.RegisterType<DefaultProcessingEngine>().As<IProcessingEngine>();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterAutoMocking();
_container = builder.Build();

2
src/Orchard.Tests/Localization/CultureManagerTests.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.Tests.Localization {
builder.RegisterInstance(new Mock<INotifier>().Object);
builder.RegisterInstance(new Mock<IContentDisplay>().Object);
builder.RegisterType<StubHttpContextAccessor>().As<IHttpContextAccessor>();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<DefaultContentManager>().As<IContentManager>();
builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>();

2
src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs
View File

@@ -36,7 +36,7 @@ namespace Orchard.Tests.Mvc.Routes {
rootBuilder.Register(ctx => _routes);
rootBuilder.RegisterType<ShellRoute>().InstancePerDependency();
rootBuilder.RegisterType<RunningShellTable>().As<IRunningShellTable>().SingleInstance();
rootBuilder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
rootBuilder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
rootBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>();
_rootContainer = rootBuilder.Build();

2
src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
View File

@@ -12,7 +12,7 @@ namespace Orchard.Tests.Tasks {
public class SweepGeneratorTests : ContainerTestBase {
protected override void Register(ContainerBuilder builder) {
builder.RegisterAutoMocking(MockBehavior.Loose);
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<SweepGenerator>();
}

2
src/Orchard.Tests/UI/ShapeTests.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.Tests.UI {
protected override void Register(ContainerBuilder builder) {
builder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<LayoutWorkContext>().As<IWorkContextStateProvider>();

9
src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
View File

@@ -1,7 +1,6 @@
using System.Linq;
using JetBrains.Annotations;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.Core.Common.Models;
using Orchard.Data;
using Orchard.Localization;
@@ -67,9 +66,11 @@ namespace Orchard.Core.Common.Handlers {
bool ContentTypeWithACommonPart(string typeName) {
//Note: What about content type handlers which activate "CommonPart" in code?
var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(typeName);
if (contentTypeDefinition == null)
return false;
return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
if (contentTypeDefinition != null)
return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
return false;
}
void AssignCreatingOwner(InitializingContentContext context, CommonPart part) {

1
src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
View File

@@ -44,6 +44,7 @@
}
var dependencies = (from d in feature.Descriptor.Dependencies
select (from f in Model.Features where f.Descriptor.Id == d select f).SingleOrDefault()).Where(f => f != null).OrderBy(f => f.Descriptor.Name);
@* todo: missingDependencies -- show them in a special way. Can be found like this:
var missingDependencies = feature.Descriptor.Dependencies
.Where(d => !Model.Features.Any(f => f.Descriptor.Id == d));
if (showActions) {

4
src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
View File

@@ -45,6 +45,8 @@ namespace Orchard.Setup {
// standard services needed in setup mode
builder.RegisterModule(new MvcModule());
builder.RegisterModule(new CommandModule());
builder.RegisterModule(new WorkContextModule());
builder.RegisterType<RoutePublisher>().As<IRoutePublisher>().InstancePerLifetimeScope();
builder.RegisterType<ModelBinderPublisher>().As<IModelBinderPublisher>().InstancePerLifetimeScope();
builder.RegisterType<WebFormViewEngineProvider>().As<IViewEngineProvider>().As<IShapeTemplateViewEngine>().InstancePerLifetimeScope();
@@ -58,7 +60,7 @@ namespace Orchard.Setup {
builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>().InstancePerLifetimeScope();
builder.RegisterType<DefaultCommandManager>().As<ICommandManager>().InstancePerLifetimeScope();
builder.RegisterType<HelpCommand>().As<ICommandHandler>().InstancePerLifetimeScope();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
builder.RegisterType<ResourceManifest>().As<IResourceManifestProvider>().InstancePerLifetimeScope();
builder.RegisterType<ResourceManager>().As<IResourceManager>().InstancePerLifetimeScope();
builder.RegisterType<ResourceFilter>().As<IFilterProvider>().InstancePerLifetimeScope();

34
src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs
View File

@@ -38,32 +38,30 @@ namespace Orchard.Users.Services {
public ILogger Logger { get; set; }
public string VerifyUserUnicity(string userName, string email) {
IEnumerable<UserPart> allUsers = _contentManager.Query<UserPart, UserPartRecord>().List();
string normalizedUserName = userName.ToLower();
foreach (var user in allUsers) {
if (String.Equals(userName.ToLower(), user.NormalizedUserName, StringComparison.OrdinalIgnoreCase)) {
return "A user with that name already exists";
}
if (String.Equals(email, user.Email, StringComparison.OrdinalIgnoreCase)) {
return "A user with that email already exists";
}
if (_contentManager.Query<UserPart, UserPartRecord>()
.Where(user =>
user.NormalizedUserName == normalizedUserName ||
user.Email == email)
.List().Any()) {
return "User with that username and/or email already exists.";
}
return null;
}
public string VerifyUserUnicity(int id, string userName, string email) {
IEnumerable<UserPart> allUsers = _contentManager.Query<UserPart, UserPartRecord>().List();
foreach (var user in allUsers) {
if (user.Id == id)
continue;
if (String.Equals(userName.ToLower(), user.NormalizedUserName, StringComparison.OrdinalIgnoreCase)) {
return "A user with that name already exists";
}
if (String.Equals(email, user.Email, StringComparison.OrdinalIgnoreCase)) {
return "A user with that email already exists";
}
string normalizedUserName = userName.ToLower();
if (_contentManager.Query<UserPart, UserPartRecord>()
.Where(user =>
user.NormalizedUserName == normalizedUserName ||
user.Email == email)
.List().Any(user => user.Id != id)) {
return "User with that username and/or email already exists.";
}
return null;
}

70
src/Orchard/Environment/DefaultWorkContextAccessor.cs → src/Orchard/Environment/WorkContextAccessor.cs
View File

@@ -1,13 +1,11 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Autofac;
using Orchard.Mvc;
namespace Orchard.Environment {
public class DefaultWorkContextAccessor : IWorkContextAccessor {
public class WorkContextAccessor : IWorkContextAccessor {
readonly ILifetimeScope _lifetimeScope;
readonly IHttpContextAccessor _httpContextAccessor;
@@ -18,7 +16,7 @@ namespace Orchard.Environment {
[ThreadStatic]
static ConcurrentDictionary<object, WorkContext> _threadStaticContexts;
public DefaultWorkContextAccessor(
public WorkContextAccessor(
IHttpContextAccessor httpContextAccessor,
ILifetimeScope lifetimeScope) {
_httpContextAccessor = httpContextAccessor;
@@ -39,36 +37,23 @@ namespace Orchard.Environment {
}
public IWorkContextScope CreateWorkContextScope(HttpContextBase httpContext) {
var workLifetime = _lifetimeScope.BeginLifetimeScope("work");
workLifetime.Resolve<WorkContextProperty<HttpContextBase>>().Value = httpContext;
var workLifetime = SpawnWorkLifetime(builder => {
builder.Register(ctx => httpContext)
.As<HttpContextBase>();
builder.Register(ctx => new WorkContextImplementation(ctx))
.As<WorkContext>()
.InstancePerMatchingLifetimeScope("work");
});
return new HttpContextScopeImplementation(
workLifetime,
httpContext,
_workContextKey);
}
public IWorkContextScope CreateWorkContextScope() {
var httpContext = _httpContextAccessor.Current();
if (httpContext != null)
return CreateWorkContextScope(httpContext);
var workLifetime = SpawnWorkLifetime(builder => {
builder.Register(ctx => httpContext)
.As<HttpContextBase>();
builder.Register(ctx => new WorkContextImplementation(ctx))
.As<WorkContext>()
.InstancePerMatchingLifetimeScope("work");
});
return new ThreadStaticScopeImplementation(
workLifetime,
_lifetimeScope.BeginLifetimeScope("work"),
EnsureThreadStaticContexts(),
_workContextKey);
}
@@ -77,49 +62,6 @@ namespace Orchard.Environment {
return _threadStaticContexts ?? (_threadStaticContexts = new ConcurrentDictionary<object, WorkContext>());
}
private ILifetimeScope SpawnWorkLifetime(Action<ContainerBuilder> configurationAction) {
return _lifetimeScope.BeginLifetimeScope("work", configurationAction);
}
class WorkContextImplementation : WorkContext {
readonly IComponentContext _componentContext;
readonly ConcurrentDictionary<string, Func<object>> _stateResolvers = new ConcurrentDictionary<string, Func<object>>();
readonly IEnumerable<IWorkContextStateProvider> _workContextStateProviders;
public WorkContextImplementation(IComponentContext componentContext) {
_componentContext = componentContext;
_workContextStateProviders = componentContext.Resolve<IEnumerable<IWorkContextStateProvider>>();
}
public override T Resolve<T>() {
return _componentContext.Resolve<T>();
}
public override bool TryResolve<T>(out T service) {
return _componentContext.TryResolve(out service);
}
public override T GetState<T>(string name) {
var resolver = _stateResolvers.GetOrAdd(name, FindResolverForState<T>);
return (T)resolver();
}
Func<object> FindResolverForState<T>(string name) {
var resolver = _workContextStateProviders.Select(wcsp => wcsp.Get<T>(name))
.FirstOrDefault(value => !Equals(value, default(T)));
if (resolver == null) {
return () => default(T);
}
return () => resolver(this);
}
public override void SetState<T>(string name, T value) {
_stateResolvers[name] = () => value;
}
}
class HttpContextScopeImplementation : IWorkContextScope {
readonly WorkContext _workContext;

45
src/Orchard/Environment/WorkContextImplementation.cs Normal file
View File

@@ -0,0 +1,45 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using Autofac;
namespace Orchard.Environment {
class WorkContextImplementation : WorkContext {
readonly IComponentContext _componentContext;
readonly ConcurrentDictionary<string, Func<object>> _stateResolvers = new ConcurrentDictionary<string, Func<object>>();
readonly IEnumerable<IWorkContextStateProvider> _workContextStateProviders;
public WorkContextImplementation(IComponentContext componentContext) {
_componentContext = componentContext;
_workContextStateProviders = componentContext.Resolve<IEnumerable<IWorkContextStateProvider>>();
}
public override T Resolve<T>() {
return _componentContext.Resolve<T>();
}
public override bool TryResolve<T>(out T service) {
return _componentContext.TryResolve(out service);
}
public override T GetState<T>(string name) {
var resolver = _stateResolvers.GetOrAdd(name, FindResolverForState<T>);
return (T)resolver();
}
Func<object> FindResolverForState<T>(string name) {
var resolver = Enumerable.FirstOrDefault(_workContextStateProviders.Select(wcsp => wcsp.Get<T>(name)), value => !Equals(value, default(T)));
if (resolver == null) {
return () => default(T);
}
return () => resolver(this);
}
public override void SetState<T>(string name, T value) {
_stateResolvers[name] = () => value;
}
}
}

24
src/Orchard/Environment/WorkContextModule.cs Normal file
View File

@@ -0,0 +1,24 @@
using System.Web;
using Autofac;
namespace Orchard.Environment {
public class WorkContextModule : Module {
protected override void Load(ContainerBuilder builder) {
builder.RegisterType<WorkContextAccessor>()
.As<IWorkContextAccessor>()
.InstancePerMatchingLifetimeScope("shell");
builder.Register(ctx => new WorkContextImplementation(ctx))
.As<WorkContext>()
.InstancePerMatchingLifetimeScope("work");
builder.RegisterType<WorkContextProperty<HttpContextBase>>()
.As<WorkContextProperty<HttpContextBase>>()
.InstancePerMatchingLifetimeScope("work");
builder.Register(ctx => ctx.Resolve<WorkContextProperty<HttpContextBase>>().Value)
.As<HttpContextBase>()
.InstancePerDependency();
}
}
}

5
src/Orchard/Environment/WorkContextProperty.cs Normal file
View File

@@ -0,0 +1,5 @@
namespace Orchard.Environment {
class WorkContextProperty<T> {
public T Value { get; set; }
}
}

2
src/Orchard/IWorkContextAccessor.cs
View File

@@ -2,7 +2,7 @@
using System.Web;
namespace Orchard {
public interface IWorkContextAccessor : ISingletonDependency {
public interface IWorkContextAccessor {
WorkContext GetContext(HttpContextBase httpContext);
IWorkContextScope CreateWorkContextScope(HttpContextBase httpContext);

4
src/Orchard/Mvc/OrchardControllerFactory.cs
View File

@@ -36,10 +36,10 @@ namespace Orchard.Mvc {
var serviceKey = (areaName + "/" + controllerName).ToLowerInvariant();
// Now that the request container is known - try to resolve the controller information
Lazy<Meta<IController>> info;
Meta<Lazy<IController>> info;
var workContext = requestContext.GetWorkContext();
if (TryResolve(workContext, serviceKey, out info)) {
return (Type) info.Value.Metadata["ControllerType"];
return (Type) info.Metadata["ControllerType"];
}
return null;

5
src/Orchard/Orchard.Framework.csproj
View File

@@ -158,6 +158,9 @@
<Compile Include="Environment\Extensions\Loaders\RawThemeExtensionLoader.cs" />
<Compile Include="Environment\Features\FeatureManager.cs" />
<Compile Include="Environment\IAssemblyLoader.cs" />
<Compile Include="Environment\WorkContextImplementation.cs" />
<Compile Include="Environment\WorkContextModule.cs" />
<Compile Include="Environment\WorkContextProperty.cs" />
<Compile Include="Localization\Services\CurrentCultureWorkContext.cs" />
<Compile Include="Localization\Services\DefaultLocalizedStringManager.cs" />
<Compile Include="Localization\Services\ILocalizedStringManager.cs" />
@@ -419,7 +422,7 @@
<Compile Include="DisplayManagement\Implementation\IDisplayManager.cs" />
<Compile Include="DisplayManagement\IShapeFactory.cs" />
<Compile Include="DisplayManagement\Descriptors\Interfaces.cs" />
<Compile Include="Environment\DefaultWorkContextAccessor.cs" />
<Compile Include="Environment\WorkContextAccessor.cs" />
<Compile Include="Environment\IHostLocalRestart.cs" />
<Compile Include="Environment\IShellContainerRegistrations.cs" />
<Compile Include="FileSystems\Dependencies\DynamicModuleVirtualPathProvider.cs" />