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

Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Tests/Models/ContentExtensionsTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
This commit is contained in:
Shannon
2013-08-13 18:22:45 +10:00
parent 4e13b0afe6 bfabfd9fa5
commit d7fd1efd60
34 changed files with 376 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -114,9 +114,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.51.2941, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.52.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.51.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.52.2941\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

3
src/Umbraco.Web.UI/config/ExamineIndex.config
View File

@@ -27,5 +27,8 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
<IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
<IndexSet SetName="WebsiteIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Website/" />
<IndexSet SetName="PDFIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/PDF/" />
</ExamineLuceneIndexSets>

26
src/Umbraco.Web.UI/config/ExamineSettings.config
View File

@@ -21,7 +21,25 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<!-- default external indexer, which excludes protected and published pages-->
<add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"/>
<add name="WebsiteIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"
dataService="UmbracoExamine.DataServices.UmbracoDataService, UmbracoExamine"
indexSet="WebsiteIndexSet"
supportUnpublished="false"
supportProtected="true"
runAsync="true"
interval="10"
analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"
enableDefaultEventHandler="true"/>
<add name="PDFIndexer" type="UmbracoExamine.PDF.PDFIndexer, UmbracoExamine.PDF"
extensions=".pdf"
umbracoFileProperty="umbracoFile"/>
<!--<add name="OfficeIndexer" type="CLIENTNAME.BusinessLogic.Search.OfficeIndexer, CLIENTNAME.BusinessLogic"
extensions=".docx,.doc,.txt"
umbracoFileProperty="umbracoFile"/>-->
</providers>
</ExamineIndexProviders>
@@ -34,6 +52,12 @@ More information and documentation can be found on CodePlex: http://umbracoexami
analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
<add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine" />
<add name="WebsiteSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine" analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
<add name="PDFSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine" />
<add name="CombinedIndexSearcher" type="Examine.LuceneEngine.Providers.MultiIndexSearcher, Examine" indexSets="WebsiteIndexSet,PDFIndexSet"/>
</providers>
</ExamineSearchProviders>

2
src/Umbraco.Web.UI/packages.config
View File

@@ -2,7 +2,7 @@
<packages>
<package id="ClientDependency" version="1.7.0.4" targetFramework="net40" />
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
<package id="Examine" version="0.1.51.2941" targetFramework="net40" />
<package id="Examine" version="0.1.52.2941" targetFramework="net40" />
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />