Permalink
Browse files

Added signed version of Lucene.Net compiled for .NET 1.1

NHibernate.Search ported to .NET 1.1, compiles but can't compile/run tests due to strange compiler/VS errors
Code passes tests under .NET 2.0.

SVN: branches/1.2.x@3143
  • Loading branch information...
phatcher committed Dec 4, 2007
1 parent 1233902 commit 4220ddace3ad981558ee8a17c6ba6c4dd14d9935
Showing with 7,404 additions and 98 deletions.
  1. BIN lib/net/1.1/Lucene.Net.dll
  2. BIN lib/net/1.1/Lucene.Net.pdb
  3. +6,740 −0 lib/net/1.1/Lucene.Net.xml
  4. +19 −0 src/NHibernate.Everything-1.1.sln
  5. +29 −21 src/NHibernate.Search.Tests/Bridge/Cloud.cs
  6. +4 −0 src/NHibernate.Search.Tests/Bridge/TruncateFieldBridge.cs
  7. +4 −0 src/NHibernate.Search.Tests/DirectoryProvider/FSSlaveAndMasterDPTest.cs
  8. +19 −0 src/NHibernate.Search.Tests/DirectoryProvider/MultiplySessionFactoriesTestCase.cs
  9. +2 −0 src/NHibernate.Search.Tests/FileHleperTestCase.cs
  10. +5 −5 src/NHibernate.Search.Tests/NHibernate.Search.Tests-2.0.csproj
  11. +1 −1 src/NHibernate.Search/AttributeUtil.cs
  12. +0 −1 src/NHibernate.Search/Attributes/Indexed.cs
  13. +0 −1 src/NHibernate.Search/Attributes/IndexedEmbedded.cs
  14. +11 −0 src/NHibernate.Search/Backend/IBackendQueueProcessorFactory.cs
  15. +18 −0 src/NHibernate.Search/Backend/IQueueingProcessor.cs
  16. +18 −1 src/NHibernate.Search/Backend/Impl/BatchedQueueingProcessor.cs
  17. +30 −2 src/NHibernate.Search/Backend/Impl/Lucene/LuceneBackendQueueProcessor.cs
  18. +10 −0 src/NHibernate.Search/Backend/Impl/Lucene/LuceneBackendQueueProcessorFactory.cs
  19. +0 −1 src/NHibernate.Search/Backend/OptimizeLuceneWork.cs
  20. +0 −1 src/NHibernate.Search/Backend/PurgeAllLuceneWork.cs
  21. +28 −3 src/NHibernate.Search/Backend/Workspace.cs
  22. +30 −10 src/NHibernate.Search/Bridge/BridgeFactory.cs
  23. +22 −0 src/NHibernate.Search/Bridge/Builtin/BoolBridge.cs
  24. +22 −0 src/NHibernate.Search/Bridge/Builtin/DoubleBridge.cs
  25. +22 −0 src/NHibernate.Search/Bridge/Builtin/FloatBridge.cs
  26. +22 −0 src/NHibernate.Search/Bridge/Builtin/IntBridge.cs
  27. +22 −0 src/NHibernate.Search/Bridge/Builtin/LongBridge.cs
  28. +22 −0 src/NHibernate.Search/Bridge/Builtin/ShortBridge.cs
  29. +5 −1 src/NHibernate.Search/Bridge/IFieldBridge.cs
  30. +6 −1 src/NHibernate.Search/Bridge/ITwoWayFieldBridge.cs
  31. +7 −2 src/NHibernate.Search/Bridge/String2FieldBridgeAdaptor.cs
  32. +4 −0 src/NHibernate.Search/Bridge/TwoWayString2FieldBridgeAdaptor.cs
  33. +16 −1 src/NHibernate.Search/DirectoryProviderHelper.cs
  34. +103 −22 src/NHibernate.Search/Engine/DocumentBuilder.cs
  35. +16 −4 src/NHibernate.Search/Engine/SearchFactory.cs
  36. +4 −0 src/NHibernate.Search/IFullTextSession.cs
  37. +6 −0 src/NHibernate.Search/Impl/FullTextSessionImpl.cs
  38. +16 −5 src/NHibernate.Search/Impl/SearchInterceptor.cs
  39. +14 −2 src/NHibernate.Search/LuceneQueryExpression.cs
  40. +15 −3 src/NHibernate.Search/Query/FullTextQueryImpl.cs
  41. +34 −2 src/NHibernate.Search/Query/FullTextSearchHelper.cs
  42. +11 −2 src/NHibernate.Search/Store/DirectoryProviderFactory.cs
  43. +12 −0 src/NHibernate.Search/Store/FSMasterDirectoryProvider.cs
  44. +20 −1 src/NHibernate.Search/Store/FSSlaveDirectoryProvider.cs
  45. +11 −1 src/NHibernate.Search/Store/FileHelper.cs
  46. +4 −4 src/NHibernate.Test.Performance/NHibernate.Test.Performance-1.1.csproj
View
Binary file not shown.
View
Binary file not shown.
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -95,11 +95,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Caches.MemCache.
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Search-1.1", "NHibernate.Search\NHibernate.Search-1.1.csproj", "{F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Search.Tests-1.1", "NHibernate.Search.Tests\NHibernate.Search.Tests-1.1.csproj", "{F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F} = {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{0D8B57B0-1310-4EF0-B50C-DD22F37310C7}.Debug.ActiveCfg = Debug|.NET
{0D8B57B0-1310-4EF0-B50C-DD22F37310C7}.Debug.Build.0 = Debug|.NET
@@ -197,6 +208,14 @@ Global
{94E1F299-E404-4DDE-BFCE-A3E4F5AD3D41}.Debug.Build.0 = Debug|.NET
{94E1F299-E404-4DDE-BFCE-A3E4F5AD3D41}.Release.ActiveCfg = Release|.NET
{94E1F299-E404-4DDE-BFCE-A3E4F5AD3D41}.Release.Build.0 = Release|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Debug.ActiveCfg = Debug|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Debug.Build.0 = Debug|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Release.ActiveCfg = Release|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Release.Build.0 = Release|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Debug.ActiveCfg = Debug|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Debug.Build.0 = Debug|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Release.ActiveCfg = Release|.NET
+ {F6CDD71A-FDCA-43F1-A5FF-B2941224A66F}.Release.Build.0 = Release|.NET
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
..\NHibernateSolution.build = ..\NHibernateSolution.build
@@ -7,15 +7,18 @@ namespace NHibernate.Search.Tests.Bridge
public class Cloud
{
private int id;
+#if NET_2_0
private long? long1;
- private long long2;
private int? int1;
- private int int2;
private double? double1;
- private double double2;
private float? float1;
+#endif
+ private long long2;
+ private double double2;
private float float2;
+ private int int2;
private string string1;
+#if NET_2_0
private DateTime? dateTime;
private DateTime? dateTimeYear;
private DateTime? dateTimeMonth;
@@ -24,6 +27,7 @@ public class Cloud
private DateTime? dateTimeMinute;
private DateTime? dateTimeSecond;
private DateTime? dateTimeMillisecond;
+#endif
private String customFieldBridge;
private String customStringBridge;
private CloudType type;
@@ -52,6 +56,7 @@ public virtual int Id
set { this.id = value; }
}
+#if NET_2_0
[Field(Index.UnTokenized, Store = Store.Yes)]
public virtual long? Long1
{
@@ -60,45 +65,46 @@ public virtual int Id
}
[Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual long Long2
+ public virtual int? Int1
{
- get { return long2; }
- set { this.long2 = value; }
+ get { return int1; }
+ set { this.int1 = value; }
}
[Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual int? Int1
+ public virtual double? Double1
{
- get { return int1; }
- set { this.int1 = value; }
+ get { return double1; }
+ set { this.double1 = value; }
}
[Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual int Int2
+ public virtual float? Float1
{
- get { return int2; }
- set { this.int2 = value; }
+ get { return float1; }
+ set { this.float1 = value; }
}
+#endif
[Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual double? Double1
+ public virtual long Long2
{
- get { return double1; }
- set { this.double1 = value; }
+ get { return long2; }
+ set { this.long2 = value; }
}
[Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual double Double2
+ public virtual int Int2
{
- get { return double2; }
- set { this.double2 = value; }
+ get { return int2; }
+ set { this.int2 = value; }
}
[Field(Index.UnTokenized, Store = Store.Yes)]
- public virtual float? Float1
+ public virtual double Double2
{
- get { return float1; }
- set { this.float1 = value; }
+ get { return double2; }
+ set { this.double2 = value; }
}
[Field(Index.UnTokenized, Store = Store.Yes)]
@@ -115,6 +121,7 @@ public virtual string String1
set { this.string1 = value; }
}
+#if NET_2_0
[Field(Index.UnTokenized, Store = Store.Yes)]
public virtual DateTime? DateTime
{
@@ -183,6 +190,7 @@ public virtual string String1
get { return dateTimeMillisecond; }
set { this.dateTimeMillisecond = value; }
}
+#endif
[Field(Index.Tokenized)]
public virtual CloudType Type
@@ -14,7 +14,11 @@ public Object Get(String name, Document document)
return field.StringValue();
}
+#if NET_2_0
public void Set(String name, Object value, Document document, Field.Store store, Field.Index index, float? boost)
+#else
+ public void Set(String name, Object value, Document document, Field.Store store, Field.Index index, float boost)
+#endif
{
String indexedString = (String) value;
//Do not add fields on empty strings, seems a sensible default in most situations
@@ -106,7 +106,11 @@ protected void TearDown()
Directory.Delete("./lucenedirs/",true);
}
+#if NET_2_0
protected override void Configure(IList<Configuration> cfg)
+#else
+ protected override void Configure(IList cfg)
+#endif
{
//master
cfg[0].SetProperty("hibernate.search.default.sourceBase", "./lucenedirs/master/copy");
@@ -1,5 +1,7 @@
using System.Collections;
+#if NET_2_0
using System.Collections.Generic;
+#endif
using System.Reflection;
using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl;
@@ -9,12 +11,21 @@ namespace NHibernate.Search.Tests.DirectoryProvider
{
public abstract class MultiplySessionFactoriesTestCase
{
+#if NET_2_0
private List<ISessionFactory> sessionFactories = new List<ISessionFactory>();
private List<Configuration> configurations;
+#else
+ private IList sessionFactories = new ArrayList();
+ private IList configurations;
+#endif
protected abstract int NumberOfSessionFactories { get; }
+#if NET_2_0
protected IList<ISessionFactory> SessionFactories
+#else
+ protected IList SessionFactories
+#endif
{
get { return sessionFactories; }
}
@@ -47,7 +58,11 @@ public void BuildSessionFactories()
private void Configure()
{
+#if NET_2_0
configurations = new List<Configuration>();
+#else
+ configurations = new ArrayList();
+#endif
for (int i = 0; i < NumberOfSessionFactories; i++)
{
configurations.Add(CreateConfiguration());
@@ -67,7 +82,11 @@ private Configuration CreateConfiguration()
return cfg;
}
+#if NET_2_0
protected abstract void Configure(IList<Configuration> cfg);
+#else
+ protected abstract void Configure(IList cfg);
+#endif
protected abstract IList Mappings
{
@@ -1,5 +1,7 @@
using System;
+#if NET_2_0
using System.Collections.Generic;
+#endif
using System.IO;
using System.Text;
using System.Threading;
@@ -15,7 +15,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug-2.0\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -66,6 +66,10 @@
<Compile Include="Worker\WorkerTestCase.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\NHibernate.Search\NHibernate.Search-2.0.csproj">
+ <Project>{CC25D767-990D-4CE0-9F64-3426E244403B}</Project>
+ <Name>NHibernate.Search-2.0</Name>
+ </ProjectReference>
<ProjectReference Include="..\NHibernate.Test\NHibernate.Test-2.0.csproj">
<Project>{7AEE5B37-C552-4E59-9B6F-88755BCB5070}</Project>
<Name>NHibernate.Test-2.0</Name>
@@ -74,10 +78,6 @@
<Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project>
<Name>NHibernate-2.0</Name>
</ProjectReference>
- <ProjectReference Include="..\NHibernate.Search\NHibernate.Search-2.0.csproj">
- <Project>{CC25D767-990D-4CE0-9F64-3426E244403B}</Project>
- <Name>NHibernate.Search</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
@@ -37,7 +37,7 @@ public static DocumentIdAttribute GetDocumentId(MemberInfo member)
documentIdAttribute.Name = documentIdAttribute.Name ?? member.Name;
#else
if (documentIdAttribute.Name == null)
- docuementIdAttribute.Name = member.Name;
+ documentIdAttribute.Name = member.Name;
#endif
return documentIdAttribute;
}
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Text;
namespace NHibernate.Search.Attributes
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Text;
namespace NHibernate.Search.Attributes
@@ -1,5 +1,7 @@
using System.Collections;
+#if NET_2_0
using System.Collections.Generic;
+#endif
using System.Threading;
namespace NHibernate.Search.Backend
@@ -13,11 +15,20 @@ public interface IBackendQueueProcessorFactory
{
void Initialize(IDictionary props, SearchFactory searchFactory);
+#if NET_2_0
/// <summary>
/// Return a runnable implementation responsible for processing the queue to a given backend
/// </summary>
/// <param name="queue"></param>
/// <returns></returns>
WaitCallback GetProcessor(List<LuceneWork> queue);
+#else
+ /// <summary>
+ /// Return a runnable implementation responsible for processing the queue to a given backend
+ /// </summary>
+ /// <param name="queue"></param>
+ /// <returns></returns>
+ WaitCallback GetProcessor(IList queue);
+#endif
}
}
@@ -1,4 +1,8 @@
+#if NET_2_0
using System.Collections.Generic;
+#else
+using System.Collections;
+#endif
namespace NHibernate.Search.Backend
{
@@ -9,6 +13,7 @@ namespace NHibernate.Search.Backend
/// </summary>
public interface IQueueingProcessor
{
+#if NET_2_0
/// <summary>
/// Performs all the work in the queue
/// </summary>
@@ -20,5 +25,18 @@ public interface IQueueingProcessor
/// </summary>
/// <param name="queue"></param>
void CancelWork(List<LuceneWork> queue);
+#else
+ /// <summary>
+ /// Performs all the work in the queue
+ /// </summary>
+ /// <param name="queue">The queue.</param>
+ void PerformWork(IList queue);
+
+ /// <summary>
+ /// Rollback
+ /// </summary>
+ /// <param name="queue"></param>
+ void CancelWork(IList queue);
+#endif
}
}
Oops, something went wrong.

0 comments on commit 4220dda

Please sign in to comment.