lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-18 17:47:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-06-30 20:57:40 -07:00
parent 188a0b5314
commit 65c3ff3cd7
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,11 +61,11 @@ namespace Orchard.Tests.Environment.Extensions {
throw new NotImplementedException();
}
public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
throw new NotImplementedException();
}
public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
throw new NotImplementedException();
}
@@ -73,7 +73,7 @@ namespace Orchard.Tests.Environment.Extensions {
return new ExtensionProbeEntry { Descriptor = descriptor, Loader = this };
}
public IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
public IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
throw new NotImplementedException();
}

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

@@ -60,11 +60,11 @@ namespace Orchard.Tests.Environment.Extensions {
throw new NotImplementedException();
}
public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
throw new NotImplementedException();
}
public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
throw new NotImplementedException();
}
@@ -72,7 +72,7 @@ namespace Orchard.Tests.Environment.Extensions {
return new ExtensionProbeEntry { Descriptor = descriptor, Loader = this };
}
public IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
public IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
throw new NotImplementedException();
}

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

@@ -159,7 +159,7 @@ namespace Orchard.Environment.Extensions {
var referenceNames = (context.ReferencesByModule.ContainsKey(activatedExtension.Descriptor.Name) ?
context.ReferencesByModule[activatedExtension.Descriptor.Name] :
Enumerable.Empty<ExtensionReferenceEntry>())
Enumerable.Empty<ExtensionReferenceProbeEntry>())
.Select(r => r.Name)
.Distinct(StringComparer.OrdinalIgnoreCase);
@@ -184,7 +184,7 @@ namespace Orchard.Environment.Extensions {
var references = context.ReferencesByName.ContainsKey(referenceName) ?
context.ReferencesByName[referenceName] :
Enumerable.Empty<ExtensionReferenceEntry>();
Enumerable.Empty<ExtensionReferenceProbeEntry>();
// Binary references
var bestBinaryReference = references

6
src/Orchard/Environment/Extensions/ExtensionLoadingContext.cs
View File

@@ -51,11 +51,11 @@ namespace Orchard.Environment.Extensions {
/// <summary>
/// For every reference name, list of potential loaders/locations
/// </summary>
public IDictionary<string, IEnumerable<ExtensionReferenceEntry>> ReferencesByModule { get; set; }
public IDictionary<string, IEnumerable<ExtensionReferenceProbeEntry>> ReferencesByModule { get; set; }
/// <summary>
/// For every extension name, list of references
/// For every extension name, list of potential loaders/locations
/// </summary>
public IDictionary<string, IEnumerable<ExtensionReferenceEntry>> ReferencesByName { get; set; }
public IDictionary<string, IEnumerable<ExtensionReferenceProbeEntry>> ReferencesByName { get; set; }
}
}

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

@@ -79,15 +79,15 @@ namespace Orchard.Environment.Extensions.Loaders {
}
}
public override IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor descriptor) {
public override IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor descriptor) {
string projectPath = GetProjectPath(descriptor);
if (projectPath == null)
return Enumerable.Empty<ExtensionReferenceEntry>();
return Enumerable.Empty<ExtensionReferenceProbeEntry>();
using(var stream = _virtualPathProvider.OpenFile(projectPath)) {
var projectFile = _projectFileParser.Parse(stream);
return projectFile.References.Select(r => new ExtensionReferenceEntry {
return projectFile.References.Select(r => new ExtensionReferenceProbeEntry {
Descriptor = descriptor,
Loader = this,
Name = r.AssemblyName,

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

@@ -17,8 +17,8 @@ namespace Orchard.Environment.Extensions.Loaders {
public abstract int Order { get; }
public string Name { get { return this.GetType().Name; } }
public virtual IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor descriptor) {
return Enumerable.Empty<ExtensionReferenceEntry>();
public virtual IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor descriptor) {
return Enumerable.Empty<ExtensionReferenceProbeEntry>();
}
public virtual Assembly LoadReference(DependencyReferenceDescriptor reference) {
@@ -35,8 +35,8 @@ namespace Orchard.Environment.Extensions.Loaders {
return null;
}
public virtual void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) { }
public virtual void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) { }
public virtual void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) { }
public virtual void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) { }
public virtual void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { }
public virtual void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { }

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

@@ -13,7 +13,7 @@ namespace Orchard.Environment.Extensions.Loaders {
public DateTime LastModificationTimeUtc { get; set; }
}
public class ExtensionReferenceEntry {
public class ExtensionReferenceProbeEntry {
public ExtensionDescriptor Descriptor { get; set; }
public IExtensionLoader Loader { get; set; }
public string Name { get; set; }
@@ -24,10 +24,10 @@ namespace Orchard.Environment.Extensions.Loaders {
int Order { get; }
string Name { get; }
IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor);
IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor);
Assembly LoadReference(DependencyReferenceDescriptor reference);
void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry);
void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry);
void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry);
void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry);
ExtensionProbeEntry Probe(ExtensionDescriptor descriptor);
ExtensionEntry Load(ExtensionDescriptor descriptor);

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

@@ -95,7 +95,7 @@ namespace Orchard.Environment.Extensions.Loaders {
}
}
public override void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
public override void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
if (string.IsNullOrEmpty(referenceEntry.VirtualPath))
return;
@@ -125,16 +125,16 @@ namespace Orchard.Environment.Extensions.Loaders {
}
}
public override IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor descriptor) {
public override IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor descriptor) {
var assemblyPath = GetAssemblyPath(descriptor);
if (assemblyPath == null)
return Enumerable.Empty<ExtensionReferenceEntry>();
return Enumerable.Empty<ExtensionReferenceProbeEntry>();
return _virtualPathProvider
.ListFiles(_virtualPathProvider.GetDirectoryName(assemblyPath))
.Where(s => StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(s), ".dll"))
.Where(s => !StringComparer.OrdinalIgnoreCase.Equals(Path.GetFileNameWithoutExtension(s), descriptor.Name))
.Select(path => new ExtensionReferenceEntry {
.Select(path => new ExtensionReferenceProbeEntry {
Descriptor = descriptor,
Loader = this,
Name = Path.GetFileNameWithoutExtension(path),