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

Fixing some badly resolved merge conflicts

Browse Source 
--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-04-14 14:50:53 -07:00
parent cef5d9bb3d
commit 247e077d2c
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
View File

@@ -77,10 +77,11 @@ namespace Orchard.Tests.Environment {
return Enumerable.Empty<ExtensionEntry>(); return Enumerable.Empty<ExtensionEntry>();
} }
public IEnumerable<Type> LoadFeature(string featureName) { public ShellTopology_Obsolete GetExtensionsTopology() {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public IEnumerable<Type> LoadFeature(string featureName) {
throw new NotImplementedException(); throw new NotImplementedException();
} }

6
src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs
View File

@@ -54,12 +54,14 @@ namespace Orchard.Tests.Mvc.Routes {
}; };
} }
public ShellTopology_Obsolete GetExtensionsTopology() {
throw new NotImplementedException();
}
public IEnumerable<Type> LoadFeature(string featureName) { public IEnumerable<Type> LoadFeature(string featureName) {
throw new NotImplementedException(); throw new NotImplementedException();
} }
throw new NotImplementedException();
}
public void InstallExtension(string extensionType, HttpPostedFileBase extensionBundle) { public void InstallExtension(string extensionType, HttpPostedFileBase extensionBundle) {
throw new NotImplementedException(); throw new NotImplementedException();

4
src/Orchard/Extensions/ExtensionManager.cs
View File

@@ -103,10 +103,10 @@ namespace Orchard.Extensions {
return featureDescriptors; return featureDescriptors;
} }
public ShellTopology GetExtensionsTopology() { public ShellTopology_Obsolete GetExtensionsTopology() {
var types = ActiveExtensions().SelectMany(x => x.ExportedTypes); var types = ActiveExtensions().SelectMany(x => x.ExportedTypes);
types = types.Concat(typeof(IOrchardHost).Assembly.GetExportedTypes()); types = types.Concat(typeof(IOrchardHost).Assembly.GetExportedTypes());
return new ShellTopology { Types = types.Where(t => t.IsClass && !t.IsAbstract) }; return new ShellTopology_Obsolete { Types = types.Where(t => t.IsClass && !t.IsAbstract) };
} }
public IEnumerable<Type> LoadFeature(string featureName) { public IEnumerable<Type> LoadFeature(string featureName) {

1
src/Orchard/Extensions/IExtensionManager.cs
View File

@@ -6,6 +6,7 @@ namespace Orchard.Extensions {
public interface IExtensionManager { public interface IExtensionManager {
IEnumerable<ExtensionDescriptor> AvailableExtensions(); IEnumerable<ExtensionDescriptor> AvailableExtensions();
IEnumerable<ExtensionEntry> ActiveExtensions(); IEnumerable<ExtensionEntry> ActiveExtensions();
ShellTopology_Obsolete GetExtensionsTopology();
IEnumerable<Type> LoadFeature(string featureName); IEnumerable<Type> LoadFeature(string featureName);
void InstallExtension(string extensionType, HttpPostedFileBase extensionBundle); void InstallExtension(string extensionType, HttpPostedFileBase extensionBundle);
void UninstallExtension(string extensionType, string extensionName); void UninstallExtension(string extensionType, string extensionName);