From ebd87e0eaa1a97827a9fcd218b2df3a8b2837063 Mon Sep 17 00:00:00 2001
From: leekelleher <unknown@kiln.example.com>
Date: Thu, 23 Aug 2012 17:55:45 -0100
Subject: [PATCH] Implemented U4-86 - Move EXSLT references from being
 predefined in core to xsltExtensions.config

---
 .../config/xsltExtensions.Release.config       | 12 ++++++++----
 .../config/xsltExtensions.config               | 18 ++++++++++--------
 src/Umbraco.Web/umbraco.presentation/macro.cs  | 14 +++++++-------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/xsltExtensions.Release.config b/src/Umbraco.Web.UI/config/xsltExtensions.Release.config
index 2fb354dac8..17962f8205 100644
--- a/src/Umbraco.Web.UI/config/xsltExtensions.Release.config
+++ b/src/Umbraco.Web.UI/config/xsltExtensions.Release.config
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <XsltExtensions>
-  <!--
-  This file is used to register 3rt party xslt extensions (methods you can execute from xslt, like umbraco.library:NiceUrl)
-	<ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom">
-  -->
+	<!-- This file is used to register 3rd party XSLT extensions (methods you can execute from XSLT, like umbraco.library:NiceUrl) -->
+	<!-- <ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom" /> -->
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltCommon" alias="Exslt.ExsltCommon" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltDatesAndTimes" alias="Exslt.ExsltDatesAndTimes" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltMath" alias="Exslt.ExsltMath" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltRegularExpressions" alias="Exslt.ExsltRegularExpressions" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltStrings" alias="Exslt.ExsltStrings" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltSets" alias="Exslt.ExsltSets" />
 </XsltExtensions>
diff --git a/src/Umbraco.Web.UI/config/xsltExtensions.config b/src/Umbraco.Web.UI/config/xsltExtensions.config
index ec28d3d403..17962f8205 100644
--- a/src/Umbraco.Web.UI/config/xsltExtensions.config
+++ b/src/Umbraco.Web.UI/config/xsltExtensions.config
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <XsltExtensions>
-  <!-- <ext assembly="your.assemblyName" type="your.class.name" alias="yourAlias">
-  </ext> -->
-  <ext assembly="umbraco.editorControls" type="umbraco.editorControls.tags.library" alias="tagsLib">
-  </ext>
-  <ext assembly="Runway.Blog" type="Runway.Blog.BlogLibrary" alias="BlogLibrary">
-  </ext>
-</XsltExtensions>
\ No newline at end of file
+	<!-- This file is used to register 3rd party XSLT extensions (methods you can execute from XSLT, like umbraco.library:NiceUrl) -->
+	<!-- <ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom" /> -->
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltCommon" alias="Exslt.ExsltCommon" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltDatesAndTimes" alias="Exslt.ExsltDatesAndTimes" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltMath" alias="Exslt.ExsltMath" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltRegularExpressions" alias="Exslt.ExsltRegularExpressions" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltStrings" alias="Exslt.ExsltStrings" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltSets" alias="Exslt.ExsltSets" />
+</XsltExtensions>
diff --git a/src/Umbraco.Web/umbraco.presentation/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs
index f3c6116e42..acad28285a 100644
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -867,13 +867,13 @@ namespace umbraco
             {
                 m_PredefinedExtensions = new Dictionary<string, object>();
 
-                // add predefined EXSLT extensions
-                m_PredefinedExtensions.Add("Exslt.ExsltCommon", new ExsltCommon());
-                m_PredefinedExtensions.Add("Exslt.ExsltDatesAndTimes", new ExsltDatesAndTimes());
-                m_PredefinedExtensions.Add("Exslt.ExsltMath", new ExsltMath());
-                m_PredefinedExtensions.Add("Exslt.ExsltRegularExpressions", new ExsltRegularExpressions());
-                m_PredefinedExtensions.Add("Exslt.ExsltStrings", new ExsltStrings());
-                m_PredefinedExtensions.Add("Exslt.ExsltSets", new ExsltSets());
+                //// add predefined EXSLT extensions
+                //m_PredefinedExtensions.Add("Exslt.ExsltCommon", new ExsltCommon());
+                //m_PredefinedExtensions.Add("Exslt.ExsltDatesAndTimes", new ExsltDatesAndTimes());
+                //m_PredefinedExtensions.Add("Exslt.ExsltMath", new ExsltMath());
+                //m_PredefinedExtensions.Add("Exslt.ExsltRegularExpressions", new ExsltRegularExpressions());
+                //m_PredefinedExtensions.Add("Exslt.ExsltStrings", new ExsltStrings());
+                //m_PredefinedExtensions.Add("Exslt.ExsltSets", new ExsltSets());
             }
 
             return m_PredefinedExtensions;