lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#17830: Registering ServiceRoutes after MVCRoutes. Using existing WorkContext in OrchardFactory in case of aspnetcompatibilitymode.

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues 2011-05-18 13:25:57 -07:00
parent eed3340e89
commit 6a88f44e73
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard/Mvc/Routes/RoutePublisher.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.ServiceModel.Activation;
using System.Web.Routing;
using Autofac;
using Orchard.Environment;
@ -24,7 +25,10 @@ namespace Orchard.Mvc.Routes {
}
public void Publish(IEnumerable<RouteDescriptor> routes) {
var routesArray = routes.OrderByDescending(r => r.Priority).ToArray();
var routesArray = routes
.OrderByDescending(r => r.Route is ServiceRoute ? -1 : 1)
.ThenByDescending(r => r.Priority)
.ToArray();
// this is not called often, but is intended to surface problems before
// the actual collection is modified

14
src/Orchard/Wcf/OrchardInstanceContext.cs
View File

@ -7,9 +7,15 @@ using Autofac.Core;
namespace Orchard.Wcf {
public class OrchardInstanceContext : IExtension<InstanceContext>, IDisposable {
private readonly IWorkContextScope _workContextScope;
private readonly WorkContext _workContext;
public OrchardInstanceContext(IWorkContextAccessor workContextAccessor) {
_workContextScope = workContextAccessor.CreateWorkContextScope();
_workContext = workContextAccessor.GetContext();
if (_workContext == null) {
_workContextScope = workContextAccessor.CreateWorkContextScope();
_workContext = _workContextScope.WorkContext;
}
}
public void Attach(InstanceContext owner) {}
@ -17,7 +23,9 @@ namespace Orchard.Wcf {
public void Detach(InstanceContext owner) {}
public void Dispose() {
_workContextScope.Dispose();
if (_workContextScope != null) {
_workContextScope.Dispose();
}
}
public object Resolve(IComponentRegistration registration) {
@ -25,7 +33,7 @@ namespace Orchard.Wcf {
throw new ArgumentNullException("registration");
}
return _workContextScope.Resolve<ILifetimeScope>().Resolve(registration, Enumerable.Empty<Parameter>());
return _workContext.Resolve<ILifetimeScope>().Resolve(registration, Enumerable.Empty<Parameter>());
}
}
}

30
src/Orchard/Wcf/OrchardServiceHostFactory.cs
View File

@ -37,17 +37,17 @@ namespace Orchard.Wcf {
IOrchardHost orchardHost = HostContainer.Resolve<IOrchardHost>();
ShellContext shellContext = orchardHost.GetShellContext(shellSettings);
IWorkContextAccessor workContextAccessor = shellContext.LifetimeScope.Resolve<IWorkContextAccessor>();
using (IWorkContextScope workContext = workContextAccessor.CreateWorkContextScope()) {
ILifetimeScope lifetimeScope = workContext.Resolve<ILifetimeScope>();
if (!lifetimeScope.ComponentRegistry.TryGetRegistration(new KeyedService(constructorString, typeof (object)), out registration)) {
Type serviceType = Type.GetType(constructorString, false);
if (serviceType != null) {
lifetimeScope.ComponentRegistry.TryGetRegistration(new TypedService(serviceType), out registration);
}
WorkContext workContext = workContextAccessor.GetContext();
if (workContext == null) {
using (IWorkContextScope workContextScope = workContextAccessor.CreateWorkContextScope()) {
ILifetimeScope lifetimeScope = workContextScope.Resolve<ILifetimeScope>();
registration = GetRegistration(lifetimeScope, constructorString);
}
}
else {
ILifetimeScope lifetimeScope = workContext.Resolve<ILifetimeScope>();
registration = GetRegistration(lifetimeScope, constructorString);
}
if (registration == null) {
throw new InvalidOperationException();
@ -69,5 +69,17 @@ namespace Orchard.Wcf {
return host;
}
private IComponentRegistration GetRegistration(ILifetimeScope lifetimeScope, string constructorString) {
IComponentRegistration registration;
if (!lifetimeScope.ComponentRegistry.TryGetRegistration(new KeyedService(constructorString, typeof(object)), out registration)) {
Type serviceType = Type.GetType(constructorString, false);
if (serviceType != null) {
lifetimeScope.ComponentRegistry.TryGetRegistration(new TypedService(serviceType), out registration);
}
}
return registration;
}
}
}