Revert "updated nancy to 0.17.1.0"

This reverts commit 92c3fe61f2.
This commit is contained in:
kay.one 2013-07-06 21:36:37 -07:00
commit d34b527842
10 changed files with 36 additions and 39 deletions

View file

@ -20,6 +20,15 @@ namespace NzbDrone.Api
return this.ApplicationContainer.Resolve<INancyEngine>();
}
/// <summary>
/// Get the moduleKey generator
/// </summary>
/// <returns>IModuleKeyGenerator instance</returns>
protected override sealed IModuleKeyGenerator GetModuleKeyGenerator()
{
return this.ApplicationContainer.Resolve<IModuleKeyGenerator>();
}
/// <summary>
/// Create a default, unconfigured, container
/// </summary>
@ -79,8 +88,8 @@ namespace NzbDrone.Api
container.Register(
typeof(INancyModule),
moduleRegistrationType.ModuleType,
moduleRegistrationType.ModuleType.FullName).
AsSingleton();
moduleRegistrationType.ModuleKey).
AsSingleton();
}
}
@ -147,14 +156,14 @@ namespace NzbDrone.Api
}
/// <summary>
/// Retreive a specific module instance from the container
/// Retreive a specific module instance from the container by its key
/// </summary>
/// <param name="container">Container to use</param>
/// <param name="moduleType">Type of the module</param>
/// <param name="moduleKey">Module key of the module</param>
/// <returns>NancyModule instance</returns>
protected override sealed INancyModule GetModule(TinyIoCContainer container, Type moduleType)
protected override sealed INancyModule GetModuleByKey(TinyIoCContainer container, string moduleKey)
{
return (INancyModule)container.Resolve(moduleType);
return container.Resolve<INancyModule>(moduleKey);
}
/// <summary>