You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/09/28 18:40:43 UTC
svn commit: r1391535 [3/3] - in /lucene.net/trunk: ./ build/ build/scripts/
build/scripts/All/ build/scripts/Contrib/
build/scripts/FastVectorHighlighter/ build/scripts/Regex/
build/scripts/SimpleFacetedSearch/ build/scripts/Spatial.NTS/
build/vs2010/c...
Modified: lucene.net/trunk/src/contrib/Regex/Contrib.Regex.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Regex/Contrib.Regex.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Regex/Contrib.Regex.csproj (original)
+++ lucene.net/trunk/src/contrib/Regex/Contrib.Regex.csproj Fri Sep 28 16:40:39 2012
@@ -27,8 +27,8 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Contrib.Regex</RootNamespace>
- <AssemblyName>Contrib.Regex</AssemblyName>
+ <RootNamespace>Lucene.Net.Search.Regex</RootNamespace>
+ <AssemblyName>Lucene.Net.Contrib.Regex</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -67,7 +67,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
- <DocumentationFile>..\..\..\build\bin\contrib\Regex\$(Configuration.Replace("35", ""))\$(Framework)\Contrib.Regex.XML</DocumentationFile>
+ <DocumentationFile>..\..\..\build\bin\contrib\Regex\Release\NET40\Lucene.Net.Contrib.Regex.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
</PropertyGroup>
@@ -81,7 +81,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
- <DocumentationFile>..\..\..\build\bin\contrib\Regex\$(Configuration.Replace("35", ""))\$(Framework)\Contrib.Regex.XML</DocumentationFile>
+ <DocumentationFile>..\..\..\build\bin\contrib\Regex\Release\NET35\Lucene.Net.Contrib.Regex.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
</PropertyGroup>
Modified: lucene.net/trunk/src/contrib/Regex/IRegexCapabilities.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Regex/IRegexCapabilities.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Regex/IRegexCapabilities.cs (original)
+++ lucene.net/trunk/src/contrib/Regex/IRegexCapabilities.cs Fri Sep 28 16:40:39 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-namespace Lucene.Net.Search.Regex
+namespace Contrib.Regex
{
/// <summary>
/// Defines basic operations needed by <see cref="RegexQuery"/> for a regular expression implementation.
Modified: lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs (original)
+++ lucene.net/trunk/src/contrib/Regex/IRegexQueryCapable.cs Fri Sep 28 16:40:39 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-namespace Lucene.Net.Search.Regex
+namespace Contrib.Regex
{
/// <summary>
/// Defines methods for regular expression supporting queries to use.
Modified: lucene.net/trunk/src/contrib/Regex/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Regex/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Regex/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/src/contrib/Regex/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -49,5 +49,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: lucene.net/trunk/src/contrib/Regex/RegexQuery.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Regex/RegexQuery.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Regex/RegexQuery.cs (original)
+++ lucene.net/trunk/src/contrib/Regex/RegexQuery.cs Fri Sep 28 16:40:39 2012
@@ -18,9 +18,10 @@
using System;
using System.Text;
using Lucene.Net.Index;
+using Lucene.Net.Search;
using Lucene.Net.Util;
-namespace Lucene.Net.Search.Regex
+namespace Contrib.Regex
{
/// <summary>
/// Regular expression based query.
Modified: lucene.net/trunk/src/contrib/Regex/RegexTermEnum.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Regex/RegexTermEnum.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Regex/RegexTermEnum.cs (original)
+++ lucene.net/trunk/src/contrib/Regex/RegexTermEnum.cs Fri Sep 28 16:40:39 2012
@@ -16,8 +16,9 @@
*/
using Lucene.Net.Index;
+using Lucene.Net.Search;
-namespace Lucene.Net.Search.Regex
+namespace Contrib.Regex
{
/// <summary>
/// Subclass of FilteredTermEnum for enumerating all terms that match the
Modified: lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs (original)
+++ lucene.net/trunk/src/contrib/Regex/SpanRegexQuery.cs Fri Sep 28 16:40:39 2012
@@ -16,14 +16,14 @@
*/
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Text;
using Lucene.Net.Index;
+using Lucene.Net.Search;
using Lucene.Net.Search.Spans;
using Lucene.Net.Util;
-namespace Lucene.Net.Search.Regex
+namespace Contrib.Regex
{
/// <summary>
/// A SpanQuery version of <see cref="RegexQuery"/> allowing regular expression queries to be nested
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search.Regex
/// <summary>Expert: Returns the matches for this query in an index. Used internally
/// to search for spans.
/// </summary>
- public override Spans.Spans GetSpans(IndexReader reader)
+ public override Lucene.Net.Search.Spans.Spans GetSpans(IndexReader reader)
{
throw new InvalidOperationException("Query should have been rewritten");
}
Modified: lucene.net/trunk/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/src/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -52,8 +52,8 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.csproj (original)
+++ lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.csproj Fri Sep 28 16:40:39 2012
@@ -28,7 +28,7 @@
<ProjectGuid>{66772190-FB3F-48F5-8E05-0B302BACEA73}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Lucene.Net.Search.SimpleFacetedSearch</RootNamespace>
- <AssemblyName>Lucene.Net.Search.SimpleFacetedSearch</AssemblyName>
+ <AssemblyName>Lucene.Net.Contrib.SimpleFacetedSearch</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -67,7 +67,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
- <DocumentationFile>..\..\..\build\bin\contrib\SimpleFacetedSearch\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Search.SimpleFacetedSearch.XML</DocumentationFile>
+ <DocumentationFile>..\..\..\build\bin\contrib\SimpleFacetedSearch\Release\NET40\Lucene.Net.Contrib.SimpleFacetedSearch.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
</PropertyGroup>
@@ -81,7 +81,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
- <DocumentationFile>..\..\..\build\bin\contrib\SimpleFacetedSearch\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Search.SimpleFacetedSearch.XML</DocumentationFile>
+ <DocumentationFile>..\..\..\build\bin\contrib\SimpleFacetedSearch\Release\NET35\Lucene.Net.Contrib.SimpleFacetedSearch.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
</PropertyGroup>
Modified: lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj (original)
+++ lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj Fri Sep 28 16:40:39 2012
@@ -35,10 +35,11 @@
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <RootNamespace>Snowball.Net</RootNamespace>
+ <RootNamespace>Lucene.Net.Analysis.Snowball</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject />
- <FileUpgradeFlags></FileUpgradeFlags>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
<OldToolsVersion>0.0</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
@@ -66,7 +67,8 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile />
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -89,7 +91,8 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile />
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Modified: lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj (original)
+++ lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.NTS.csproj Fri Sep 28 16:40:39 2012
@@ -56,7 +56,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Spatial\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <OutputPath>..\..\..\build\bin\contrib\Spatial.NTS\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -71,7 +71,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Spatial\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <OutputPath>..\..\..\build\bin\contrib\Spatial.NTS\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -85,11 +85,11 @@
<Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Spatial\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <OutputPath>..\..\..\build\bin\contrib\Spatial.NTS\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>..\..\..\build\bin\contrib\Spatial\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Spatial.NTS.xml</DocumentationFile>
+ <DocumentationFile>..\..\..\build\bin\contrib\Spatial.NTS\Release\NET40\Lucene.Net.Contrib.Spatial.NTS.xml</DocumentationFile>
<NoWarn>618</NoWarn>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
@@ -99,11 +99,11 @@
<Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Spatial\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <OutputPath>..\..\..\build\bin\contrib\Spatial.NTS\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>..\..\..\build\bin\contrib\Spatial\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Spatial.NTS.xml</DocumentationFile>
+ <DocumentationFile>..\..\..\build\bin\contrib\Spatial.NTS\Release\NET35\Lucene.Net.Contrib.Spatial.NTS.xml</DocumentationFile>
<NoWarn>618</NoWarn>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
Modified: lucene.net/trunk/src/contrib/Spatial/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Spatial/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Spatial/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/src/contrib/Spatial/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -49,10 +49,10 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersionAttribute("2.9.9")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
-[assembly: AssemblyVersion("2.9.9.0")]
-[assembly: AssemblyFileVersion("2.9.9.0")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
[assembly: AssemblyDelaySign(false)]
Modified: lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheProvider.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheProvider.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheProvider.cs (original)
+++ lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheProvider.cs Fri Sep 28 16:40:39 2012
@@ -19,6 +19,9 @@ using System;
using System.Runtime.CompilerServices;
using Lucene.Net.Index;
using Spatial4n.Core.Shapes;
+#if NET35
+using Lucene.Net.Support;
+#endif
namespace Lucene.Net.Spatial.Util
{
Modified: lucene.net/trunk/src/contrib/SpellChecker/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/SpellChecker/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/SpellChecker/AssemblyInfo.cs (original)
+++ lucene.net/trunk/src/contrib/SpellChecker/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -35,7 +35,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyDefaultAlias("Lucene.Net.SpellChecker")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.9")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
// Version information for an assembly consists of the following four values:
//
@@ -47,7 +47,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.2.1")]
+[assembly: AssemblyVersion("3.0.3")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: lucene.net/trunk/src/contrib/SpellChecker/Contrib.SpellChecker.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/contrib/SpellChecker/Contrib.SpellChecker.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/contrib/SpellChecker/Contrib.SpellChecker.csproj (original)
+++ lucene.net/trunk/src/contrib/SpellChecker/Contrib.SpellChecker.csproj Fri Sep 28 16:40:39 2012
@@ -27,19 +27,24 @@
<ProjectGuid>{FF45EE91-9CA3-443D-8231-75E9FA1AF40E}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon></ApplicationIcon>
- <AssemblyKeyContainerName></AssemblyKeyContainerName>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
<AssemblyName>Lucene.Net.Contrib.SpellChecker</AssemblyName>
<AssemblyOriginatorKeyFile>Lucene.Net.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <RootNamespace>SpellChecker.Net</RootNamespace>
+ <RootNamespace>Lucene.Net.Search.Spell</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject></StartupObject>
- <FileUpgradeFlags></FileUpgradeFlags>
- <UpgradeBackupLocation></UpgradeBackupLocation>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -50,9 +55,11 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -74,9 +81,11 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -98,7 +107,8 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<DocumentationFile>..\..\..\build\bin\contrib\SpellChecker\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.SpellChecker.XML</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
@@ -122,7 +132,8 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<DocumentationFile>..\..\..\build\bin\contrib\SpellChecker\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.SpellChecker.XML</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
@@ -190,7 +201,9 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent></PreBuildEvent>
- <PostBuildEvent></PostBuildEvent>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: lucene.net/trunk/src/core/Analysis/WordlistLoader.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Analysis/WordlistLoader.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Analysis/WordlistLoader.cs (original)
+++ lucene.net/trunk/src/core/Analysis/WordlistLoader.cs Fri Sep 28 16:40:39 2012
@@ -65,7 +65,7 @@ namespace Lucene.Net.Analysis
/// <returns>A HashSet with the reader's words</returns>
public static ISet<string> GetWordSet(System.IO.TextReader reader)
{
- var result = Support.Compatibility.SetFactory.GetSet<string>();
+ var result = Support.Compatibility.SetFactory.CreateHashSet<string>();
System.String word;
while ((word = reader.ReadLine()) != null)
@@ -90,7 +90,7 @@ namespace Lucene.Net.Analysis
/// </returns>
public static ISet<string> GetWordSet(System.IO.TextReader reader, System.String comment)
{
- var result = Support.Compatibility.SetFactory.GetSet<string>();
+ var result = Support.Compatibility.SetFactory.CreateHashSet<string>();
System.String word = null;
while ((word = reader.ReadLine()) != null)
Modified: lucene.net/trunk/src/core/Index/DirectoryReader.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Index/DirectoryReader.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Index/DirectoryReader.cs (original)
+++ lucene.net/trunk/src/core/Index/DirectoryReader.cs Fri Sep 28 16:40:39 2012
@@ -1059,7 +1059,7 @@ namespace Lucene.Net.Index
internal static ICollection<string> GetFieldNames(IndexReader.FieldOption fieldNames, IndexReader[] subReaders)
{
// maintain a unique set of field names
- ISet<string> fieldSet = Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> fieldSet = Support.Compatibility.SetFactory.CreateHashSet<string>();
foreach (IndexReader reader in subReaders)
{
fieldSet.UnionWith(reader.GetFieldNames(fieldNames));
Modified: lucene.net/trunk/src/core/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Index/IndexWriter.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Index/IndexWriter.cs (original)
+++ lucene.net/trunk/src/core/Index/IndexWriter.cs Fri Sep 28 16:40:39 2012
@@ -244,7 +244,7 @@ namespace Lucene.Net.Index
private DocumentsWriter docWriter;
private IndexFileDeleter deleter;
- private ISet<SegmentInfo> segmentsToOptimize = Lucene.Net.Support.Compatibility.SetFactory.GetSet<SegmentInfo>(); // used by optimize to note those needing optimization
+ private ISet<SegmentInfo> segmentsToOptimize = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<SegmentInfo>(); // used by optimize to note those needing optimization
private Lock writeLock;
@@ -260,7 +260,7 @@ namespace Lucene.Net.Index
private MergePolicy mergePolicy;
private MergeScheduler mergeScheduler = new ConcurrentMergeScheduler();
private LinkedList<MergePolicy.OneMerge> pendingMerges = new LinkedList<MergePolicy.OneMerge>();
- private ISet<MergePolicy.OneMerge> runningMerges = Lucene.Net.Support.Compatibility.SetFactory.GetSet<MergePolicy.OneMerge>();
+ private ISet<MergePolicy.OneMerge> runningMerges = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<MergePolicy.OneMerge>();
private IList<MergePolicy.OneMerge> mergeExceptions = new List<MergePolicy.OneMerge>();
private long mergeGen;
private bool stopMerges;
@@ -2730,7 +2730,7 @@ namespace Lucene.Net.Index
lock (this)
{
ResetMergeExceptions();
- segmentsToOptimize = Lucene.Net.Support.Compatibility.SetFactory.GetSet<SegmentInfo>();
+ segmentsToOptimize = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<SegmentInfo>();
optimizeMaxNumSegments = maxNumSegments;
int numSegments = segmentInfos.Count;
for (int i = 0; i < numSegments; i++)
Modified: lucene.net/trunk/src/core/Index/ParallelReader.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Index/ParallelReader.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Index/ParallelReader.cs (original)
+++ lucene.net/trunk/src/core/Index/ParallelReader.cs Fri Sep 28 16:40:39 2012
@@ -531,7 +531,7 @@ namespace Lucene.Net.Index
public override System.Collections.Generic.ICollection<string> GetFieldNames(IndexReader.FieldOption fieldNames)
{
EnsureOpen();
- ISet<string> fieldSet = Lucene.Net.Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> fieldSet = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<string>();
foreach(var reader in readers)
{
ICollection<string> names = reader.GetFieldNames(fieldNames);
Modified: lucene.net/trunk/src/core/Index/SegmentMerger.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Index/SegmentMerger.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Index/SegmentMerger.cs (original)
+++ lucene.net/trunk/src/core/Index/SegmentMerger.cs Fri Sep 28 16:40:39 2012
@@ -232,7 +232,7 @@ namespace Lucene.Net.Index
internal ICollection<string> GetMergedFiles()
{
- ISet<string> fileSet = Lucene.Net.Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> fileSet = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<string>();
// Basic files
for (int i = 0; i < IndexFileNames.COMPOUND_EXTENSIONS.Length; i++)
Modified: lucene.net/trunk/src/core/Index/SegmentReader.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Index/SegmentReader.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Index/SegmentReader.cs (original)
+++ lucene.net/trunk/src/core/Index/SegmentReader.cs Fri Sep 28 16:40:39 2012
@@ -1259,7 +1259,7 @@ namespace Lucene.Net.Index
{
EnsureOpen();
- System.Collections.Generic.ISet<string> fieldSet = Lucene.Net.Support.Compatibility.SetFactory.GetSet<string>();
+ System.Collections.Generic.ISet<string> fieldSet = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<string>();
for (int i = 0; i < core.fieldInfos.Size(); i++)
{
FieldInfo fi = core.fieldInfos.FieldInfo(i);
Modified: lucene.net/trunk/src/core/Lucene.Net.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Lucene.Net.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Lucene.Net.csproj (original)
+++ lucene.net/trunk/src/core/Lucene.Net.csproj Fri Sep 28 16:40:39 2012
@@ -954,8 +954,6 @@
<None Include="Lucene.Net.Search.TestSort.config" />
<None Include="Lucene.Net.snk" />
<Content Include="Analysis\Standard\READ_BEFORE_REGENERATING.txt" />
- <Content Include="ChangeNotes.txt" />
- <Content Include="FileDiffs.txt" />
<None Include="QueryParser\QueryParser.jj" />
</ItemGroup>
<ItemGroup>
Modified: lucene.net/trunk/src/core/Search/MultiSearcher.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Search/MultiSearcher.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Search/MultiSearcher.cs (original)
+++ lucene.net/trunk/src/core/Search/MultiSearcher.cs Fri Sep 28 16:40:39 2012
@@ -357,7 +357,7 @@ namespace Lucene.Net.Search
Query rewrittenQuery = Rewrite(original);
// step 2
- ISet<Term> terms = Lucene.Net.Support.Compatibility.SetFactory.GetSet<Term>();
+ ISet<Term> terms = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<Term>();
rewrittenQuery.ExtractTerms(terms);
// step3
Modified: lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs (original)
+++ lucene.net/trunk/src/core/Search/Spans/NearSpansUnordered.cs Fri Sep 28 16:40:39 2012
@@ -321,7 +321,7 @@ namespace Lucene.Net.Search.Spans
/// <throws> IOException </throws>
public override ICollection<byte[]> GetPayload()
{
- System.Collections.Generic.ISet<byte[]> matchPayload = Lucene.Net.Support.Compatibility.SetFactory.GetSet<byte[]>();
+ System.Collections.Generic.ISet<byte[]> matchPayload = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<byte[]>();
for (SpansCell cell = first; cell != null; cell = cell.next)
{
if (cell.IsPayloadAvailable())
Modified: lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs (original)
+++ lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs Fri Sep 28 16:40:39 2012
@@ -44,7 +44,7 @@ namespace Lucene.Net.Search.Spans
this.similarity = query.GetSimilarity(searcher);
this.internalQuery = query;
- terms = Lucene.Net.Support.Compatibility.SetFactory.GetSet<Term>();
+ terms = Lucene.Net.Support.Compatibility.SetFactory.CreateHashSet<Term>();
query.ExtractTerms(terms);
idfExp = similarity.IdfExplain(terms, searcher);
Modified: lucene.net/trunk/src/core/Store/RAMDirectory.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Store/RAMDirectory.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Store/RAMDirectory.cs (original)
+++ lucene.net/trunk/src/core/Store/RAMDirectory.cs Fri Sep 28 16:40:39 2012
@@ -86,7 +86,7 @@ namespace Lucene.Net.Store
{
EnsureOpen();
// TODO: may have better performance if our HashMap implmented KeySet() instead of generating one via HashSet
- System.Collections.Generic.ISet<string> fileNames = Support.Compatibility.SetFactory.GetSet(fileMap.Keys);
+ System.Collections.Generic.ISet<string> fileNames = Support.Compatibility.SetFactory.CreateHashSet(fileMap.Keys);
System.String[] result = new System.String[fileNames.Count];
int i = 0;
foreach(string filename in fileNames)
Modified: lucene.net/trunk/src/core/Support/Compatibility/SetFactory.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/src/core/Support/Compatibility/SetFactory.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/src/core/Support/Compatibility/SetFactory.cs (original)
+++ lucene.net/trunk/src/core/Support/Compatibility/SetFactory.cs Fri Sep 28 16:40:39 2012
@@ -21,7 +21,7 @@ namespace Lucene.Net.Support.Compatibili
{
public static class SetFactory
{
- public static ISet<T> GetSet<T>()
+ public static ISet<T> CreateHashSet<T>()
{
#if NET35
return new WrappedHashSet<T>();
@@ -30,7 +30,7 @@ namespace Lucene.Net.Support.Compatibili
#endif
}
- public static ISet<T> GetSet<T>(IEnumerable<T> other)
+ public static ISet<T> CreateHashSet<T>(IEnumerable<T> other)
{
#if NET35
return new WrappedHashSet<T>(other);
Propchange: lucene.net/trunk/test/
------------------------------------------------------------------------------
Merged /incubator/lucene.net/branches/3.0.3/test:r1376597,1376714,1382418
Modified: lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicAnalyzer.cs Fri Sep 28 16:40:39 2012
@@ -16,17 +16,12 @@
*/
using System;
-using System.IO;
-using System.Collections;
-
-using Lucene.Net.Analysis;
-using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Analysis.AR;
using Lucene.Net.Test.Analysis;
-using Lucene.Net.Util;
using NUnit.Framework;
using Version = Lucene.Net.Util.Version;
-namespace Lucene.Net.Analysis.AR
+namespace Lucene.Net.Analyzers.AR
{
Modified: lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicNormalizationFilter.cs Fri Sep 28 16:40:39 2012
@@ -17,15 +17,11 @@
using System;
using System.IO;
-using System.Collections;
-
-using Lucene.Net.Analysis;
-using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Analysis.AR;
using Lucene.Net.Test.Analysis;
-using Lucene.Net.Util;
using NUnit.Framework;
-namespace Lucene.Net.Analysis.AR
+namespace Lucene.Net.Analyzers.AR
{
Modified: lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/AR/TestArabicStemFilter.cs Fri Sep 28 16:40:39 2012
@@ -17,17 +17,11 @@
using System;
using System.IO;
-using System.Collections;
-
-using Lucene.Net.Analysis;
-using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Analysis.AR;
using Lucene.Net.Test.Analysis;
-using Lucene.Net.Util;
-
using NUnit.Framework;
-
-namespace Lucene.Net.Analysis.AR
+namespace Lucene.Net.Analyzers.AR
{
Modified: lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj (original)
+++ lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj Fri Sep 28 16:40:39 2012
@@ -27,10 +27,11 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{67D27628-F1D5-4499-9818-B669731925C8}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Lucene.Net.Analyzers</RootNamespace>
+ <RootNamespace>Lucene.Net.Analysis.Test</RootNamespace>
<AssemblyName>Lucene.Net.Contrib.Analyzers.Test</AssemblyName>
<FileAlignment>512</FileAlignment>
- <FileUpgradeFlags></FileUpgradeFlags>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
Modified: lucene.net/trunk/test/contrib/Analyzers/Hunspell/HunspellDictionaryLoader.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/Hunspell/HunspellDictionaryLoader.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/Hunspell/HunspellDictionaryLoader.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/Hunspell/HunspellDictionaryLoader.cs Fri Sep 28 16:40:39 2012
@@ -26,7 +26,7 @@ using Lucene.Net.Analysis.Hunspell;
namespace Lucene.Net.Analyzers.Hunspell {
public static class HunspellDictionaryLoader {
public static Stream Stream(String contentName) {
- var resourceName = "Lucene.Net.Analyzers.Hunspell.Dictionaries." + contentName;
+ var resourceName = "Lucene.Net.Analysis.Test.Hunspell.Dictionaries." + contentName;
var stream = typeof(HunspellDictionaryLoader).Assembly.GetManifestResourceStream(resourceName);
if (stream == null)
Modified: lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenFilter.cs Fri Sep 28 16:40:39 2012
@@ -20,16 +20,13 @@
*/
using System;
-using System.Collections.Generic;
using System.IO;
-using System.Linq;
-using System.Text;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.NGram;
using Lucene.Net.Test.Analysis;
using NUnit.Framework;
-namespace Lucene.Net.Analyzers.Miscellaneous
+namespace Lucene.Net.Analyzers.NGram
{
/**
* Tests {@link EdgeNGramTokenFilter} for correctness.
Modified: lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/NGram/TestEdgeNGramTokenizer.cs Fri Sep 28 16:40:39 2012
@@ -20,16 +20,12 @@
*/
using System;
-using System.Collections.Generic;
using System.IO;
-using System.Linq;
-using System.Text;
-using Lucene.Net.Analysis;
using Lucene.Net.Analysis.NGram;
using Lucene.Net.Test.Analysis;
using NUnit.Framework;
-namespace Lucene.Net.Analyzers.Miscellaneous
+namespace Lucene.Net.Analyzers.NGram
{
/**
* Tests {@link EdgeNGramTokenizer} for correctness.
Modified: lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs Fri Sep 28 16:40:39 2012
@@ -17,15 +17,12 @@
using System;
using System.IO;
-using System.Collections;
-
using Lucene.Net.Analysis;
-using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Analysis.NGram;
using Lucene.Net.Test.Analysis;
-using Lucene.Net.Util;
using NUnit.Framework;
-namespace Lucene.Net.Analysis.NGram
+namespace Lucene.Net.Analyzers.NGram
{
/**
Modified: lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs (original)
+++ lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs Fri Sep 28 16:40:39 2012
@@ -17,15 +17,11 @@
using System;
using System.IO;
-using System.Collections;
-
-using Lucene.Net.Analysis;
-using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Analysis.NGram;
using Lucene.Net.Test.Analysis;
-using Lucene.Net.Util;
using NUnit.Framework;
-namespace Lucene.Net.Analysis.NGram
+namespace Lucene.Net.Analyzers.NGram
{
/**
Modified: lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs (original)
+++ lucene.net/trunk/test/contrib/Core/Analysis/Ext/Analysis.Ext.Test.cs Fri Sep 28 16:40:39 2012
@@ -15,21 +15,17 @@
* limitations under the License.
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+using Lucene.Net.Analysis.Ext;
using Lucene.Net.Store;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.Tokenattributes;
-using Lucene.Net.Analysis.Standard;
using Lucene.Net.Index;
using Lucene.Net.Search;
using Lucene.Net.Documents;
using Lucene.Net.QueryParsers;
using NUnit.Framework;
-namespace Lucene.Net.Analysis.Ext
+namespace Lucene.Net.Test.Analysis.Ext
{
[TestFixture]
class TestAnalysisExt
Modified: lucene.net/trunk/test/contrib/Core/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Core/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Core/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/test/contrib/Core/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj (original)
+++ lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj Fri Sep 28 16:40:39 2012
@@ -27,9 +27,13 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{33ED01FD-A87C-4208-BA49-2586EFE32974}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Lucene.Net.Search.Vectorhighlight</RootNamespace>
+ <RootNamespace>Lucene.Net.Search.Vectorhighlight.Test</RootNamespace>
<AssemblyName>Lucene.Net.FastVectorHighlighter.Test</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -56,6 +60,8 @@
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>
+ </DocumentationFile>
<NoWarn>618</NoWarn>
<OutputType>Library</OutputType>
</PropertyGroup>
@@ -69,6 +75,8 @@
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>
+ </DocumentationFile>
<NoWarn>618</NoWarn>
<OutputType>Library</OutputType>
</PropertyGroup>
@@ -81,6 +89,8 @@
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>
+ </DocumentationFile>
<NoWarn>618</NoWarn>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
@@ -94,6 +104,8 @@
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>
+ </DocumentationFile>
<NoWarn>618</NoWarn>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
Modified: lucene.net/trunk/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/test/contrib/FastVectorHighlighter/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs (original)
+++ lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs Fri Sep 28 16:40:39 2012
@@ -21,12 +21,12 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Xml;
+using Contrib.Regex;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.Standard;
using Lucene.Net.Analysis.Tokenattributes;
using Lucene.Net.Documents;
using Lucene.Net.QueryParsers;
-using Lucene.Net.Search.Regex;
using Lucene.Net.Search.Spans;
using Lucene.Net.Store;
using Lucene.Net.Support;
@@ -1177,7 +1177,7 @@ namespace Lucene.Net.Search.Highlight.Te
helper.TestAction = () =>
{
var goodWord = "goodtoken";
- var stopWords = Support.Compatibility.SetFactory.GetSet(new[] { "stoppedtoken" });
+ var stopWords = Support.Compatibility.SetFactory.CreateHashSet(new[] { "stoppedtoken" });
var query = new TermQuery(new Term("data", goodWord));
@@ -1230,7 +1230,7 @@ namespace Lucene.Net.Search.Highlight.Te
var helper = new TestHighlightRunner();
helper.TestAction = () =>
{
- var stopWords = Support.Compatibility.SetFactory.GetSet(new[] {"in", "it"});
+ var stopWords = Support.Compatibility.SetFactory.CreateHashSet(new[] {"in", "it"});
TermQuery query = new TermQuery(new Term("text", "searchterm"));
String text = "this is a text with searchterm in it";
Modified: lucene.net/trunk/test/contrib/Queries/Contrib.Queries.Test.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Queries/Contrib.Queries.Test.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Queries/Contrib.Queries.Test.csproj (original)
+++ lucene.net/trunk/test/contrib/Queries/Contrib.Queries.Test.csproj Fri Sep 28 16:40:39 2012
@@ -27,10 +27,11 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{8685A826-9B7A-42C8-88F3-EEE6B41D6D81}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Lucene.Net.Search</RootNamespace>
+ <RootNamespace>Lucene.Net.Search.Test</RootNamespace>
<AssemblyName>Lucene.Net.Contrib.Queries.Test</AssemblyName>
<FileAlignment>512</FileAlignment>
- <FileUpgradeFlags></FileUpgradeFlags>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
@@ -84,7 +85,8 @@
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<NoWarn>618</NoWarn>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
@@ -98,7 +100,8 @@
<DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<NoWarn>618</NoWarn>
<DebugSymbols>true</DebugSymbols>
<OutputType>Library</OutputType>
Modified: lucene.net/trunk/test/contrib/Queries/FuzzyLikeThisQueryTest.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Queries/FuzzyLikeThisQueryTest.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Queries/FuzzyLikeThisQueryTest.cs (original)
+++ lucene.net/trunk/test/contrib/Queries/FuzzyLikeThisQueryTest.cs Fri Sep 28 16:40:39 2012
@@ -72,7 +72,7 @@ namespace Lucene.Net.Search
FuzzyLikeThisQuery flt = new FuzzyLikeThisQuery(10, analyzer);
flt.AddTerms("smith", "name", 0.3f, 1);
Query q = flt.Rewrite(searcher.IndexReader);
- ISet<Term> queryTerms = Support.Compatibility.SetFactory.GetSet<Term>();
+ ISet<Term> queryTerms = Support.Compatibility.SetFactory.CreateHashSet<Term>();
q.ExtractTerms(queryTerms);
Assert.IsTrue(queryTerms.Contains(new Term("name", "smythe")),"Should have variant smythe");
Assert.IsTrue(queryTerms.Contains(new Term("name", "smith")), "Should have variant smith");
@@ -91,7 +91,7 @@ namespace Lucene.Net.Search
FuzzyLikeThisQuery flt = new FuzzyLikeThisQuery(10, analyzer);
flt.AddTerms("jonathin smoth", "name", 0.3f, 1);
Query q = flt.Rewrite(searcher.IndexReader);
- ISet<Term> queryTerms = Support.Compatibility.SetFactory.GetSet<Term>();
+ ISet<Term> queryTerms = Support.Compatibility.SetFactory.CreateHashSet<Term>();
q.ExtractTerms(queryTerms);
Assert.IsTrue(queryTerms.Contains(new Term("name", "jonathan")),"Should have variant jonathan");
Assert.IsTrue(queryTerms.Contains(new Term("name", "smith")), "Should have variant smith");
@@ -109,7 +109,7 @@ namespace Lucene.Net.Search
FuzzyLikeThisQuery flt = new FuzzyLikeThisQuery(10, analyzer);
flt.AddTerms("fernando smith", "name", 0.3f, 1);
Query q = flt.Rewrite(searcher.IndexReader);
- ISet<Term> queryTerms = Support.Compatibility.SetFactory.GetSet<Term>();
+ ISet<Term> queryTerms = Support.Compatibility.SetFactory.CreateHashSet<Term>();
q.ExtractTerms(queryTerms);
Assert.IsTrue(queryTerms.Contains(new Term("name", "smith")), "Should have variant smith");
TopDocs topDocs = searcher.Search(flt, 1);
Modified: lucene.net/trunk/test/contrib/Queries/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Queries/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Queries/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/test/contrib/Queries/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.2")]
-[assembly: AssemblyFileVersion("2.9.2")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: lucene.net/trunk/test/contrib/Regex/Contrib.Regex.Test.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Regex/Contrib.Regex.Test.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Regex/Contrib.Regex.Test.csproj (original)
+++ lucene.net/trunk/test/contrib/Regex/Contrib.Regex.Test.csproj Fri Sep 28 16:40:39 2012
@@ -27,8 +27,8 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F1875552-0E59-46AA-976E-6183733FD2AB}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Contrib.Regex.Test</RootNamespace>
- <AssemblyName>Contrib.Regex.Test</AssemblyName>
+ <RootNamespace>Lucene.Net.Search.Regex.Test</RootNamespace>
+ <AssemblyName>Lucene.Net.Contrib.Regex.Test</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Modified: lucene.net/trunk/test/contrib/Regex/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Regex/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Regex/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/test/contrib/Regex/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -51,5 +51,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: lucene.net/trunk/test/contrib/Regex/TestRegexQuery.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Regex/TestRegexQuery.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Regex/TestRegexQuery.cs (original)
+++ lucene.net/trunk/test/contrib/Regex/TestRegexQuery.cs Fri Sep 28 16:40:39 2012
@@ -16,18 +16,16 @@
*/
using System;
+using Lucene.Net;
using Lucene.Net.Analysis;
using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Search;
-using Lucene.Net.Search.Regex;
using Lucene.Net.Search.Spans;
using Lucene.Net.Store;
-using Lucene.Net.Util;
using NUnit.Framework;
-
-namespace Lucene.Net.Search.Regex
+namespace Contrib.Regex.Test
{
public class TestRegexQuery : TestCase
{
Modified: lucene.net/trunk/test/contrib/Regex/TestSpanRegexQuery.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Regex/TestSpanRegexQuery.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Regex/TestSpanRegexQuery.cs (original)
+++ lucene.net/trunk/test/contrib/Regex/TestSpanRegexQuery.cs Fri Sep 28 16:40:39 2012
@@ -29,7 +29,6 @@ using Lucene.Net.Analysis.Standard;
using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Search;
-using Lucene.Net.Search.Regex;
using Lucene.Net.Search.Spans;
using Lucene.Net.Store;
using Version = Lucene.Net.Util.Version;
Modified: lucene.net/trunk/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/test/contrib/SimpleFacetedSearch/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -52,5 +52,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.4")]
-[assembly: AssemblyFileVersion("2.9.4")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
Modified: lucene.net/trunk/test/contrib/SimpleFacetedSearch/SimpleFacetedSearch.Test.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/SimpleFacetedSearch/SimpleFacetedSearch.Test.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/SimpleFacetedSearch/SimpleFacetedSearch.Test.csproj (original)
+++ lucene.net/trunk/test/contrib/SimpleFacetedSearch/SimpleFacetedSearch.Test.csproj Fri Sep 28 16:40:39 2012
@@ -28,7 +28,7 @@
<ProjectGuid>{D8CC9461-64E0-416E-BA6E-1DF6FA66CBF5}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Lucene.Net.Search.SimpleFacetedSearch</RootNamespace>
- <AssemblyName>Lucene.Net.Search.SimpleFacetedSearch.Test</AssemblyName>
+ <AssemblyName>Lucene.Net.Contrib.SimpleFacetedSearch.Test</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Modified: lucene.net/trunk/test/contrib/Snowball/Contrib.Snowball.Test.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Snowball/Contrib.Snowball.Test.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Snowball/Contrib.Snowball.Test.csproj (original)
+++ lucene.net/trunk/test/contrib/Snowball/Contrib.Snowball.Test.csproj Fri Sep 28 16:40:39 2012
@@ -35,10 +35,11 @@
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <RootNamespace>Lucene.Net.Test</RootNamespace>
+ <RootNamespace>Lucene.Net.Analysis.Snowball.Test</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject />
- <FileUpgradeFlags></FileUpgradeFlags>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
<OldToolsVersion>0.0</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
@@ -66,7 +67,8 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile />
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -89,7 +91,8 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile />
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -112,7 +115,8 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile />
<DefineConstants>TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -135,7 +139,8 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile />
<DefineConstants>TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Modified: lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Tests.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Tests.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Tests.csproj (original)
+++ lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Tests.csproj Fri Sep 28 16:40:39 2012
@@ -106,7 +106,7 @@
</Reference>
<Reference Include="Spatial4n.Core.NTS, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9f9456e1ca16d45e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\build\bin\contrib\Spatial\Debug\NET40\Spatial4n.Core.NTS.dll</HintPath>
+ <HintPath>..\..\..\lib\Spatial4n\$(Framework)\Spatial4n.Core.NTS.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
Modified: lucene.net/trunk/test/contrib/Spatial/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/Spatial/Properties/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/Spatial/Properties/AssemblyInfo.cs (original)
+++ lucene.net/trunk/test/contrib/Spatial/Properties/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -48,10 +48,10 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersionAttribute("2.9.0")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
-[assembly: AssemblyVersion("2.9.1.002")]
-[assembly: AssemblyFileVersion("2.9.1.002")]
+[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyFileVersion("3.0.3")]
[assembly: AssemblyDelaySign(false)]
Modified: lucene.net/trunk/test/contrib/SpellChecker/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/SpellChecker/AssemblyInfo.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/SpellChecker/AssemblyInfo.cs (original)
+++ lucene.net/trunk/test/contrib/SpellChecker/AssemblyInfo.cs Fri Sep 28 16:40:39 2012
@@ -38,7 +38,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDefaultAlias("Lucene.Net.SpellChecker")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.9")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.3")]
//
// Version information for an assembly consists of the following four values:
@@ -51,7 +51,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.2.1")]
+[assembly: AssemblyVersion("3.0.3")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: lucene.net/trunk/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj (original)
+++ lucene.net/trunk/test/contrib/SpellChecker/Contrib.SpellChecker.Test.csproj Fri Sep 28 16:40:39 2012
@@ -27,19 +27,25 @@
<ProjectGuid>{4DCB81AA-ECC1-4B3D-A0C9-28E54F5B125C}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon></ApplicationIcon>
- <AssemblyKeyContainerName></AssemblyKeyContainerName>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
<AssemblyName>Lucene.Net.Contrib.SpellChecker.Test</AssemblyName>
- <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <RootNamespace>SpellChecker.Net.Test</RootNamespace>
+ <RootNamespace>Lucene.Net.Search.Spell.Test</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject></StartupObject>
- <FileUpgradeFlags></FileUpgradeFlags>
- <UpgradeBackupLocation></UpgradeBackupLocation>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -64,9 +70,11 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -87,9 +95,11 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -110,9 +120,11 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -133,9 +145,11 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
<DefineConstants>TRACE;$(Framework)</DefineConstants>
- <DocumentationFile></DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -208,7 +222,9 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent></PreBuildEvent>
- <PostBuildEvent></PostBuildEvent>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs (original)
+++ lucene.net/trunk/test/core/Analysis/TestStopAnalyzer.cs Fri Sep 28 16:40:39 2012
@@ -65,7 +65,7 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestStopList()
{
- var stopWordsSet = Support.Compatibility.SetFactory.GetSet<string>();
+ var stopWordsSet = Support.Compatibility.SetFactory.CreateHashSet<string>();
stopWordsSet.Add("good");
stopWordsSet.Add("test");
stopWordsSet.Add("analyzer");
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestStopListPositions()
{
- var stopWordsSet = Support.Compatibility.SetFactory.GetSet<string>();
+ var stopWordsSet = Support.Compatibility.SetFactory.CreateHashSet<string>();
stopWordsSet.Add("good");
stopWordsSet.Add("test");
stopWordsSet.Add("analyzer");
Modified: lucene.net/trunk/test/core/Analysis/TestStopFilter.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Analysis/TestStopFilter.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Analysis/TestStopFilter.cs (original)
+++ lucene.net/trunk/test/core/Analysis/TestStopFilter.cs Fri Sep 28 16:40:39 2012
@@ -37,7 +37,7 @@ namespace Lucene.Net.Analysis
public virtual void TestExactCase()
{
System.IO.StringReader reader = new System.IO.StringReader("Now is The Time");
- var stopWords = Support.Compatibility.SetFactory.GetSet<string>();
+ var stopWords = Support.Compatibility.SetFactory.CreateHashSet<string>();
stopWords.UnionWith(new[] {"is", "the", "Time"});
TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopWords, false);
@@ -53,7 +53,7 @@ namespace Lucene.Net.Analysis
public virtual void TestIgnoreCase()
{
System.IO.StringReader reader = new System.IO.StringReader("Now is The Time");
- var stopWords = Support.Compatibility.SetFactory.GetSet<string>();
+ var stopWords = Support.Compatibility.SetFactory.CreateHashSet<string>();
stopWords.UnionWith(new[] {"is", "the", "Time"});
TokenStream stream = new StopFilter(false, new WhitespaceTokenizer(reader), stopWords, true);
Modified: lucene.net/trunk/test/core/Index/TestFieldsReader.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Index/TestFieldsReader.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Index/TestFieldsReader.cs (original)
+++ lucene.net/trunk/test/core/Index/TestFieldsReader.cs Fri Sep 28 16:40:39 2012
@@ -151,10 +151,10 @@ namespace Lucene.Net.Index
FieldsReader reader = new FieldsReader(dir, TEST_SEGMENT_NAME, fieldInfos);
Assert.IsTrue(reader != null);
Assert.IsTrue(reader.Size() == 1);
- ISet<string> loadFieldNames = Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> loadFieldNames = Support.Compatibility.SetFactory.CreateHashSet<string>();
loadFieldNames.Add(DocHelper.TEXT_FIELD_1_KEY);
loadFieldNames.Add(DocHelper.TEXT_FIELD_UTF1_KEY);
- ISet<string> lazyFieldNames = Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> lazyFieldNames = Support.Compatibility.SetFactory.CreateHashSet<string>();
//new String[]{DocHelper.LARGE_LAZY_FIELD_KEY, DocHelper.LAZY_FIELD_KEY, DocHelper.LAZY_FIELD_BINARY_KEY};
lazyFieldNames.Add(DocHelper.LARGE_LAZY_FIELD_KEY);
lazyFieldNames.Add(DocHelper.LAZY_FIELD_KEY);
@@ -203,10 +203,10 @@ namespace Lucene.Net.Index
FieldsReader reader = new FieldsReader(dir, TEST_SEGMENT_NAME, fieldInfos);
Assert.IsTrue(reader != null);
Assert.IsTrue(reader.Size() == 1);
- ISet<string> loadFieldNames = Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> loadFieldNames = Support.Compatibility.SetFactory.CreateHashSet<string>();
loadFieldNames.Add(DocHelper.TEXT_FIELD_1_KEY);
loadFieldNames.Add(DocHelper.TEXT_FIELD_UTF1_KEY);
- ISet<string> lazyFieldNames = Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> lazyFieldNames = Support.Compatibility.SetFactory.CreateHashSet<string>();
lazyFieldNames.Add(DocHelper.LARGE_LAZY_FIELD_KEY);
lazyFieldNames.Add(DocHelper.LAZY_FIELD_KEY);
lazyFieldNames.Add(DocHelper.LAZY_FIELD_BINARY_KEY);
@@ -274,9 +274,9 @@ namespace Lucene.Net.Index
long lazyTime = 0;
long regularTime = 0;
int length = 50;
- ISet<string> lazyFieldNames = Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> lazyFieldNames = Support.Compatibility.SetFactory.CreateHashSet<string>();
lazyFieldNames.Add(DocHelper.LARGE_LAZY_FIELD_KEY);
- SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(Support.Compatibility.SetFactory.GetSet<string>(), lazyFieldNames);
+ SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(Support.Compatibility.SetFactory.CreateHashSet<string>(), lazyFieldNames);
for (int i = 0; i < length; i++)
{
Modified: lucene.net/trunk/test/core/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Index/TestIndexReader.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Index/TestIndexReader.cs (original)
+++ lucene.net/trunk/test/core/Index/TestIndexReader.cs Fri Sep 28 16:40:39 2012
@@ -381,9 +381,9 @@ namespace Lucene.Net.Index
{
Assert.AreEqual(bin[i], data1[i + b1.BinaryOffset]);
}
- var lazyFields = Support.Compatibility.SetFactory.GetSet<string>();
+ var lazyFields = Support.Compatibility.SetFactory.CreateHashSet<string>();
lazyFields.Add("bin1");
- FieldSelector sel = new SetBasedFieldSelector(Support.Compatibility.SetFactory.GetSet<string>(), lazyFields);
+ FieldSelector sel = new SetBasedFieldSelector(Support.Compatibility.SetFactory.CreateHashSet<string>(), lazyFields);
doc = reader.Document(reader.MaxDoc - 1, sel);
IFieldable[] fieldables = doc.GetFieldables("bin1");
Assert.IsNotNull(fieldables);
Modified: lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs (original)
+++ lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs Fri Sep 28 16:40:39 2012
@@ -857,7 +857,7 @@ namespace Lucene.Net.QueryParsers
[Test]
public virtual void TestBoost()
{
- var stopWords = Support.Compatibility.SetFactory.GetSet<string>();
+ var stopWords = Support.Compatibility.SetFactory.CreateHashSet<string>();
stopWords.Add("on");
StandardAnalyzer oneStopAnalyzer = new StandardAnalyzer(Version.LUCENE_CURRENT, stopWords);
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field", oneStopAnalyzer);
Modified: lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs (original)
+++ lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs Fri Sep 28 16:40:39 2012
@@ -119,7 +119,7 @@ namespace Lucene.Net.Search.Spans
QueryUtils.CheckEqual(q, qr);
- var terms = Support.Compatibility.SetFactory.GetSet<Term>();
+ var terms = Support.Compatibility.SetFactory.CreateHashSet<Term>();
qr.ExtractTerms(terms);
Assert.AreEqual(1, terms.Count);
}
@@ -134,7 +134,7 @@ namespace Lucene.Net.Search.Spans
QueryUtils.CheckUnequal(q, qr);
- var terms = Support.Compatibility.SetFactory.GetSet<Term>();
+ var terms = Support.Compatibility.SetFactory.CreateHashSet<Term>();
qr.ExtractTerms(terms);
Assert.AreEqual(2, terms.Count);
}
@@ -149,7 +149,7 @@ namespace Lucene.Net.Search.Spans
QueryUtils.CheckEqual(q, qr);
- var set_Renamed = Support.Compatibility.SetFactory.GetSet<Term>();
+ var set_Renamed = Support.Compatibility.SetFactory.CreateHashSet<Term>();
qr.ExtractTerms(set_Renamed);
Assert.AreEqual(2, set_Renamed.Count);
}
Modified: lucene.net/trunk/test/core/Search/Spans/TestSpans.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Search/Spans/TestSpans.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Search/Spans/TestSpans.cs (original)
+++ lucene.net/trunk/test/core/Search/Spans/TestSpans.cs Fri Sep 28 16:40:39 2012
@@ -505,7 +505,7 @@ namespace Lucene.Net.Search.Spans
public virtual void TestNPESpanQuery()
{
Directory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT, Support.Compatibility.SetFactory.GetSet<string>()), IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(Util.Version.LUCENE_CURRENT, Support.Compatibility.SetFactory.CreateHashSet<string>()), IndexWriter.MaxFieldLength.LIMITED);
// Add documents
AddDoc(writer, "1", "the big dogs went running to the market");
Modified: lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs (original)
+++ lucene.net/trunk/test/core/Search/TestMultiPhraseQuery.cs Fri Sep 28 16:40:39 2012
@@ -169,7 +169,7 @@ namespace Lucene.Net.Search
public virtual void TestPhrasePrefixWithBooleanQuery()
{
RAMDirectory indexStore = new RAMDirectory();
- IndexWriter writer = new IndexWriter(indexStore, new StandardAnalyzer(Util.Version.LUCENE_CURRENT, Support.Compatibility.SetFactory.GetSet<string>()), true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexWriter writer = new IndexWriter(indexStore, new StandardAnalyzer(Util.Version.LUCENE_CURRENT, Support.Compatibility.SetFactory.CreateHashSet<string>()), true, IndexWriter.MaxFieldLength.LIMITED);
Add("This is a test", "object", writer);
Add("a note", "note", writer);
writer.Close();
Modified: lucene.net/trunk/test/core/Search/TestMultiSearcher.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Search/TestMultiSearcher.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Search/TestMultiSearcher.cs (original)
+++ lucene.net/trunk/test/core/Search/TestMultiSearcher.cs Fri Sep 28 16:40:39 2012
@@ -305,9 +305,9 @@ namespace Lucene.Net.Search
Assert.IsTrue(document.GetFields().Count == 2, "document.getFields() Size: " + document.GetFields().Count + " is not: " + 2);
//Should be one document from each directory
//they both have two fields, contents and other
- ISet<string> ftl = Support.Compatibility.SetFactory.GetSet<string>();
+ ISet<string> ftl = Support.Compatibility.SetFactory.CreateHashSet<string>();
ftl.Add("other");
- SetBasedFieldSelector fs = new SetBasedFieldSelector(ftl, Support.Compatibility.SetFactory.GetSet<string>());
+ SetBasedFieldSelector fs = new SetBasedFieldSelector(ftl, Support.Compatibility.SetFactory.CreateHashSet<string>());
document = searcher.Doc(hits[0].Doc, fs);
Assert.IsTrue(document != null, "document is null and it shouldn't be");
Assert.IsTrue(document.GetFields().Count == 1, "document.getFields() Size: " + document.GetFields().Count + " is not: " + 1);
@@ -317,7 +317,7 @@ namespace Lucene.Net.Search
Assert.IsTrue(value_Renamed != null, "value is null and it shouldn't be");
ftl.Clear();
ftl.Add("contents");
- fs = new SetBasedFieldSelector(ftl, Support.Compatibility.SetFactory.GetSet<string>());
+ fs = new SetBasedFieldSelector(ftl, Support.Compatibility.SetFactory.CreateHashSet<string>());
document = searcher.Doc(hits[1].Doc, fs);
value_Renamed = document.Get("contents");
Assert.IsTrue(value_Renamed != null, "value is null and it shouldn't be");
Modified: lucene.net/trunk/test/core/Store/MockRAMDirectory.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Store/MockRAMDirectory.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Store/MockRAMDirectory.cs (original)
+++ lucene.net/trunk/test/core/Store/MockRAMDirectory.cs Fri Sep 28 16:40:39 2012
@@ -57,13 +57,13 @@ namespace Lucene.Net.Store
if (openFiles == null)
{
openFiles = new Dictionary<string, int>();
- openFilesDeleted = Support.Compatibility.SetFactory.GetSet<string>();
+ openFilesDeleted = Support.Compatibility.SetFactory.CreateHashSet<string>();
}
if (createdFiles == null)
- createdFiles = Support.Compatibility.SetFactory.GetSet<string>();
+ createdFiles = Support.Compatibility.SetFactory.CreateHashSet<string>();
if (unSyncedFiles == null)
- unSyncedFiles = Support.Compatibility.SetFactory.GetSet<string>();
+ unSyncedFiles = Support.Compatibility.SetFactory.CreateHashSet<string>();
}
}
@@ -105,9 +105,9 @@ namespace Lucene.Net.Store
{
crashed = true;
openFiles = new Dictionary<string, int>();
- openFilesDeleted = Support.Compatibility.SetFactory.GetSet<string>();
+ openFilesDeleted = Support.Compatibility.SetFactory.CreateHashSet<string>();
var it = unSyncedFiles.GetEnumerator();
- unSyncedFiles = Support.Compatibility.SetFactory.GetSet<string>();
+ unSyncedFiles = Support.Compatibility.SetFactory.CreateHashSet<string>();
int count = 0;
while (it.MoveNext())
{
@@ -248,7 +248,7 @@ namespace Lucene.Net.Store
{
lock (this)
{
- return Support.Compatibility.SetFactory.GetSet(openFilesDeleted);
+ return Support.Compatibility.SetFactory.CreateHashSet(openFilesDeleted);
}
}
@@ -347,7 +347,7 @@ namespace Lucene.Net.Store
if (openFiles == null)
{
openFiles = new Dictionary<string, int>();
- openFilesDeleted = Support.Compatibility.SetFactory.GetSet<string>();
+ openFilesDeleted = Support.Compatibility.SetFactory.CreateHashSet<string>();
}
if (noDeleteOpenFile && openFiles.Count > 0)
{
Modified: lucene.net/trunk/test/core/Store/TestWindowsMMap.cs
URL: http://svn.apache.org/viewvc/lucene.net/trunk/test/core/Store/TestWindowsMMap.cs?rev=1391535&r1=1391534&r2=1391535&view=diff
==============================================================================
--- lucene.net/trunk/test/core/Store/TestWindowsMMap.cs (original)
+++ lucene.net/trunk/test/core/Store/TestWindowsMMap.cs Fri Sep 28 16:40:39 2012
@@ -80,7 +80,7 @@ namespace Lucene.Net.Store
// plan to add a set of useful stopwords, consider changing some of the
// interior filters.
- StandardAnalyzer analyzer = new StandardAnalyzer(Util.Version.LUCENE_CURRENT, Support.Compatibility.SetFactory.GetSet<string>());
+ StandardAnalyzer analyzer = new StandardAnalyzer(Util.Version.LUCENE_CURRENT, Support.Compatibility.SetFactory.CreateHashSet<string>());
// TODO: something about lock timeouts and leftover locks.
IndexWriter writer = new IndexWriter(storeDirectory, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
IndexSearcher searcher = new IndexSearcher(storeDirectory, true);