Actualization to NH3.1.0

git-svn-id: https://nhcontrib.svn.sourceforge.net/svnroot/nhcontrib/trunk@1667 d7b3437e-3345-0410-94a8-cbd290e69f67
JamesKovacs · Mar 16, 2011 · 5edbfd5 · 5edbfd5
1 parent 311718f
commit 5edbfd5
Show file tree

Hide file tree

Showing 13 changed files with 991 additions and 487 deletions.
diff --git a/src/NHibernate.Search/lib/Antlr3.Runtime.dll b/src/NHibernate.Search/lib/Antlr3.Runtime.dll
diff --git a/src/NHibernate.Search/lib/Iesi.Collections.dll b/src/NHibernate.Search/lib/Iesi.Collections.dll
diff --git a/src/NHibernate.Search/lib/Iesi.Collections.pdb b/src/NHibernate.Search/lib/Iesi.Collections.pdb
diff --git a/src/NHibernate.Search/lib/NHibernate.ByteCode.Castle.dll b/src/NHibernate.Search/lib/NHibernate.ByteCode.Castle.dll
diff --git a/src/NHibernate.Search/lib/NHibernate.ByteCode.Castle.pdb b/src/NHibernate.Search/lib/NHibernate.ByteCode.Castle.pdb
diff --git a/src/NHibernate.Search/lib/NHibernate.dll b/src/NHibernate.Search/lib/NHibernate.dll
diff --git a/src/NHibernate.Search/lib/NHibernate.pdb b/src/NHibernate.Search/lib/NHibernate.pdb
diff --git a/src/NHibernate.Search/lib/NHibernate.xml b/src/NHibernate.Search/lib/NHibernate.xml
diff --git a/src/NHibernate.Search/lib/Remotion.Data.Linq.dll b/src/NHibernate.Search/lib/Remotion.Data.Linq.dll
diff --git a/src/NHibernate.Search/lib/nhibernate-mapping.xsd b/src/NHibernate.Search/lib/nhibernate-mapping.xsd
@@ -1342,6 +1342,7 @@
 					<xs:element ref="one-to-one" />
 					<xs:element ref="component" />
 					<xs:element ref="dynamic-component" />
+					<xs:element ref="properties" />
 					<xs:element ref="any" />
 					<xs:element ref="map" />
 					<xs:element ref="set" />

diff --git a/src/NHibernate.Search/lib/nunit.framework.extensions.dll b/src/NHibernate.Search/lib/nunit.framework.extensions.dll
diff --git a/src/NHibernate.Search/src/NHibernate.Search.Tests/NHibernate.Search.Tests.csproj b/src/NHibernate.Search/src/NHibernate.Search.Tests/NHibernate.Search.Tests.csproj
@@ -53,10 +53,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Antlr3.Runtime, Version=3.1.3.42154, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
     <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Iesi.Collections.dll</HintPath>

diff --git a/src/NHibernate.Search/src/NHibernate.Search/Impl/FullTextSessionImpl.cs b/src/NHibernate.Search/src/NHibernate.Search/Impl/FullTextSessionImpl.cs
@@ -93,7 +93,17 @@ public bool IsDirty()
             return session.IsDirty();
         }
 
-        public object GetIdentifier(object obj)
+    	public bool IsReadOnly(object entityOrProxy)
+    	{
+				return session.IsReadOnly(entityOrProxy);
+    	}
+
+    	public void SetReadOnly(object entityOrProxy, bool readOnly)
+    	{
+				session.SetReadOnly(entityOrProxy, readOnly);
+			}
+
+    	public object GetIdentifier(object obj)
         {
             return session.GetIdentifier(obj);
         }
@@ -190,7 +200,13 @@ public bool IsConnected
             get { return session.IsConnected; }
         }
 
-        public ITransaction Transaction
+    	public bool DefaultReadOnly
+    	{
+    		get { return session.DefaultReadOnly; }
+				set { session.DefaultReadOnly = value; }
+    	}
+
+    	public ITransaction Transaction
         {
             get { return session.Transaction; }
         }
@@ -385,11 +401,6 @@ public IQuery CreateQuery(string queryString)
             return session.CreateQuery(queryString);
         }
 
-    	public IQuery CreateQuery(IQueryExpression queryExpression)
-    	{
-    		return session.CreateQuery(queryExpression);
-    	}
-
     	public IQuery CreateFilter(object collection, string queryString)
         {
             return session.CreateFilter(collection, queryString);