You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ar...@apache.org on 2008/06/25 04:54:04 UTC
svn commit: r671408 [1/2] - in /incubator/lucene.net/trunk/C#/src/Demo: ./
DeleteFiles/ DemoLib/ DemoLib/HTML/ IndexFiles/ IndexHtml/ SearchFiles/
Author: aroush
Date: Tue Jun 24 19:54:03 2008
New Revision: 671408
URL: http://svn.apache.org/viewvc?rev=671408&view=rev
Log:
Release: Apache Lucene.Net.2.3.1 build 001 "Alpha"
Removed:
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles-VS2005.csproj
Modified:
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.csproj
incubator/lucene.net/trunk/C#/src/Demo/Demo.sln
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib.csproj
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Tags.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTMLDocument.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.csproj
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.csproj
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles.cs
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles.csproj
Modified: incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DeleteFiles/AssemblyInfo.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs Tue Jun 24 19:54:03 2008
@@ -33,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
//
// Version information for an assembly consists of the following four values:
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.003")]
+[assembly: AssemblyVersion("2.3.1.001")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DeleteFiles/DeleteFiles.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs Tue Jun 24 19:54:03 2008
@@ -17,25 +17,24 @@
using System;
-using Directory = Lucene.Net.Store.Directory;
-using FSDirectory = Lucene.Net.Store.FSDirectory;
using IndexReader = Lucene.Net.Index.IndexReader;
using Term = Lucene.Net.Index.Term;
+using Directory = Lucene.Net.Store.Directory;
+using FSDirectory = Lucene.Net.Store.FSDirectory;
namespace Lucene.Net.Demo
{
- //import Lucene.Net.index.Term;
- /// <summary>Deletes documents from an index that do not contain a term. </summary>
- public class DeleteFiles
+ /// <summary>Deletes documents from an index that do not contain a term. </summary>
+ public class DeleteFiles
{
-
- private DeleteFiles()
- {
- } // singleton
- /// <summary>Deletes documents from an index that do not contain a term. </summary>
- [STAThread]
+ private DeleteFiles()
+ {
+ } // singleton
+
+ /// <summary>Deletes documents from an index that do not contain a term. </summary>
+ [STAThread]
public static void Main(System.String[] args)
{
System.String usage = typeof(DeleteFiles) + " <unique_term>";
Modified: incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DeleteFiles/DeleteFiles.csproj?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.csproj Tue Jun 24 19:54:03 2008
@@ -1,114 +1,110 @@
-<VisualStudioProject>
- <CSHARP
- ProjectType = "Local"
- ProductVersion = "7.10.3077"
- SchemaVersion = "2.0"
- ProjectGuid = "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
- >
- <Build>
- <Settings
- ApplicationIcon = "App.ico"
- AssemblyKeyContainerName = ""
- AssemblyName = "DeleteFiles"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "Exe"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "DeleteFiles"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = ""
- >
- <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "true"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- <Config
- Name = "Release"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
- DocumentationFile = "DeleteFiles.xml"
- DebugSymbols = "false"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "true"
- OutputPath = "bin\Release\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- </Settings>
- <References>
- <Reference
- Name = "System"
- AssemblyName = "System"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
- />
- <Reference
- Name = "System.Data"
- AssemblyName = "System.Data"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
- />
- <Reference
- Name = "System.XML"
- AssemblyName = "System.Xml"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
- />
- <Reference
- Name = "DemoLib"
- Project = "{72AE650A-73E9-4F01-918B-5B166C2129FA}"
- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- />
- <Reference
- Name = "Lucene.Net"
- AssemblyName = "Lucene.Net"
- HintPath = "..\..\Lucene.Net\bin\Debug\Lucene.Net.dll"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File
- RelPath = "App.ico"
- BuildAction = "Content"
- />
- <File
- RelPath = "AssemblyInfo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "DeleteFiles.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- </Include>
- </Files>
- </CSHARP>
-</VisualStudioProject>
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>App.ico</ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>DeleteFiles</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Exe</OutputType>
+ <RootNamespace>DeleteFiles</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>DeleteFiles.xml</DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Lucene.Net">
+ <Name>Lucene.Net</Name>
+ <HintPath>..\..\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\DemoLib\DemoLib.csproj">
+ <Name>DemoLib</Name>
+ <Project>{72AE650A-73E9-4F01-918B-5B166C2129FA}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="App.ico" />
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DeleteFiles.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Demo/Demo.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/Demo.sln?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/Demo.sln (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/Demo.sln Tue Jun 24 19:54:03 2008
@@ -1,53 +1,61 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoLib", "DemoLib\DemoLib.csproj", "{72AE650A-73E9-4F01-918B-5B166C2129FA}"
- ProjectSection(ProjectDependencies) = postProject
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoLib", "DemoLib\DemoLib.csproj", "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeleteFiles", "DeleteFiles\DeleteFiles.csproj", "{BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}"
- ProjectSection(ProjectDependencies) = postProject
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndexFiles", "IndexFiles\IndexFiles.csproj", "{3E561192-4292-4998-BC67-8C1B82A56108}"
- ProjectSection(ProjectDependencies) = postProject
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndexHtml", "IndexHtml\IndexHtml.csproj", "{2B86751C-0D3A-486E-A176-E995C63EB653}"
- ProjectSection(ProjectDependencies) = postProject
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchFiles", "SearchFiles\SearchFiles.csproj", "{5CF56C9F-F8DF-471E-B73A-C736464948C0}"
- ProjectSection(ProjectDependencies) = postProject
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {72AE650A-73E9-4F01-918B-5B166C2129FA}.Debug.ActiveCfg = Debug|.NET
- {72AE650A-73E9-4F01-918B-5B166C2129FA}.Debug.Build.0 = Debug|.NET
- {72AE650A-73E9-4F01-918B-5B166C2129FA}.Release.ActiveCfg = Release|.NET
- {72AE650A-73E9-4F01-918B-5B166C2129FA}.Release.Build.0 = Release|.NET
- {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug.ActiveCfg = Debug|.NET
- {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug.Build.0 = Debug|.NET
- {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Release.ActiveCfg = Release|.NET
- {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Release.Build.0 = Release|.NET
- {3E561192-4292-4998-BC67-8C1B82A56108}.Debug.ActiveCfg = Debug|.NET
- {3E561192-4292-4998-BC67-8C1B82A56108}.Debug.Build.0 = Debug|.NET
- {3E561192-4292-4998-BC67-8C1B82A56108}.Release.ActiveCfg = Release|.NET
- {3E561192-4292-4998-BC67-8C1B82A56108}.Release.Build.0 = Release|.NET
- {2B86751C-0D3A-486E-A176-E995C63EB653}.Debug.ActiveCfg = Debug|.NET
- {2B86751C-0D3A-486E-A176-E995C63EB653}.Debug.Build.0 = Debug|.NET
- {2B86751C-0D3A-486E-A176-E995C63EB653}.Release.ActiveCfg = Release|.NET
- {2B86751C-0D3A-486E-A176-E995C63EB653}.Release.Build.0 = Release|.NET
- {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Debug.ActiveCfg = Debug|.NET
- {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Debug.Build.0 = Debug|.NET
- {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Release.ActiveCfg = Release|.NET
- {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Release.Build.0 = Release|.NET
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/AssemblyInfo.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs Tue Jun 24 19:54:03 2008
@@ -33,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
//
// Version information for an assembly consists of the following four values:
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.003")]
+[assembly: AssemblyVersion("2.3.1.001")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/DemoLib.csproj?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib.csproj Tue Jun 24 19:54:03 2008
@@ -1,169 +1,142 @@
-<VisualStudioProject>
- <CSHARP
- ProjectType = "Local"
- ProductVersion = "7.10.3077"
- SchemaVersion = "2.0"
- ProjectGuid = "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
- >
- <Build>
- <Settings
- ApplicationIcon = ""
- AssemblyKeyContainerName = ""
- AssemblyName = "DemoLib"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "Library"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "DemoLib"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = ""
- >
- <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "true"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- <Config
- Name = "Release"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
- DocumentationFile = "DemoLib.xml"
- DebugSymbols = "false"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "true"
- OutputPath = "bin\Release\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- </Settings>
- <References>
- <Reference
- Name = "System.Data"
- AssemblyName = "System.Data"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
- />
- <Reference
- Name = "System.XML"
- AssemblyName = "System.Xml"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
- />
- <Reference
- Name = "System"
- AssemblyName = "System"
- HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
- />
- <Reference
- Name = "Lucene.Net"
- AssemblyName = "Lucene.Net"
- HintPath = "..\..\Lucene.Net\bin\Debug\Lucene.Net.dll"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File
- RelPath = "AssemblyInfo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "FileDocument.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTMLDocument.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\Entities.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\HTMLParser.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\HTMLParser.jj"
- BuildAction = "None"
- />
- <File
- RelPath = "HTML\HTMLParserConstants.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\HTMLParserTokenManager.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\ParseException.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\ParserThread.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\SimpleCharStream.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\Tags.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\Test.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\Token.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "HTML\TokenMgrError.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- </Include>
- </Files>
- </CSHARP>
-</VisualStudioProject>
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{F04CA2F4-E182-46A8-B914-F46AF5319E83}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>DemoLib</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>DemoLib</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>DemoLib.xml</DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Lucene.Net">
+ <Name>Lucene.Net</Name>
+ <HintPath>..\..\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="FileDocument.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTMLDocument.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Entities.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\HTMLParser.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\HTMLParserConstants.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\HTMLParserTokenManager.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\ParseException.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\ParserThread.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\SimpleCharStream.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Tags.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Test.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Token.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\TokenMgrError.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <None Include="HTML\HTMLParser.jj" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/FileDocument.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs Tue Jun 24 19:54:03 2008
@@ -28,38 +28,38 @@
public class FileDocument
{
- /// <summary>Makes a document for a File.
- /// <p>
- /// The document has three fields:
- /// <ul>
- /// <li><code>path</code>--containing the pathname of the file, as a stored,
- /// untokenized field;
- /// <li><code>modified</code>--containing the last modified date of the file as
- /// a field as created by <a
- /// href="lucene.document.DateTools.html">DateTools</a>; and
- /// <li><code>contents</code>--containing the full contents of the file, as a
- /// Reader field;
- /// </summary>
- public static Document Document(System.IO.FileInfo f)
+ /// <summary>Makes a document for a File.
+ /// <p>
+ /// The document has three fields:
+ /// <ul>
+ /// <li><code>path</code>--containing the pathname of the file, as a stored,
+ /// untokenized field;
+ /// <li><code>modified</code>--containing the last modified date of the file as
+ /// a field as created by <a
+ /// href="lucene.document.DateTools.html">DateTools</a>; and
+ /// <li><code>contents</code>--containing the full contents of the file, as a
+ /// Reader field;
+ /// </summary>
+ public static Document Document(System.IO.FileInfo f)
{
// make a new, empty document
Document doc = new Document();
- // Add the path of the file as a field named "path". Use a field that is
- // indexed (i.e. searchable), but don't tokenize the field into words.
- doc.Add(new Field("path", f.FullName, Field.Store.YES, Field.Index.UN_TOKENIZED));
+ // Add the path of the file as a field named "path". Use a field that is
+ // indexed (i.e. searchable), but don't tokenize the field into words.
+ doc.Add(new Field("path", f.FullName, Field.Store.YES, Field.Index.UN_TOKENIZED));
- // Add the last modified date of the file a field named "modified". Use
- // a field that is indexed (i.e. searchable), but don't tokenize the field
- // into words.
+ // Add the last modified date of the file a field named "modified". Use
+ // a field that is indexed (i.e. searchable), but don't tokenize the field
+ // into words.
doc.Add(new Field("modified", DateTools.TimeToString(f.LastWriteTime.Millisecond, DateTools.Resolution.MINUTE), Field.Store.YES, Field.Index.UN_TOKENIZED));
- // Add the contents of the file to a field named "contents". Specify a Reader,
- // so that the text of the file is tokenized and indexed, but not stored.
- // Note that FileReader expects the file to be in the system's default encoding.
- // If that's not the case searching for special characters will fail.
- doc.Add(new Field("contents", new System.IO.StreamReader(f.FullName, System.Text.Encoding.Default)));
+ // Add the contents of the file to a field named "contents". Specify a Reader,
+ // so that the text of the file is tokenized and indexed, but not stored.
+ // Note that FileReader expects the file to be in the system's default encoding.
+ // If that's not the case searching for special characters will fail.
+ doc.Add(new Field("contents", new System.IO.StreamReader(f.FullName, System.Text.Encoding.Default)));
// return the document
return doc;
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/HTMLParser.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs Tue Jun 24 19:54:03 2008
@@ -78,15 +78,15 @@
public virtual bool Full()
{
- return enclosingInstance.summaryComplete;
+ return enclosingInstance.summaryComplete;
}
}
- /// <deprecated> Use HTMLParser(FileInputStream) instead
- /// </deprecated>
- public HTMLParser(System.IO.FileInfo file) : this(new System.IO.FileStream(file.FullName, System.IO.FileMode.Open, System.IO.FileAccess.Read))
- {
- }
+ /// <deprecated> Use HTMLParser(FileInputStream) instead
+ /// </deprecated>
+ public HTMLParser(System.IO.FileInfo file) : this(new System.IO.FileStream(file.FullName, System.IO.FileMode.Open, System.IO.FileAccess.Read))
+ {
+ }
public virtual System.String GetTitle()
{
@@ -149,7 +149,7 @@
{
if (pipeIn == null)
{
- pipeInStream = new MyPipedInputStream(this, new System.IO.StreamReader(new System.IO.MemoryStream(1024)));
+ pipeInStream = new MyPipedInputStream(this, new System.IO.StreamReader(new System.IO.MemoryStream(1024)));
pipeOutStream = new System.IO.StreamWriter(pipeInStream.BaseStream);
pipeIn = new System.IO.StreamReader(pipeInStream.BaseStream, System.Text.Encoding.Default); // GetEncoding("UTF-16BE"));
pipeOut = new System.IO.StreamWriter(pipeOutStream.BaseStream, System.Text.Encoding.Default); // GetEncoding("UTF-16BE"));
@@ -805,8 +805,8 @@
private sealed class LookaheadSuccess : System.ApplicationException
{
}
-
- private LookaheadSuccess jj_ls;
+
+ private LookaheadSuccess jj_ls;
private bool Jj_scan_token(int kind)
{
if (jj_scanpos == jj_lastpos)
@@ -992,7 +992,7 @@
case 0: Jj_3_1(); break;
case 1: Jj_3_2(); break;
- }
+ }
}
p = p.next;
}
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/HTMLParser.jj?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj Tue Jun 24 19:54:03 2008
@@ -26,7 +26,7 @@
PARSER_BEGIN(HTMLParser)
-package Lucene.Net.demo.html;
+package org.apache.lucene.demo.html;
import java.io.*;
import java.util.Properties;
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs Tue Jun 24 19:54:03 2008
@@ -353,7 +353,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
+
MatchLoop:
do
{
@@ -536,7 +537,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -621,7 +623,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -689,7 +692,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
+
MatchLoop1:
do
{
@@ -725,7 +729,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -747,7 +752,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -843,7 +849,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
+
MatchLoop1:
do
{
@@ -865,7 +872,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -886,7 +894,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -944,7 +953,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
+
MatchLoop1:
do
{
@@ -980,7 +990,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1002,7 +1013,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1101,7 +1113,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << (int) curChar;
+ ulong l = ((ulong) 1L) << (int) curChar;
+
MatchLoop1:
do
{
@@ -1146,7 +1159,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1169,7 +1183,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1335,7 +1350,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
+
MatchLoop1:
do
{
@@ -1371,7 +1387,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1393,7 +1410,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1452,7 +1470,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << (int) curChar;
+ ulong l = ((ulong) 1L) << (int) curChar;
+
MatchLoop1:
do
{
@@ -1511,7 +1530,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1568,7 +1588,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1675,7 +1696,8 @@
ReInitRounds();
if (curChar < 64)
{
- ulong l = ((ulong) 1L) << curChar;
+ ulong l = ((ulong) 1L) << curChar;
+
MatchLoop1:
do
{
@@ -1738,7 +1760,8 @@
}
else if (curChar < 128)
{
- ulong l = ((ulong) 1L) << (curChar & 63);
+ ulong l = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1761,7 +1784,8 @@
else
{
int i2 = (curChar & 0xff) >> 6;
- ulong l2 = ((ulong) 1L) << (curChar & 63);
+ ulong l2 = ((ulong) 1L) << (curChar & 63);
+
MatchLoop1:
do
{
@@ -1855,7 +1879,7 @@
Token t = Token.NewToken(jjmatchedKind);
t.kind = jjmatchedKind;
System.String im = jjstrLiteralImages[jjmatchedKind];
- t.image = (im == null)?input_stream.GetImage():im;
+ t.image = (im == null) ? input_stream.GetImage() : im;
t.beginLine = input_stream.GetBeginLine();
t.beginColumn = input_stream.GetBeginColumn();
t.endLine = input_stream.GetEndLine();
@@ -1974,7 +1998,7 @@
catch (System.IO.IOException e1)
{
EOFSeen = true;
- error_after = curPos <= 1?"":input_stream.GetImage();
+ error_after = curPos <= 1 ? "" : input_stream.GetImage();
if (curChar == '\n' || curChar == '\r')
{
error_line++;
@@ -1986,7 +2010,7 @@
if (!EOFSeen)
{
input_stream.Backup(1);
- error_after = curPos <= 1?"":input_stream.GetImage();
+ error_after = curPos <= 1 ? "" : input_stream.GetImage();
}
throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/ParseException.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs Tue Jun 24 19:54:03 2008
@@ -126,7 +126,7 @@
/// these constructors.
/// </summary>
- public ParseException():base()
+ public ParseException() : base()
{
specialConstructor = false;
}
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/ParserThread.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs Tue Jun 24 19:54:03 2008
@@ -20,7 +20,7 @@
namespace Lucene.Net.Demo.Html
{
- class ParserThread:SupportClass.ThreadClass
+ class ParserThread : SupportClass.ThreadClass
{
internal HTMLParser parser;
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/SimpleCharStream.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs Tue Jun 24 19:54:03 2008
@@ -124,14 +124,35 @@
int i;
try
{
- if ((i = inputStream.Read(buffer, maxNextCharInd, available - maxNextCharInd)) == - 1)
- {
- inputStream.Close();
- throw new System.IO.IOException();
- }
- else
- maxNextCharInd += i;
- return ;
+ // {DOUG-2.3.1}:
+ // java.io.Reader throws java.io.IOException when trying to read from a closed reader
+ // the structure of this program depends on this, as a subsequent call is made after the
+ // reader is closed, and (i hope) the state of the program is such that it exits cleanly.
+ // however...
+ // System.IO.StreamReader throws ObjectDisposedException, which is not a subclass
+ // of System.IO.IOException and causes the program to fail
+ // so...
+ // i'm adding an extra try/catch that will catch the ObjectDisposedException and
+ // throw an IOException with the former being the cause of the latter
+ try
+ {
+ // {DOUG-2.3.1}:
+ // java.io.Reader.read(...) returns -1 at EOS
+ // System.IO.TextReader.Read(...) returns 0 at EOS
+ //if ((i = inputStream.Read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1)
+ if ((i = inputStream.Read(buffer, maxNextCharInd, available - maxNextCharInd)) == 0)
+ {
+ inputStream.Close();
+ throw new System.IO.IOException();
+ }
+ else
+ maxNextCharInd += i;
+ return;
+ }
+ catch (ObjectDisposedException ode)
+ {
+ throw new System.IO.IOException("cannot read from a closed Reader", ode);
+ }
}
catch (System.IO.IOException e)
{
@@ -218,27 +239,27 @@
return (c);
}
- /// <deprecated>
- /// </deprecated>
- /// <seealso cref="getEndColumn">
- /// </seealso>
-
- public virtual int GetColumn()
- {
- return bufcolumn[bufpos];
- }
-
- /// <deprecated>
- /// </deprecated>
- /// <seealso cref="getEndLine">
- /// </seealso>
-
- public virtual int GetLine()
- {
- return bufline[bufpos];
- }
+ /// <deprecated>
+ /// </deprecated>
+ /// <seealso cref="getEndColumn">
+ /// </seealso>
- public virtual int GetEndColumn()
+ public virtual int GetColumn()
+ {
+ return bufcolumn[bufpos];
+ }
+
+ /// <deprecated>
+ /// </deprecated>
+ /// <seealso cref="getEndLine">
+ /// </seealso>
+
+ public virtual int GetLine()
+ {
+ return bufline[bufpos];
+ }
+
+ public virtual int GetEndColumn()
{
return bufcolumn[bufpos];
}
@@ -282,11 +303,11 @@
{
}
- public SimpleCharStream(System.IO.StreamReader dstream):this(dstream, 1, 1, 4096)
+ public SimpleCharStream(System.IO.StreamReader dstream) : this(dstream, 1, 1, 4096)
{
}
-
- public virtual void ReInit(System.IO.StreamReader dstream, int startline, int startcolumn, int buffersize)
+
+ public virtual void ReInit(System.IO.StreamReader dstream, int startline, int startcolumn, int buffersize)
{
inputStream = dstream;
line = startline;
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Tags.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/Tags.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Tags.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Tags.cs Tue Jun 24 19:54:03 2008
@@ -25,8 +25,8 @@
{
/// <summary> contains all tags for which whitespaces have to be inserted for proper tokenization</summary>
- public static readonly System.Collections.Hashtable WS_ELEMS = new System.Collections.Hashtable();
- static Tags()
+ public static readonly System.Collections.Hashtable WS_ELEMS = new System.Collections.Hashtable();
+ static Tags()
{
{
WS_ELEMS.Add("<hr", "<hr");
@@ -59,7 +59,7 @@
WS_ELEMS.Add("</h5", "</h5");
WS_ELEMS.Add("<h6", "<h6");
WS_ELEMS.Add("</h6", "</h6");
- }
+ }
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/TokenMgrError.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.cs Tue Jun 24 19:54:03 2008
@@ -23,7 +23,7 @@
{
[Serializable]
- public class TokenMgrError:System.ApplicationException
+ public class TokenMgrError : System.ApplicationException
{
/// <summary> You can also modify the body of this method to customize your error messages.
/// For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTMLDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTMLDocument.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTMLDocument.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTMLDocument.cs Tue Jun 24 19:54:03 2008
@@ -17,8 +17,8 @@
using System;
-using HTMLParser = Lucene.Net.Demo.Html.HTMLParser;
using Lucene.Net.Documents;
+using HTMLParser = Lucene.Net.Demo.Html.HTMLParser;
namespace Lucene.Net.Demo
{
@@ -41,7 +41,7 @@
public static System.String Uid2url(System.String uid)
{
System.String url = uid.Replace('\u0000', '/'); // replace nulls with slashes
- return url.Substring(0, (url.LastIndexOf((System.Char) '/')) - (0)); // remove date from end
+ return url.Substring(0, (url.LastIndexOf('/')) - (0)); // remove date from end
}
public static Document Document(System.IO.FileInfo f)
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexFiles/AssemblyInfo.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs Tue Jun 24 19:54:03 2008
@@ -33,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
//
// Version information for an assembly consists of the following four values:
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.003")]
+[assembly: AssemblyVersion("2.3.1.001")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexFiles/IndexFiles.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.cs Tue Jun 24 19:54:03 2008
@@ -17,24 +17,24 @@
using System;
-using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
using IndexWriter = Lucene.Net.Index.IndexWriter;
+using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
namespace Lucene.Net.Demo
{
- /// <summary>Index all text files under a directory. </summary>
- class IndexFiles
+ /// <summary>Index all text files under a directory. </summary>
+ public class IndexFiles
{
-
- private IndexFiles()
- {
- }
+
+ private IndexFiles()
+ {
+ }
internal static readonly System.IO.FileInfo INDEX_DIR = new System.IO.FileInfo("index");
- /// <summary>Index all text files under a directory. </summary>
- [STAThread]
+ /// <summary>Index all text files under a directory. </summary>
+ [STAThread]
public static void Main(System.String[] args)
{
System.String usage = typeof(IndexFiles) + " <root_directory>";
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexFiles/IndexFiles.csproj?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.csproj Tue Jun 24 19:54:03 2008
@@ -1,114 +1,110 @@
-<VisualStudioProject>
- <CSHARP
- ProjectType = "Local"
- ProductVersion = "7.10.3077"
- SchemaVersion = "2.0"
- ProjectGuid = "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
- >
- <Build>
- <Settings
- ApplicationIcon = "App.ico"
- AssemblyKeyContainerName = ""
- AssemblyName = "IndexFiles"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "Exe"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "IndexFiles"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = ""
- >
- <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "true"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- <Config
- Name = "Release"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
- DocumentationFile = "IndexFiles.xml"
- DebugSymbols = "false"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "true"
- OutputPath = "bin\Release\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- </Settings>
- <References>
- <Reference
- Name = "System"
- AssemblyName = "System"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
- />
- <Reference
- Name = "System.Data"
- AssemblyName = "System.Data"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
- />
- <Reference
- Name = "System.XML"
- AssemblyName = "System.Xml"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
- />
- <Reference
- Name = "DemoLib"
- Project = "{72AE650A-73E9-4F01-918B-5B166C2129FA}"
- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- />
- <Reference
- Name = "Lucene.Net"
- AssemblyName = "Lucene.Net"
- HintPath = "..\..\Lucene.Net\bin\Debug\Lucene.Net.dll"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File
- RelPath = "App.ico"
- BuildAction = "Content"
- />
- <File
- RelPath = "AssemblyInfo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "IndexFiles.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- </Include>
- </Files>
- </CSHARP>
-</VisualStudioProject>
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{3E561192-4292-4998-BC67-8C1B82A56108}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>App.ico</ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>IndexFiles</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Exe</OutputType>
+ <RootNamespace>IndexFiles</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>IndexFiles.xml</DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Lucene.Net">
+ <Name>Lucene.Net</Name>
+ <HintPath>..\..\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\DemoLib\DemoLib.csproj">
+ <Name>DemoLib</Name>
+ <Project>{72AE650A-73E9-4F01-918B-5B166C2129FA}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="App.ico" />
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="IndexFiles.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexHtml/AssemblyInfo.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs Tue Jun 24 19:54:03 2008
@@ -33,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
//
// Version information for an assembly consists of the following four values:
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.003")]
+[assembly: AssemblyVersion("2.3.1.001")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexHtml/IndexHtml.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.cs Tue Jun 24 19:54:03 2008
@@ -17,30 +17,30 @@
using System;
-using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
using Document = Lucene.Net.Documents.Document;
using IndexReader = Lucene.Net.Index.IndexReader;
using IndexWriter = Lucene.Net.Index.IndexWriter;
using Term = Lucene.Net.Index.Term;
using TermEnum = Lucene.Net.Index.TermEnum;
+using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
namespace Lucene.Net.Demo
{
- /// <summary>Indexer for HTML files. </summary>
- public class IndexHTML
+ /// <summary>Indexer for HTML files. </summary>
+ public class IndexHTML
{
- private IndexHTML()
- {
- }
+ private IndexHTML()
+ {
+ }
- private static bool deleting = false; // true during deletion pass
+ private static bool deleting = false; // true during deletion pass
private static IndexReader reader; // existing index
private static IndexWriter writer; // new index being built
private static TermEnum uidIter; // document id iterator
- /// <summary>Indexer for HTML files.</summary>
- [STAThread]
+ /// <summary>Indexer for HTML files.</summary>
+ [STAThread]
public static void Main(System.String[] argv)
{
try
@@ -86,7 +86,7 @@
deleting = true;
IndexDocs(root, index, create);
}
- writer = new IndexWriter(index, new StandardAnalyzer(), create);
+ writer = new IndexWriter(index, new StandardAnalyzer(), create);
writer.SetMaxFieldLength(1000000);
IndexDocs(root, index, create); // add new docs
@@ -150,7 +150,7 @@
System.String[] files = System.IO.Directory.GetFileSystemEntries(file.FullName); // list its files
System.Array.Sort(files); // sort the files
for (int i = 0; i < files.Length; i++)
- // recursively index them
+ // recursively index them
IndexDocs(new System.IO.FileInfo(files[i]));
}
else if (file.FullName.EndsWith(".html") || file.FullName.EndsWith(".htm") || file.FullName.EndsWith(".txt"))
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexHtml/IndexHtml.csproj?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.csproj Tue Jun 24 19:54:03 2008
@@ -1,114 +1,110 @@
-<VisualStudioProject>
- <CSHARP
- ProjectType = "Local"
- ProductVersion = "7.10.3077"
- SchemaVersion = "2.0"
- ProjectGuid = "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
- >
- <Build>
- <Settings
- ApplicationIcon = "App.ico"
- AssemblyKeyContainerName = ""
- AssemblyName = "IndexHtml"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "Exe"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "IndexHtml"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = ""
- >
- <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "true"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- <Config
- Name = "Release"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
- DocumentationFile = "IndexHtml.xml"
- DebugSymbols = "false"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "true"
- OutputPath = "bin\Release\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- </Settings>
- <References>
- <Reference
- Name = "System"
- AssemblyName = "System"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
- />
- <Reference
- Name = "System.Data"
- AssemblyName = "System.Data"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
- />
- <Reference
- Name = "System.XML"
- AssemblyName = "System.Xml"
- HintPath = "D:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
- />
- <Reference
- Name = "DemoLib"
- Project = "{72AE650A-73E9-4F01-918B-5B166C2129FA}"
- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- />
- <Reference
- Name = "Lucene.Net"
- AssemblyName = "Lucene.Net"
- HintPath = "..\..\Lucene.Net\bin\Debug\Lucene.Net.dll"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File
- RelPath = "App.ico"
- BuildAction = "Content"
- />
- <File
- RelPath = "AssemblyInfo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "IndexHtml.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- </Include>
- </Files>
- </CSHARP>
-</VisualStudioProject>
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{2B86751C-0D3A-486E-A176-E995C63EB653}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>App.ico</ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>IndexHtml</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Exe</OutputType>
+ <RootNamespace>IndexHtml</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>IndexHtml.xml</DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Lucene.Net">
+ <Name>Lucene.Net</Name>
+ <HintPath>..\..\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\DemoLib\DemoLib.csproj">
+ <Name>DemoLib</Name>
+ <Project>{72AE650A-73E9-4F01-918B-5B166C2129FA}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="App.ico" />
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="IndexHtml.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/SearchFiles/AssemblyInfo.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs Tue Jun 24 19:54:03 2008
@@ -33,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
//
// Version information for an assembly consists of the following four values:
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.003")]
+[assembly: AssemblyVersion("2.3.1.001")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/SearchFiles/SearchFiles.cs?rev=671408&r1=671407&r2=671408&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles.cs Tue Jun 24 19:54:03 2008
@@ -17,12 +17,12 @@
using System;
-using Analyzer = Lucene.Net.Analysis.Analyzer;
-using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
using Document = Lucene.Net.Documents.Document;
using FilterIndexReader = Lucene.Net.Index.FilterIndexReader;
using IndexReader = Lucene.Net.Index.IndexReader;
using QueryParser = Lucene.Net.QueryParsers.QueryParser;
+using Analyzer = Lucene.Net.Analysis.Analyzer;
+using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
using Hits = Lucene.Net.Search.Hits;
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
using Query = Lucene.Net.Search.Query;
@@ -31,8 +31,8 @@
namespace Lucene.Net.Demo
{
- /// <summary>Simple command-line based search demo. </summary>
- public class SearchFiles
+ /// <summary>Simple command-line based search demo. </summary>
+ public class SearchFiles
{
/// <summary>Use the norms from one field for all fields. Norms are read into memory,
@@ -41,11 +41,11 @@
/// memory. If all of the fields contain only a single token, then the norms
/// are all identical, then single norm vector may be shared.
/// </summary>
- private class OneNormsReader : FilterIndexReader
+ private class OneNormsReader:FilterIndexReader
{
private System.String field;
- public OneNormsReader(IndexReader in_Renamed, System.String field):base(in_Renamed)
+ public OneNormsReader(IndexReader in_Renamed, System.String field) : base(in_Renamed)
{
this.field = field;
}
@@ -56,12 +56,12 @@
}
}
- private SearchFiles()
- {
- }
+ private SearchFiles()
+ {
+ }
- /// <summary>Simple command-line based search demo. </summary>
- [STAThread]
+ /// <summary>Simple command-line based search demo. </summary>
+ [STAThread]
public static void Main(System.String[] args)
{
System.String usage = "Usage: " + typeof(SearchFiles) + " [-index dir] [-field f] [-repeat n] [-queries file] [-raw] [-norms field]";
@@ -132,7 +132,7 @@
while (true)
{
if (queries == null)
- // prompt the user
+ // prompt the user
System.Console.Out.Write("Query: ");
System.String line = in_Renamed.ReadLine();
@@ -191,7 +191,7 @@
}
if (queries != null)
- // non-interactive
+ // non-interactive
break;
if (hits.Length() > end)