From 27fdb1ebab1b87713845d81be1ebbd191bfa7412 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 21 Jun 2013 09:19:50 +1000
Subject: [PATCH 1/4] removed custom dashboard, re-put back in the external
 index (must have got removed by accident)

---
 src/Umbraco.Web.UI/config/Dashboard.config    | 8 --------
 src/Umbraco.Web.UI/config/ExamineIndex.config | 4 ++++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index 93f2656635..e4c09f3efd 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -100,12 +100,4 @@
       <control>/umbraco/plugins/uGoLive/Dashboard.ascx</control>
     </tab>
   </section>
- <section alias="Test Dashboard">
-    <areas>
-      <area>developer</area>
-    </areas>
-    <tab caption="Test Dashboard">
-      <control>/UserControls/DashboardTest.ascx</control>
-    </tab>
-  </section>
 </dashBoard>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.config b/src/Umbraco.Web.UI/config/ExamineIndex.config
index b918c6413e..202118b399 100644
--- a/src/Umbraco.Web.UI/config/ExamineIndex.config
+++ b/src/Umbraco.Web.UI/config/ExamineIndex.config
@@ -22,4 +22,8 @@ More information and documentation can be found on CodePlex: http://umbracoexami
       <add Name="nodeTypeAlias" /> 
     </IndexAttributeFields>
   </IndexSet>
+
+  <!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
+  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
+  
 </ExamineLuceneIndexSets>
\ No newline at end of file

From 818d22ba6159e751f8075538aa791b58bcdd6683 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 21 Jun 2013 10:49:27 +1000
Subject: [PATCH 2/4] updates CDF config examples (#U4-2331)

---
 .../config/ClientDependency.Release.config    | 84 ++++++++++++-------
 .../config/ClientDependency.config            | 57 ++++++++-----
 2 files changed, 93 insertions(+), 48 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/ClientDependency.Release.config b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
index f1072853ef..e767fd0a81 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.Release.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
@@ -2,7 +2,7 @@
 
 <!-- 
 For full details of the client dependency framework, visit
-the CodePlex site @ http://clientdependency.codeplex.com
+https://github.com/Shandem/ClientDependency
 It manages CSS and JS file dependencies per control without having to worry about duplicates.
 It also manages the combination, compression and minification of all JS & CSS files.
 
@@ -12,24 +12,38 @@ NOTES:
 -->
 <clientDependency version="1" fileDependencyExtensions=".js,.css">
 
+  <!-- 
+    This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
+    The LoaderControlProvider is set to default, the javascriptPlaceHolderId, cssPlaceHolderId attributes are optional and default to what is listed below. If using
+    this provider, then you must specify both PlaceHolder controls on your page in order to render the JS/CSS.
+  -->
   <fileRegistration defaultProvider="LoaderControlProvider">
     <providers>
-      <add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core"/>
-      <add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core"/>
-      <add name="LoaderControlProvider" type="ClientDependency.Core.FileRegistration.Providers.LoaderControlProvider, ClientDependency.Core"/>
+      <add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
+      <add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core" />
+      <add name="LoaderControlProvider" type="ClientDependency.Core.FileRegistration.Providers.LoaderControlProvider, ClientDependency.Core" />
+      <add name="PlaceHolderProvider" type="ClientDependency.Core.FileRegistration.Providers.PlaceHolderProvider, ClientDependency.Core" enableCompositeFiles="true" javascriptPlaceHolderId="JavaScriptPlaceHolder" cssPlaceHolderId="CssPlaceHolder" />
       <!-- Used for loading dependencies in Canvas mode -->
       <add name="CanvasProvider" type="umbraco.presentation.LiveEditing.CanvasClientDependencyProvider, umbraco" />
     </providers>
   </fileRegistration>
 
-  <!--
-    The composite file section configures the compression/combination/minification of files.
-    You can enable/disable minification of either JS/CSS files and you can enable/disable the 
-    persistence of composite files. By default, minification and persistence is enabled. Persisting files
-    means that the system is going to save the output of the compressed/combined/minified files
-    to disk so that on any subsequent request (when output cache expires) that these files don't have
-    to be recreated again and will be based on the persisted file on disk. This saves on processing time.
-    -->
+  <!-- This section is used for MVC only -->
+  <mvc defaultRenderer="StandardRenderer">
+    <renderers>
+      <add name="StandardRenderer" type="ClientDependency.Core.FileRegistration.Providers.StandardRenderer, ClientDependency.Core" />
+      <add name="LazyLoadRenderer" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadRenderer, ClientDependency.Core" />
+    </renderers>
+  </mvc>
+
+  <!-- 
+  The composite file section configures the compression/combination/minification of files.
+  You can enable/disable minification of either JS/CSS files and you can enable/disable the 
+  persistence of composite files. By default, minification and persistence is enabled. Persisting files
+  means that the system is going to save the output of the compressed/combined/minified files
+  to disk so that on any subsequent request (when output cache expires) that these files don't have
+  to be recreated again and will be based on the persisted file on disk. This saves on processing time.
+  -->
   <compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
     <fileProcessingProviders>
       <add name="CompositeFileProcessor"
@@ -38,30 +52,42 @@ NOTES:
            enableJsMinify="true"
            persistFiles="true"
            compositeFilePath="~/App_Data/TEMP/ClientDependency"
-           urlType="Base64QueryStrings" />
+           bundleDomains="localhost:123456"
+           urlType="Base64QueryStrings"
+           pathUrlFormat="{dependencyId}/{version}/{type}"/>
     </fileProcessingProviders>
 
+    <!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
+    <fileMapProviders>
+      <add name="XmlFileMap"
+           type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core"
+           mapPath="~/App_Data/TEMP/ClientDependency" />
+    </fileMapProviders>
+
     <!-- 
-      Defines the mime types to compress when requested by the client.
-      Path is a regex selector, or a * can be used as in place of 'any'.
-      Generally mime types are only set by client browsers in the request for things
-      such as JSON or XML ajax requests.
-      -->
+    Defines the mime types to compress when requested by the client.
+    Path is a regex selector, or a * can be used as in place of 'any'.
+    Generally mime types are only set by client browsers in the request for things
+    such as JSON or XML ajax requests.
+    -->
     <mimeTypeCompression>
       <!-- Compress all json requests for the tree -->
       <add type="application/json" path="^.*?/webservices/Tree.*" />
     </mimeTypeCompression>
 
+    <!-- 
+    Defines the paths to match on to enable rogue file compression.
+    Path is a regex selector, or a * can be used as in place of 'any'.
+    jsExt and cssExt are comma seperated list of extensions to match to have the dependencies
+    replaced with the composite file handler. You can even include ASP.Net web service JS proxies.
+    -->
+    <rogueFileCompression>
+      <!--<add path="*" compressJs="true" compressCss="true" jsExt=".js,asmx/js" cssExt=".css">
+        <exclusions>
+          <add path="^.*test.aspx.*"/>
+        </exclusions>
+      </add>-->
+    </rogueFileCompression>
+
   </compositeFiles>
-
-  <!-- ClientDependency also supports the ASP.Net MVC framework, see codeplex URL for full details -->
-  <!--
-  <mvc defaultRenderer="StandardRenderer">
-    <renderers>
-      <add name="StandardRenderer" type="ClientDependency.Core.Mvc.Providers.StandardRenderer, ClientDependency.Core"/>
-      <add name="LazyLoadRenderer" type="ClientDependency.Core.Mvc.Providers.LazyLoadRenderer, ClientDependency.Core"/>
-    </renderers>
-  </mvc>
-  -->
-
 </clientDependency>
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 99957f0fa8..3e8c0fc8fd 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -2,7 +2,7 @@
 
 <!-- 
 For full details of the client dependency framework, visit
-the CodePlex site @ http://clientdependency.codeplex.com
+https://github.com/Shandem/ClientDependency
 It manages CSS and JS file dependencies per control without having to worry about duplicates.
 It also manages the combination, compression and minification of all JS & CSS files.
 
@@ -10,8 +10,13 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="6" fileDependencyExtensions=".js,.css">
+<clientDependency version="7" fileDependencyExtensions=".js,.css">
 
+  <!-- 
+    This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
+    The LoaderControlProvider is set to default, the javascriptPlaceHolderId, cssPlaceHolderId attributes are optional and default to what is listed below. If using
+    this provider, then you must specify both PlaceHolder controls on your page in order to render the JS/CSS.
+  -->
 	<fileRegistration defaultProvider="LoaderControlProvider">
 		<providers>
 			<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
@@ -31,17 +36,17 @@ NOTES:
 		</renderers>
 	</mvc>
 
-	<!--
-    The composite file section configures the compression/combination/minification of files.
-    You can enable/disable minification of either JS/CSS files and you can enable/disable the 
-    persistence of composite files. By default, minification and persistence is enabled. Persisting files
-    means that the system is going to save the output of the compressed/combined/minified files
-    to disk so that on any subsequent request (when output cache expires) that these files don't have
-    to be recreated again and will be based on the persisted file on disk. This saves on processing time.
-    -->
-	<compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
+  <!-- 
+  The composite file section configures the compression/combination/minification of files.
+  You can enable/disable minification of either JS/CSS files and you can enable/disable the 
+  persistence of composite files. By default, minification and persistence is enabled. Persisting files
+  means that the system is going to save the output of the compressed/combined/minified files
+  to disk so that on any subsequent request (when output cache expires) that these files don't have
+  to be recreated again and will be based on the persisted file on disk. This saves on processing time.
+  -->
+  <compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
 		<fileProcessingProviders>
-			<add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" urlType="Base64QueryStrings" />
+			<add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" bundleDomains="localhost:123456" urlType="Base64QueryStrings" pathUrlFormat="{dependencyId}/{version}/{type}" />
 		</fileProcessingProviders>
 
 		<!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
@@ -49,17 +54,31 @@ NOTES:
 			<add name="XmlFileMap" type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core" mapPath="~/App_Data/TEMP/ClientDependency" />
 		</fileMapProviders>
 
-		<!-- 
-      Defines the mime types to compress when requested by the client.
-      Path is a regex selector, or a * can be used as in place of 'any'.
-      Generally mime types are only set by client browsers in the request for things
-      such as JSON or XML ajax requests.
-      -->
+    <!-- 
+    Defines the mime types to compress when requested by the client.
+    Path is a regex selector, or a * can be used as in place of 'any'.
+    Generally mime types are only set by client browsers in the request for things
+    such as JSON or XML ajax requests.
+    -->
 		<mimeTypeCompression>
 			<!-- Compress all json requests for the tree -->
 			<add type="application/json" path="^.*?/webservices/Tree.*" />
 		</mimeTypeCompression>
 
-	</compositeFiles>
+    <!-- 
+    Defines the paths to match on to enable rogue file compression.
+    Path is a regex selector, or a * can be used as in place of 'any'.
+    jsExt and cssExt are comma seperated list of extensions to match to have the dependencies
+    replaced with the composite file handler. You can even include ASP.Net web service JS proxies.
+    -->
+    <rogueFileCompression>
+      <!--<add path="*" compressJs="true" compressCss="true" jsExt=".js,asmx/js" cssExt=".css">
+        <exclusions>
+          <add path="^.*test.aspx.*"/>
+        </exclusions>
+      </add>-->
+    </rogueFileCompression>
+
+  </compositeFiles>
 
 </clientDependency>

From 3f626b444faad817912f513f3f7d119f6ddc2d60 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 21 Jun 2013 10:55:38 +1000
Subject: [PATCH 3/4] re-enables CDF logger

---
 src/Umbraco.Web.UI/config/ClientDependency.Release.config | 2 +-
 src/Umbraco.Web.UI/config/ClientDependency.config         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/ClientDependency.Release.config b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
index e767fd0a81..d031ac1eb6 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.Release.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.Release.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1" fileDependencyExtensions=".js,.css">
+<clientDependency version="1" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 2553a93023..a95c67b06d 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="7" fileDependencyExtensions=".js,.css">
+<clientDependency version="8" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.

From b2c604f7b31c25ab66a925ec1b309911442aeb9c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 21 Jun 2013 11:26:23 +1000
Subject: [PATCH 4/4] updated ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 38d41211d5..67bcafd9ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ src/Umbraco.Web.UI.Client/[Bb]uild/*
 src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
 src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
 build/_BuildOutput/
+tools/NDepend/