zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Helicon Ape module & handler types fixed

Browse source
This commit is contained in:
ruslan 2012-03-15 13:26:47 +02:00
parent 8151a6b687
commit 6726fc2ff7
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
View file

@ -1959,12 +1959,12 @@ namespace WebsitePanel.Providers.Web
if (version.Equals(HELICON_APE_NOT_REGISTERED)) if (version.Equals(HELICON_APE_NOT_REGISTERED))
{ {
// Ape installed for site // Ape installed for site
return "Helicon.Ape.Module"; return "Helicon.Ape.ApeModule";
} }
else else
{ {
// Ape installed globally in GAC // Ape installed globally in GAC
// return fiil type with version // return full type with version
return return
string.Format( string.Format(
"Helicon.Ape.ApeModule, Helicon.Ape, Version={0}, Culture=neutral, PublicKeyToken=95bfbfd1a38437eb", "Helicon.Ape.ApeModule, Helicon.Ape, Version={0}, Culture=neutral, PublicKeyToken=95bfbfd1a38437eb",
@ -1972,6 +1972,27 @@ namespace WebsitePanel.Providers.Web
} }
} }
private string GetHeliconApeHandlerType(string siteId)
{
string installDir = GetHeliconApeInstallDir(siteId);
string version = GetHeliconApeVersion(siteId, installDir);
if (version.Equals(HELICON_APE_NOT_REGISTERED))
{
// Ape installed for site
return "Helicon.Ape.Handler";
}
else
{
// Ape installed globally in GAC
// return full type with version
return
string.Format(
"Helicon.Ape.Handler, Helicon.Ape, Version={0}, Culture=neutral, PublicKeyToken=95bfbfd1a38437eb",
version);
}
}
private string FindregistrationInfo(string path) private string FindregistrationInfo(string path)
{ {
System.Text.RegularExpressions.Regex reRegistrationName = new System.Text.RegularExpressions.Regex("^\\s*RegistrationName\\s*=\\s*([^#=]+)\\s*(?:#.*)?", System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.CultureInvariant | System.Text.RegularExpressions.RegexOptions.Compiled); System.Text.RegularExpressions.Regex reRegistrationName = new System.Text.RegularExpressions.Regex("^\\s*RegistrationName\\s*=\\s*([^#=]+)\\s*(?:#.*)?", System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.CultureInvariant | System.Text.RegularExpressions.RegexOptions.Compiled);
@ -2158,7 +2179,7 @@ namespace WebsitePanel.Providers.Web
ConfigurationElementCollection handlersCollection = handlersSection.GetCollection(); ConfigurationElementCollection handlersCollection = handlersSection.GetCollection();
ConfigurationElement handlerAdd = handlersCollection.CreateElement("add"); ConfigurationElement handlerAdd = handlersCollection.CreateElement("add");
handlerAdd["name"] = Constants.HeliconApeModule; handlerAdd["name"] = Constants.HeliconApeModule;
handlerAdd["type"] = GetHeliconApeModuleType(siteId); handlerAdd["type"] = GetHeliconApeHandlerType(siteId);
handlerAdd["path"] = Constants.HeliconApeHandlerPath; handlerAdd["path"] = Constants.HeliconApeHandlerPath;
handlerAdd["verb"] = "*"; handlerAdd["verb"] = "*";
handlerAdd["resourceType"] = "Unspecified"; handlerAdd["resourceType"] = "Unspecified";