lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename ReferenceDescriptor to DependencyReferenceDescriptor

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-06-30 20:01:44 -07:00
parent 74710b6c26
commit afc5979c10
9 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
View File

@@ -57,7 +57,7 @@ namespace Orchard.Tests.Environment.Extensions {
get { return this.GetType().Name; }
}
public Assembly LoadReference(ReferenceDescriptor reference) {
public Assembly LoadReference(DependencyReferenceDescriptor reference) {
throw new NotImplementedException();
}

2
src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
View File

@@ -56,7 +56,7 @@ namespace Orchard.Tests.Environment.Extensions {
get { throw new NotImplementedException(); }
}
public Assembly LoadReference(ReferenceDescriptor reference) {
public Assembly LoadReference(DependencyReferenceDescriptor reference) {
throw new NotImplementedException();
}

12
src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
View File

@@ -153,9 +153,9 @@ namespace Orchard.Environment.Extensions {
}
}
IEnumerable<ReferenceDescriptor> ProcessExtensionReferences(ExtensionLoadingContext context, ExtensionProbeEntry activatedExtension) {
IEnumerable<DependencyReferenceDescriptor> ProcessExtensionReferences(ExtensionLoadingContext context, ExtensionProbeEntry activatedExtension) {
if (activatedExtension == null)
return Enumerable.Empty<ReferenceDescriptor>();
return Enumerable.Empty<DependencyReferenceDescriptor>();
var referenceNames = (context.ReferencesByModule.ContainsKey(activatedExtension.Descriptor.Name) ?
context.ReferencesByModule[activatedExtension.Descriptor.Name] :
@@ -163,7 +163,7 @@ namespace Orchard.Environment.Extensions {
.Select(r => r.Name)
.Distinct(StringComparer.OrdinalIgnoreCase);
var referencesDecriptors = new List<ReferenceDescriptor>();
var referencesDecriptors = new List<DependencyReferenceDescriptor>();
foreach (var referenceName in referenceNames) {
ProcessExtensionReference(context, activatedExtension, referenceName, referencesDecriptors);
}
@@ -174,7 +174,7 @@ namespace Orchard.Environment.Extensions {
private void ProcessExtensionReference(ExtensionLoadingContext context,
ExtensionProbeEntry activatedExtension,
string referenceName,
IList<ReferenceDescriptor> activatedReferences) {
IList<DependencyReferenceDescriptor> activatedReferences) {
// Assemblies loaded by the BuildManager are ignored, since
// we don't want to update them and they are automatically
@@ -213,7 +213,7 @@ namespace Orchard.Environment.Extensions {
context.ProcessedReferences.Add(bestBinaryReference.Entry.Name);
bestBinaryReference.Entry.Loader.ReferenceActivated(context, bestBinaryReference.Entry);
}
activatedReferences.Add(new ReferenceDescriptor {
activatedReferences.Add(new DependencyReferenceDescriptor {
LoaderName = bestBinaryReference.Entry.Loader.Name,
Name = bestBinaryReference.Entry.Name,
VirtualPath = bestBinaryReference.Entry.VirtualPath
@@ -224,7 +224,7 @@ namespace Orchard.Environment.Extensions {
// Activated the module ref
if (bestProbe != null)
{
activatedReferences.Add(new ReferenceDescriptor {
activatedReferences.Add(new DependencyReferenceDescriptor {
LoaderName = bestProbe.Loader.Name,
Name = referenceName,
VirtualPath = bestProbe.VirtualPath

3
src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs
View File

@@ -9,7 +9,6 @@ using Orchard.Environment.Extensions.Models;
using Orchard.FileSystems.Dependencies;
using Orchard.FileSystems.VirtualPath;
using Orchard.Logging;
using ReferenceDescriptor = Orchard.FileSystems.Dependencies.ReferenceDescriptor;
namespace Orchard.Environment.Extensions.Loaders {
public class DynamicExtensionLoader : ExtensionLoaderBase {
@@ -97,7 +96,7 @@ namespace Orchard.Environment.Extensions.Loaders {
}
}
public override Assembly LoadReference(ReferenceDescriptor reference) {
public override Assembly LoadReference(DependencyReferenceDescriptor reference) {
return _buildManager.GetCompiledAssembly(reference.VirtualPath);
}

2
src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs
View File

@@ -21,7 +21,7 @@ namespace Orchard.Environment.Extensions.Loaders {
return Enumerable.Empty<ExtensionReferenceEntry>();
}
public virtual Assembly LoadReference(ReferenceDescriptor reference) {
public virtual Assembly LoadReference(DependencyReferenceDescriptor reference) {
return null;
}

2
src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs
View File

@@ -25,7 +25,7 @@ namespace Orchard.Environment.Extensions.Loaders {
string Name { get; }
IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor);
Assembly LoadReference(ReferenceDescriptor reference);
Assembly LoadReference(DependencyReferenceDescriptor reference);
void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry);
void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry);

2
src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs
View File

@@ -155,7 +155,7 @@ namespace Orchard.Environment.Extensions.Loaders {
};
}
public override Assembly LoadReference(ReferenceDescriptor reference) {
public override Assembly LoadReference(DependencyReferenceDescriptor reference) {
return _assemblyProbingFolder.LoadAssembly(reference.Name);
}

8
src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs
View File

@@ -70,7 +70,7 @@ namespace Orchard.FileSystems.Dependencies {
Name = elem(e, "ModuleName"),
VirtualPath = elem(e, "VirtualPath"),
LoaderName = elem(e, "LoaderName"),
References = e.Elements(ns("References")).Elements(ns("Reference")).Select(r => new ReferenceDescriptor {
References = e.Elements(ns("References")).Elements(ns("Reference")).Select(r => new DependencyReferenceDescriptor {
Name = elem(r, "Name"),
LoaderName = elem(r, "LoaderName"),
VirtualPath = elem(r, "VirtualPath")
@@ -127,8 +127,8 @@ namespace Orchard.FileSystems.Dependencies {
}
}
private class ReferenceDescriptorComparer : EqualityComparer<ReferenceDescriptor> {
public override bool Equals(ReferenceDescriptor x, ReferenceDescriptor y) {
private class ReferenceDescriptorComparer : EqualityComparer<DependencyReferenceDescriptor> {
public override bool Equals(DependencyReferenceDescriptor x, DependencyReferenceDescriptor y) {
return
StringComparer.OrdinalIgnoreCase.Equals(x.Name, y.Name) &&
StringComparer.OrdinalIgnoreCase.Equals(x.LoaderName, y.LoaderName) &&
@@ -136,7 +136,7 @@ namespace Orchard.FileSystems.Dependencies {
}
public override int GetHashCode(ReferenceDescriptor obj) {
public override int GetHashCode(DependencyReferenceDescriptor obj) {
return
StringComparer.OrdinalIgnoreCase.GetHashCode(obj.Name) ^
StringComparer.OrdinalIgnoreCase.GetHashCode(obj.LoaderName) ^

6
src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs
View File

@@ -5,15 +5,15 @@ using Orchard.Caching;
namespace Orchard.FileSystems.Dependencies {
public class DependencyDescriptor {
public DependencyDescriptor() {
References = Enumerable.Empty<ReferenceDescriptor>();
References = Enumerable.Empty<DependencyReferenceDescriptor>();
}
public string Name { get; set; }
public string LoaderName { get; set; }
public string VirtualPath { get; set; }
public IEnumerable<ReferenceDescriptor> References { get; set; }
public IEnumerable<DependencyReferenceDescriptor> References { get; set; }
}
public class ReferenceDescriptor {
public class DependencyReferenceDescriptor {
public string Name { get; set; }
public string LoaderName { get; set; }
public string VirtualPath { get; set; }