Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.
This commit is contained in:
Mole
2021-02-11 15:29:18 +01:00
parent 5129326005
commit dda023c174
20 changed files with 18 additions and 39 deletions

View File

@@ -12,11 +12,10 @@ using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Examine;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public class BackOfficeExamineSearcher : IBackOfficeExamineSearcher
{

View File

@@ -6,10 +6,9 @@ using Examine.LuceneEngine.Directories;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Examine;
using Umbraco.Extensions;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public sealed class ExamineLuceneComponent : IComponent
{

View File

@@ -4,10 +4,9 @@
using System.Runtime.InteropServices;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Examine;
using Umbraco.Extensions;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
// We want to run after core composers since we are replacing some items
[ComposeAfter(typeof(ICoreComposer))]

View File

@@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Extensions;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public class ExamineLuceneFinalComponent : IComponent
{

View File

@@ -3,7 +3,7 @@
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
// examine's Lucene final composer composes after all user composers
// and *also* after ICoreComposer (in case IUserComposer is disabled)

View File

@@ -1,7 +1,7 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public interface ILuceneDirectoryFactory
{

View File

@@ -12,7 +12,7 @@ using Umbraco.Cms.Core.Hosting;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public class LuceneFileSystemDirectoryFactory : ILuceneDirectoryFactory
{

View File

@@ -7,9 +7,8 @@ using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Examine;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
/// <inheritdoc />
/// <summary>

View File

@@ -7,10 +7,9 @@ using Lucene.Net.Store;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Examine;
using Umbraco.Extensions;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public class LuceneIndexDiagnostics : IIndexDiagnostics
{

View File

@@ -5,9 +5,8 @@ using Examine;
using Examine.LuceneEngine.Providers;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Examine;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
/// <summary>
/// Implementation of <see cref="IIndexDiagnosticsFactory"/> which returns <see cref="LuceneIndexDiagnostics"/>

View File

@@ -4,7 +4,7 @@
using System;
using Lucene.Net.Store;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public class LuceneRAMDirectoryFactory : ILuceneDirectoryFactory
{

View File

@@ -4,7 +4,7 @@
using System.IO;
using Lucene.Net.Store;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
/// <summary>
/// A custom <see cref="SimpleFSLockFactory"/> that ensures a prefixless lock prefix

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Umbraco.Cms.Examine</RootNamespace>
<RootNamespace>Umbraco.Examine</RootNamespace>
<Product>Umbraco CMS</Product>
<Title>Umbraco.Examine.Lucene</Title>
<LangVersion>8</LangVersion>

View File

@@ -12,9 +12,8 @@ using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
using Umbraco.Examine;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
/// <summary>
/// An indexer for Umbraco content and media

View File

@@ -16,10 +16,9 @@ using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
using Umbraco.Examine;
using Directory = Lucene.Net.Store.Directory;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
/// <summary>

View File

@@ -5,9 +5,8 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Examine;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
public class UmbracoExamineIndexDiagnostics : LuceneIndexDiagnostics
{

View File

@@ -12,10 +12,9 @@ using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
using Umbraco.Examine;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
/// <summary>
/// Creates the indexes used by Umbraco

View File

@@ -7,10 +7,9 @@ using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Services;
using Umbraco.Examine;
using Directory = Lucene.Net.Store.Directory;
namespace Umbraco.Cms.Examine
namespace Umbraco.Examine
{
/// <summary>
/// Custom indexer for members

View File

@@ -17,7 +17,6 @@ using Umbraco.Cms.Core.Runtime;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Sync;
using Umbraco.Cms.Core.WebAssets;
using Umbraco.Cms.Examine;
using Umbraco.Cms.Infrastructure.PublishedCache;
using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
using Umbraco.Cms.Tests.Integration.Implementations;

View File

@@ -16,16 +16,7 @@ using Umbraco.Cms.Core.Persistence.Querying;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Examine;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Persistence.Querying;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Scoping;
using Umbraco.Core.Services;
using Umbraco.Examine;
using Umbraco.Tests.TestHelpers;
using IContentService = Umbraco.Cms.Core.Services.IContentService;