yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completes: U4-2742 Remove legacy xsltExtensions.config - xslt extensions are configured using attributes

Browse Source
This commit is contained in:
Shannon
2013-08-29 17:14:34 +10:00
parent cd7f737fa6
commit 733b6aa945
27 changed files with 236 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/Umbraco.Web.UI/install/steps/Renaming.ascx.cs
View File

@@ -12,10 +12,7 @@ namespace Umbraco.Web.UI.Install.Steps
private bool _changesNeeded = false;
protected void Page_Load(object sender, EventArgs e)
{
// check xslt extensions
identifyResult.Text += CheckExtensionPaths("xsltExtensions.config", "XSLT Extension");
{
// check access.xml file
identifyResult.Text += CheckAccessFile();
@@ -49,54 +46,7 @@ namespace Umbraco.Web.UI.Install.Steps
{
return File.Exists(_newAccessFilePath);
}
private string CheckExtensionPaths(string filename, string extensionName)
{
string tempResult = "";
foreach (XmlNode ext in GetExtensions(filename, "ext"))
{
if (ext.Attributes.GetNamedItem("assembly") != null &&
ext.Attributes.GetNamedItem("assembly").Value.StartsWith("/bin/"))
{
tempResult += String.Format("<li>{0} with Alias '{1}' has assembly reference that contains /bin/. That part needs to be removed</li>",
extensionName,
ext.Attributes.GetNamedItem("alias").Value);
}
}
if (String.IsNullOrEmpty(tempResult))
{
tempResult = String.Format("<li>{0}s are all good. No changes needed</li>", extensionName);
}
else
{
_changesNeeded = true;
}
return tempResult;
}
private static void UpdateExtensionPaths(string filename)
{
filename = IOHelper.MapPath(SystemDirectories.Config + "/" + filename);
var xsltExt = new XmlDocument();
xsltExt.Load(filename);
foreach (XmlNode ext in xsltExt.SelectNodes("//ext"))
{
if (ext.Attributes.GetNamedItem("assembly") != null &&
ext.Attributes.GetNamedItem("assembly").Value.StartsWith("/bin/"))
{
ext.Attributes.GetNamedItem("assembly").Value =
ext.Attributes.GetNamedItem("assembly").Value.Substring(5);
}
}
xsltExt.Save(filename);
}
protected void UpdateChangesClick(object sender, EventArgs e)
{
bool succes = true;
@@ -115,19 +65,7 @@ namespace Umbraco.Web.UI.Install.Steps
progressText += String.Format("<li>Error renaming access file: {0}</li>", ee.ToString());
succes = false;
}
}
// update xslt exts
try
{
UpdateExtensionPaths("xsltExtensions.config");
progressText += "<li>xsltExtensions.config ensured.</li>";
}
catch (Exception ee)
{
progressText += String.Format("<li>Error updating xsltExtensions.config: {0}</li>", ee.ToString());
succes = false;
}
}
string resultClass = succes ? "success" : "error";
resultText.Text = String.Format("<div class=\"{0}\"><p>{1}</p></div>",
@@ -137,14 +75,5 @@ namespace Umbraco.Web.UI.Install.Steps
init.Visible = false;
}
private XmlNodeList GetExtensions(string filename, string elementName)
{
// Load the XSLT extensions configuration
var xsltExt = new XmlDocument();
xsltExt.Load(IOHelper.MapPath(SystemDirectories.Config + "/" + filename));
return xsltExt.SelectNodes("//" + elementName);
}
}
}