nhibernate-commit Mailing List for NHibernate (Page 94)

Brought to you by: ayenderahien, bahusoid, fabiomaulo, fdelaporte, and 5 others

nhibernate-commit — CVS Commits

You can subscribe to this list here.

2004	Jan	Feb	Mar	Apr (248)	May (82)	Jun (90)	Jul (177)	Aug (253)	Sep (157)	Oct (151)	Nov (143)	Dec (278)
2005	Jan (152)	Feb (107)	Mar (177)	Apr (133)	May (259)	Jun (81)	Jul (119)	Aug (306)	Sep (416)	Oct (240)	Nov (329)	Dec (206)
2006	Jan (466)	Feb (382)	Mar (153)	Apr (162)	May (133)	Jun (21)	Jul (18)	Aug (37)	Sep (97)	Oct (114)	Nov (110)	Dec (28)
2007	Jan (74)	Feb (65)	Mar (49)	Apr (76)	May (43)	Jun (15)	Jul (68)	Aug (55)	Sep (63)	Oct (59)	Nov (70)	Dec (66)
2008	Jan (71)	Feb (60)	Mar (120)	Apr (31)	May (48)	Jun (81)	Jul (107)	Aug (51)	Sep (80)	Oct (83)	Nov (83)	Dec (79)
2009	Jan (83)	Feb (110)	Mar (97)	Apr (91)	May (291)	Jun (250)	Jul (197)	Aug (58)	Sep (54)	Oct (122)	Nov (68)	Dec (34)
2010	Jan (50)	Feb (17)	Mar (63)	Apr (61)	May (84)	Jun (81)	Jul (138)	Aug (144)	Sep (78)	Oct (26)	Nov (30)	Dec (61)
2011	Jan (33)	Feb (35)	Mar (166)	Apr (221)	May (109)	Jun (76)	Jul (27)	Aug (37)	Sep (1)	Oct (4)	Nov (2)	Dec (1)
2012	Jan	Feb	Mar (2)	Apr (2)	May	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec
2013	Jan	Feb (1)	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (3)	Oct (2)	Nov	Dec (1)
2014	Jan (1)	Feb (1)	Mar (3)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 92 93 94 95 96 .. 379 > >> (Page 94 of 379)

[Nhibernate-commit] SF.net SVN: nhibernate:[3794] trunk/nhibernate/default.build

From: <aye...@us...> - 2008-09-28 16:54:16

Revision: 3794
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3794&view=rev
Author:   ayenderahien
Date:     2008-09-28 16:54:05 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
Requiring .Net 3.5 for building the project.
from now on, either nant needs to be setup to use net-3.5 by default, or needs to be invoked with -t:net-3.5

Modified Paths:
--------------
    trunk/nhibernate/default.build

Modified: trunk/nhibernate/default.build
===================================================================
--- trunk/nhibernate/default.build	2008-09-28 15:04:20 UTC (rev 3793)
+++ trunk/nhibernate/default.build	2008-09-28 16:54:05 UTC (rev 3794)
@@ -92,7 +92,7 @@
 	</target>
 
 	<target name="build"
-		depends="init prepare-build-directory"
+		depends="check-framework-version init prepare-build-directory"
 		description="Builds NHibernate in the current configuration">
 
 		<nant target="build">
@@ -100,6 +100,11 @@
 		</nant>
 
 	</target>
+	
+	<target name="check-framework-version">
+			<echo>Running with ${framework::get-target-framework()}</echo>
+			<fail message="ERROR: NHibernate requires .Net 3.5 to compile (but can run on .Net 2.0), please use the -t:net-3.5 parameter when starting nant" if="${framework::get-target-framework()!='net-3.5'}"/>
+	</target>
 
 	<target name="test-report" if="${nunit2report.installed}">
 		<mkdir dir="${build.dir}/testresults" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3793] trunk/nhibernate/external-bin/FirebirdSql. Data.Firebird.dll

From: <fab...@us...> - 2008-09-28 15:04:30

Revision: 3793
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3793&view=rev
Author:   fabiomaulo
Date:     2008-09-28 15:04:20 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
Unnecessary bin removed

Removed Paths:
-------------
    trunk/nhibernate/external-bin/FirebirdSql.Data.Firebird.dll


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3792] trunk/nhibernate/src

From: <fab...@us...> - 2008-09-28 14:38:22

Revision: 3792
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3792&view=rev
Author:   fabiomaulo
Date:     2008-09-28 14:38:08 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
All project-solutions are now working with VS2008 (going to checkout a fresh svn-copy)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Tool.HbmXsd/NHibernate.Tool.HbmXsd.csproj

Added Paths:
-----------
    trunk/nhibernate/src/Iesi.Collections/Iesi.Collections.csproj
    trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
    trunk/nhibernate/src/Iesi.Collections.sln
    trunk/nhibernate/src/NHibernate/NHibernate.csproj
    trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
    trunk/nhibernate/src/NHibernate.Everything.sln
    trunk/nhibernate/src/NHibernate.Examples/NHibernate.Examples.csproj
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
    trunk/nhibernate/src/NHibernate.Test.Performance/NHibernate.Test.Performance.csproj
    trunk/nhibernate/src/NHibernate.sln

Removed Paths:
-------------
    trunk/nhibernate/src/Iesi.Collections/Iesi.Collections-2.0.csproj
    trunk/nhibernate/src/Iesi.Collections-2.0.sln
    trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test-2.0.csproj
    trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj
    trunk/nhibernate/src/NHibernate/NHibernate-3.5.csproj
    trunk/nhibernate/src/NHibernate-2.0.sln
    trunk/nhibernate/src/NHibernate-3.5.sln
    trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-2.0.csproj
    trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-3.5.csproj
    trunk/nhibernate/src/NHibernate.Everything-2.0.sln
    trunk/nhibernate/src/NHibernate.Examples/NHibernate.Examples-2.0.csproj
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
    trunk/nhibernate/src/NHibernate.Test.Performance/NHibernate.Test.Performance-2.0.csproj

Deleted: trunk/nhibernate/src/Iesi.Collections/Iesi.Collections-2.0.csproj
===================================================================
--- trunk/nhibernate/src/Iesi.Collections/Iesi.Collections-2.0.csproj	2008-09-28 13:49:40 UTC (rev 3791)
+++ trunk/nhibernate/src/Iesi.Collections/Iesi.Collections-2.0.csproj	2008-09-28 14:38:08 UTC (rev 3792)
@@ -1,66 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Iesi.Collections</RootNamespace>
-    <AssemblyName>Iesi.Collections</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="DictionarySet.cs" />
-    <Compile Include="Generic\DictionarySet.cs" />
-    <Compile Include="Generic\HashedSet.cs" />
-    <Compile Include="Generic\ImmutableSet.cs" />
-    <Compile Include="Generic\ISet.cs" />
-    <Compile Include="Generic\Set.cs" />
-    <Compile Include="Generic\SortedSet.cs" />
-    <Compile Include="Generic\SynchronizedSet.cs" />
-    <Compile Include="HashedSet.cs" />
-    <Compile Include="HybridSet.cs" />
-    <Compile Include="ImmutableSet.cs" />
-    <Compile Include="ISet.cs" />
-    <Compile Include="ListSet.cs" />
-    <Compile Include="Set.cs" />
-    <Compile Include="SortedSet.cs" />
-    <Compile Include="SynchronizedSet.cs" />
-    <None Include="Iesi.Collections.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="NamespaceSummary.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file

Copied: trunk/nhibernate/src/Iesi.Collections/Iesi.Collections.csproj (from rev 3791, trunk/nhibernate/src/Iesi.Collections/Iesi.Collections-2.0.csproj)
===================================================================
--- trunk/nhibernate/src/Iesi.Collections/Iesi.Collections.csproj	                        (rev 0)
+++ trunk/nhibernate/src/Iesi.Collections/Iesi.Collections.csproj	2008-09-28 14:38:08 UTC (rev 3792)
@@ -0,0 +1,71 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Iesi.Collections</RootNamespace>
+    <AssemblyName>Iesi.Collections</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug-2.0\</OutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release-2.0\</OutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="DictionarySet.cs" />
+    <Compile Include="Generic\DictionarySet.cs" />
+    <Compile Include="Generic\HashedSet.cs" />
+    <Compile Include="Generic\ImmutableSet.cs" />
+    <Compile Include="Generic\ISet.cs" />
+    <Compile Include="Generic\Set.cs" />
+    <Compile Include="Generic\SortedSet.cs" />
+    <Compile Include="Generic\SynchronizedSet.cs" />
+    <Compile Include="HashedSet.cs" />
+    <Compile Include="HybridSet.cs" />
+    <Compile Include="ImmutableSet.cs" />
+    <Compile Include="ISet.cs" />
+    <Compile Include="ListSet.cs" />
+    <Compile Include="Set.cs" />
+    <Compile Include="SortedSet.cs" />
+    <Compile Include="SynchronizedSet.cs" />
+    <None Include="Iesi.Collections.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="NamespaceSummary.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file


Property changes on: trunk/nhibernate/src/Iesi.Collections/Iesi.Collections.csproj
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Deleted: trunk/nhibernate/src/Iesi.Collections-2.0.sln
===================================================================
--- trunk/nhibernate/src/Iesi.Collections-2.0.sln	2008-09-28 13:49:40 UTC (rev 3791)
+++ trunk/nhibernate/src/Iesi.Collections-2.0.sln	2008-09-28 14:38:08 UTC (rev 3792)
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iesi.Collections-2.0", "Iesi.Collections\Iesi.Collections-2.0.csproj", "{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iesi.Collections.Test-2.0", "Iesi.Collections.Test\Iesi.Collections.Test-2.0.csproj", "{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test-2.0.csproj
===================================================================
--- trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test-2.0.csproj	2008-09-28 13:49:40 UTC (rev 3791)
+++ trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test-2.0.csproj	2008-09-28 14:38:08 UTC (rev 3792)
@@ -1,76 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Iesi.Collections.Test</RootNamespace>
-    <AssemblyName>Iesi.Collections.Test</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Generic\HashedSetFixture.cs" />
-    <Compile Include="Generic\ImmutableSetFixture.cs" />
-    <Compile Include="Generic\SetFixture.cs" />
-    <Compile Include="Generic\SortedSetFixture.cs" />
-    <Compile Include="HashedSetFixture.cs" />
-    <Compile Include="HybridSetFixture.cs" />
-    <Compile Include="ListSetFixture.cs" />
-    <Compile Include="SetFixture.cs" />
-    <Compile Include="SortedSetFixture.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Iesi.Collections.Test.build" />
-    <None Include="Iesi.Collections.Test.nunit" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Iesi.Collections\Iesi.Collections-2.0.csproj">
-      <Project>{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}</Project>
-      <Name>Iesi.Collections-2.0</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file

Copied: trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj (from rev 3791, trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test-2.0.csproj)
===================================================================
--- trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj	                        (rev 0)
+++ trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj	2008-09-28 14:38:08 UTC (rev 3792)
@@ -0,0 +1,81 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Iesi.Collections.Test</RootNamespace>
+    <AssemblyName>Iesi.Collections.Test</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug-2.0\</OutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release-2.0\</OutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\net\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Generic\HashedSetFixture.cs" />
+    <Compile Include="Generic\ImmutableSetFixture.cs" />
+    <Compile Include="Generic\SetFixture.cs" />
+    <Compile Include="Generic\SortedSetFixture.cs" />
+    <Compile Include="HashedSetFixture.cs" />
+    <Compile Include="HybridSetFixture.cs" />
+    <Compile Include="ListSetFixture.cs" />
+    <Compile Include="SetFixture.cs" />
+    <Compile Include="SortedSetFixture.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Iesi.Collections.Test.build" />
+    <None Include="Iesi.Collections.Test.nunit" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Iesi.Collections\Iesi.Collections.csproj">
+      <Project>{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}</Project>
+      <Name>Iesi.Collections</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file


Property changes on: trunk/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Added: trunk/nhibernate/src/Iesi.Collections.sln
===================================================================
--- trunk/nhibernate/src/Iesi.Collections.sln	                        (rev 0)
+++ trunk/nhibernate/src/Iesi.Collections.sln	2008-09-28 14:38:08 UTC (rev 3792)
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iesi.Collections", "Iesi.Collections\Iesi.Collections.csproj", "{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iesi.Collections.Test", "Iesi.Collections.Test\Iesi.Collections.Test.csproj", "{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58CE4584-31B9-4E74-A7FB-5D40BFAD0876}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Deleted: trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj	2008-09-28 13:49:40 UTC (rev 3791)
+++ trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj	2008-09-28 14:38:08 UTC (rev 3792)
@@ -1,1136 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NHibernate</RootNamespace>
-    <AssemblyName>NHibernate</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug-2.0\NHibernate.XML</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <WarningsAsErrors>1717;1574</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.DynamicProxy2, Version=2.0.0.1, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Castle.DynamicProxy2.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ADOException.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="AssertionFailure.cs" />
-    <Compile Include="Cache\CachedItem.cs" />
-    <Compile Include="Cache\CacheException.cs" />
-    <Compile Include="Cache\CacheFactory.cs" />
-    <Compile Include="Cache\CacheLock.cs" />
-    <Compile Include="Cache\HashtableCache.cs" />
-    <Compile Include="Cache\HashtableCacheProvider.cs" />
-    <Compile Include="Cache\ICache.cs" />
-    <Compile Include="Cache\ICacheConcurrencyStrategy.cs" />
-    <Compile Include="Cache\ICacheProvider.cs" />
-    <Compile Include="Cache\IQueryCache.cs" />
-    <Compile Include="Cache\IQueryCacheFactory.cs" />
-    <Compile Include="Cache\ISoftLock.cs" />
-    <Compile Include="Cache\NonstrictReadWriteCache.cs" />
-    <Compile Include="Cache\QueryKey.cs" />
-    <Compile Include="Cache\ReadOnlyCache.cs" />
-    <Compile Include="Cache\ReadWriteCache.cs" />
-    <Compile Include="Cache\StandardQueryCache.cs" />
-    <Compile Include="Cache\StandardQueryCacheFactory.cs" />
-    <Compile Include="Cache\Timestamper.cs" />
-    <Compile Include="Cache\UpdateTimestampsCache.cs" />
-    <Compile Include="CallbackException.cs" />
-    <Compile Include="Cfg\MappingsQueue.cs" />
-    <Compile Include="Cfg\Configuration.cs" />
-    <Compile Include="Cfg\ConfigurationSectionHandler.cs" />
-    <Compile Include="Cfg\DefaultNamingStrategy.cs" />
-    <Compile Include="Cfg\Environment.cs" />
-    <Compile Include="Cfg\ImprovedNamingStrategy.cs" />
-    <Compile Include="Cfg\INamingStrategy.cs" />
-    <Compile Include="Cfg\Mappings.cs" />
-    <Compile Include="Cfg\Settings.cs" />
-    <Compile Include="Cfg\SettingsFactory.cs" />
-    <Compile Include="Collection\IPersistentCollection.cs" />
-    <Compile Include="Connection\ConnectionProvider.cs" />
-    <Compile Include="Connection\ConnectionProviderFactory.cs" />
-    <Compile Include="Connection\DriverConnectionProvider.cs" />
-    <Compile Include="Connection\IConnectionProvider.cs" />
-    <Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
-    <Compile Include="Dialect\DB2Dialect.cs" />
-    <Compile Include="Dialect\Dialect.cs" />
-    <Compile Include="Dialect\FirebirdDialect.cs" />
-    <Compile Include="Dialect\GenericDialect.cs" />
-    <Compile Include="Dialect\MsSql2000Dialect.cs" />
-    <Compile Include="Dialect\MsSql7Dialect.cs" />
-    <Compile Include="Dialect\MySQLDialect.cs" />
-    <Compile Include="Dialect\Oracle9Dialect.cs" />
-    <Compile Include="Dialect\OracleDialect.cs" />
-    <Compile Include="Dialect\PostgreSQLDialect.cs" />
-    <Compile Include="Dialect\SQLiteDialect.cs" />
-    <Compile Include="Dialect\SybaseDialect.cs" />
-    <Compile Include="Dialect\TypeNames.cs" />
-    <Compile Include="Driver\DB2Driver.cs" />
-    <Compile Include="Driver\DriverBase.cs" />
-    <Compile Include="Driver\FirebirdDriver.cs" />
-    <Compile Include="Driver\IDriver.cs" />
-    <Compile Include="Driver\MySqlDataDriver.cs" />
-    <Compile Include="Driver\NDataReader.cs" />
-    <Compile Include="Driver\NHybridDataReader.cs" />
-    <Compile Include="Driver\NpgsqlDriver.cs" />
-    <Compile Include="Driver\OdbcDriver.cs" />
-    <Compile Include="Driver\OleDbDriver.cs" />
-    <Compile Include="Driver\OracleClientDriver.cs" />
-    <Compile Include="Driver\OracleDataClientDriver.cs" />
-    <Compile Include="Driver\SqlClientDriver.cs" />
-    <Compile Include="Driver\SQLiteDriver.cs" />
-    <Compile Include="Driver\SybaseClientDriver.cs" />
-    <Compile Include="Engine\Cascade.cs" />
-    <Compile Include="Engine\IBatcher.cs" />
-    <Compile Include="Engine\IMapping.cs" />
-    <Compile Include="Engine\ISessionFactoryImplementor.cs" />
-    <Compile Include="Engine\ISessionImplementor.cs" />
-    <Compile Include="Engine\QueryParameters.cs" />
-    <Compile Include="Engine\RowSelection.cs" />
-    <Compile Include="Engine\TypedValue.cs" />
-    <Compile Include="Engine\UnsavedValueFactory.cs" />
-    <Compile Include="Engine\Versioning.cs" />
-    <Compile Include="Exceptions\ADOExceptionHelper.cs" />
-    <Compile Include="Criterion\AbstractCriterion.cs" />
-    <Compile Include="Criterion\AndExpression.cs" />
-    <Compile Include="Criterion\BetweenExpression.cs" />
-    <Compile Include="Criterion\Conjunction.cs" />
-    <Compile Include="Criterion\Disjunction.cs" />
-    <Compile Include="Criterion\EqPropertyExpression.cs" />
-    <Compile Include="Criterion\Example.cs" />
-    <Compile Include="Criterion\Expression.cs" />
-    <Compile Include="Criterion\ICriterion.cs" />
-    <Compile Include="Criterion\InExpression.cs" />
-    <Compile Include="Criterion\InsensitiveLikeExpression.cs" />
-    <Compile Include="Criterion\Junction.cs" />
-    <Compile Include="Criterion\LePropertyExpression.cs" />
-    <Compile Include="Criterion\LikeExpression.cs" />
-    <Compile Include="Criterion\LogicalExpression.cs" />
-    <Compile Include="Criterion\LtPropertyExpression.cs" />
-    <Compile Include="Criterion\MatchMode.cs" />
-    <Compile Include="Criterion\NotExpression.cs" />
-    <Compile Include="Criterion\NotNullExpression.cs" />
-    <Compile Include="Criterion\NullExpression.cs" />
-    <Compile Include="Criterion\Order.cs" />
-    <Compile Include="Criterion\OrExpression.cs" />
-    <Compile Include="Criterion\PropertyExpression.cs" />
-    <Compile Include="Criterion\SimpleExpression.cs" />
-    <Compile Include="Criterion\SQLCriterion.cs" />
-    <Compile Include="FetchMode.cs" />
-    <Compile Include="FlushMode.cs" />
-    <Compile Include="HibernateException.cs" />
-    <Compile Include="Hql\Classic\ClauseParser.cs" />
-    <Compile Include="Hql\Classic\FromParser.cs" />
-    <Compile Include="Hql\Classic\FromPathExpressionParser.cs" />
-    <Compile Include="Hql\Classic\GroupByParser.cs" />
-    <Compile Include="Hql\Classic\HavingParser.cs" />
-    <Compile Include="Hql\Classic\IParser.cs" />
-    <Compile Include="Hql\Classic\OrderByParser.cs" />
-    <Compile Include="Hql\Classic\ParserHelper.cs" />
-    <Compile Include="Hql\Classic\PathExpressionParser.cs" />
-    <Compile Include="Hql\Classic\PreprocessingParser.cs" />
-    <Compile Include="Hql\Classic\QueryTranslator.cs" />
-    <Compile Include="Hql\Classic\SelectParser.cs" />
-    <Compile Include="Hql\Classic\SelectPathExpressionParser.cs" />
-    <Compile Include="Hql\Classic\WhereParser.cs" />
-    <Compile Include="ICriteria.cs" />
-    <Compile Include="IDatabinder.cs" />
-    <Compile Include="Id\Assigned.cs" />
-    <Compile Include="Id\CounterGenerator.cs" />
-    <Compile Include="Id\ForeignGenerator.cs" />
-    <Compile Include="Id\GuidCombGenerator.cs" />
-    <Compile Include="Id\GuidGenerator.cs" />
-    <Compile Include="Id\IConfigurable.cs" />
-    <Compile Include="Id\IdentifierGenerationException.cs" />
-    <Compile Include="Id\IdentifierGeneratorFactory.cs" />
-    <Compile Include="Id\IdentityGenerator.cs" />
-    <Compile Include="Id\IIdentifierGenerator.cs" />
-    <Compile Include="Id\IncrementGenerator.cs" />
-    <Compile Include="Id\IPersistentIdentifierGenerator.cs" />
-    <Compile Include="Id\SequenceGenerator.cs" />
-    <Compile Include="Id\SequenceHiLoGenerator.cs" />
-    <Compile Include="Id\TableGenerator.cs" />
-    <Compile Include="Id\TableHiLoGenerator.cs" />
-    <Compile Include="Id\UUIDHexGenerator.cs" />
-    <Compile Include="Id\UUIDStringGenerator.cs" />
-    <Compile Include="IInterceptor.cs" />
-    <Compile Include="Impl\AbstractQueryImpl.cs" />
-    <Compile Include="AdoNet\AbstractBatcher.cs" />
-    <Compile Include="AdoNet\OracleDataClientBatchingBatcher.cs" />
-    <Compile Include="AdoNet\SqlClientBatchingBatcher.cs" />
-    <Compile Include="Cache\Entry\CacheEntry.cs" />
-    <Compile Include="Engine\CollectionEntry.cs" />
-    <Compile Include="Engine\CollectionKey.cs" />
-    <Compile Include="Impl\CriteriaImpl.cs" />
-    <Compile Include="Engine\EntityEntry.cs" />
-    <Compile Include="Impl\EnumerableImpl.cs" />
-    <Compile Include="Impl\FilterImpl.cs" />
-    <Compile Include="Impl\MessageHelper.cs" />
-    <Compile Include="AdoNet\NonBatchingBatcher.cs" />
-    <Compile Include="Impl\Printer.cs" />
-    <Compile Include="Impl\QueryImpl.cs" />
-    <Compile Include="Event\Default\ReattachVisitor.cs" />
-    <Compile Include="Impl\SessionFactoryImpl.cs" />
-    <Compile Include="Impl\SessionFactoryObjectFactory.cs" />
-    <Compile Include="Impl\SessionImpl.cs" />
-    <Compile Include="Impl\SqlQueryImpl.cs" />
-    <Compile Include="Engine\Status.cs" />
-    <Compile Include="InstantiationException.cs" />
-    <Compile Include="IQuery.cs" />
-    <Compile Include="ISession.cs" />
-    <Compile Include="ISessionFactory.cs" />
-    <Compile Include="ITransaction.cs" />
-    <Compile Include="LazyInitializationException.cs" />
-    <Compile Include="Loader\Loader.cs" />
-    <Compile Include="Loader\OuterJoinLoader.cs" />
-    <Compile Include="LockMode.cs" />
-    <Compile Include="MappingException.cs" />
-    <Compile Include="Mapping\Any.cs" />
-    <Compile Include="Mapping\Array.cs" />
-    <Compile Include="Mapping\Bag.cs" />
-    <Compile Include="Mapping\Collection.cs" />
-    <Compile Include="Mapping\Column.cs" />
-    <Compile Include="Mapping\Component.cs" />
-    <Compile Include="Mapping\Constraint.cs" />
-    <Compile Include="Mapping\ForeignKey.cs" />
-    <Compile Include="Mapping\Formula.cs" />
-    <Compile Include="Mapping\IdentifierBag.cs" />
-    <Compile Include="Mapping\IdentifierCollection.cs" />
-    <Compile Include="Mapping\IFetchable.cs" />
-    <Compile Include="Mapping\Index.cs" />
-    <Compile Include="Mapping\IndexedCollection.cs" />
-    <Compile Include="Mapping\IRelationalModel.cs" />
-    <Compile Include="Mapping\IValue.cs" />
-    <Compile Include="Mapping\List.cs" />
-    <Compile Include="Mapping\ManyToOne.cs" />
-    <Compile Include="Mapping\Map.cs" />
-    <Compile Include="Mapping\MetaAttribute.cs" />
-    <Compile Include="Mapping\OneToMany.cs" />
-    <Compile Include="Mapping\OneToOne.cs" />
-    <Compile Include="Mapping\PersistentClass.cs" />
-    <Compile Include="Mapping\PrimaryKey.cs" />
-    <Compile Include="Mapping\PrimitiveArray.cs" />
-    <Compile Include="Mapping\Property.cs" />
-    <Compile Include="Mapping\RootClass.cs" />
-    <Compile Include="Mapping\Set.cs" />
-    <Compile Include="Mapping\SimpleValue.cs" />
-    <Compile Include="Mapping\Subclass.cs" />
-    <Compile Include="Mapping\Table.cs" />
-    <Compile Include="Mapping\ToOne.cs" />
-    <Compile Include="Mapping\UniqueKey.cs" />
-    <Compile Include="Metadata\IClassMetadata.cs" />
-    <Compile Include="Metadata\ICollectionMetadata.cs" />
-    <Compile Include="NHibernateUtil.cs" />
-    <Compile Include="NonUniqueObjectException.cs" />
-    <Compile Include="NonUniqueResultException.cs" />
-    <Compile Include="ObjectDeletedException.cs" />
-    <Compile Include="ObjectNotFoundException.cs" />
-    <Compile Include="PersistentObjectException.cs" />
-    <Compile Include="Persister\PersisterFactory.cs" />
-    <Compile Include="PropertyAccessException.cs" />
-    <Compile Include="PropertyNotFoundException.cs" />
-    <Compile Include="PropertyValueException.cs" />
-    <Compile Include="Properties\BasicPropertyAccessor.cs" />
-    <Compile Include="Properties\CamelCaseStrategy.cs" />
-    <Compile Include="Properties\CamelCaseUnderscoreStrategy.cs" />
-    <Compile Include="Properties\FieldAccessor.cs" />
-    <Compile Include="Properties\IFieldNamingStrategy.cs" />
-    <Compile Include="Properties\IGetter.cs" />
-    <Compile Include="Properties\IPropertyAccessor.cs" />
-    <Compile Include="Properties\ISetter.cs" />
-    <Compile Include="Properties\LowerCaseStrategy.cs" />
-    <Compile Include="Properties\LowerCaseUnderscoreStrategy.cs" />
-    <Compile Include="Properties\NoSetterAccessor.cs" />
-    <Compile Include="Properties\PascalCaseMUnderscoreStrategy.cs" />
-    <Compile Include="Properties\PascalCaseUnderscoreStrategy.cs" />
-    <Compile Include="Properties\PropertyAccessorFactory.cs" />
-    <Compile Include="Proxy\Poco\Castle\CastleLazyInitializer.cs" />
-    <Compile Include="Proxy\Poco\Castle\CastleProxyFactory.cs" />
-    <Compile Include="Proxy\INHibernateProxy.cs" />
-    <Compile Include="Proxy\IProxyFactory.cs" />
-    <Compile Include="Proxy\AbstractLazyInitializer.cs" />
-    <Compile Include="Proxy\NHibernateProxyHelper.cs" />
-    <Compile Include="Proxy\ProxyTypeValidator.cs" />
-    <Compile Include="QueryException.cs" />
-    <Compile Include="ReplicationMode.cs" />
-    <Compile Include="SqlCommand\Alias.cs" />
-    <Compile Include="SqlCommand\ANSICaseFragment.cs" />
-    <Compile Include="SqlCommand\ANSIJoinFragment.cs" />
-    <Compile Include="SqlCommand\CaseFragment.cs" />
-    <Compile Include="SqlCommand\ConditionalFragment.cs" />
-    <Compile Include="SqlCommand\DecodeCaseFragment.cs" />
-    <Compile Include="SqlCommand\DisjunctionFragment.cs" />
-    <Compile Include="SqlCommand\ForUpdateFragment.cs" />
-    <Compile Include="SqlCommand\InFragment.cs" />
-    <Compile Include="SqlCommand\ISqlStringBuilder.cs" />
-    <Compile Include="SqlCommand\JoinFragment.cs" />
-    <Compile Include="SqlCommand\OracleJoinFragment.cs" />
-    <Compile Include="SqlCommand\Parameter.cs" />
-    <Compile Include="SqlCommand\QueryJoinFragment.cs" />
-    <Compile Include="SqlCommand\QuerySelect.cs" />
-    <Compile Include="SqlCommand\SelectFragment.cs" />
-    <Compile Include="SqlCommand\SqlBaseBuilder.cs" />
-    <Compile Include="SqlCommand\SqlDeleteBuilder.cs" />
-    <Compile Include="SqlCommand\SqlInsertBuilder.cs" />
-    <Compile Include="SqlCommand\SqlSelectBuilder.cs" />
-    <Compile Include="SqlCommand\SqlSimpleSelectBuilder.cs" />
-    <Compile Include="SqlCommand\SqlString.cs" />
-    <Compile Include="SqlCommand\SqlStringBuilder.cs" />
-    <Compile Include="SqlCommand\SqlUpdateBuilder.cs" />
-    <Compile Include="SqlCommand\Template.cs" />
-    <Compile Include="SqlCommand\WhereBuilder.cs" />
-    <Compile Include="SqlTypes\AnsiStringFixedLengthSqlType.cs" />
-    <Compile Include="SqlTypes\AnsiStringSqlType.cs" />
-    <Compile Include="SqlTypes\BinaryBlobSqlType.cs" />
-    <Compile Include="SqlTypes\BinarySqlType.cs" />
-    <Compile Include="SqlTypes\SqlType.cs" />
-    <Compile Include="SqlTypes\SqlTypeFactory.cs" />
-    <Compile Include="SqlTypes\StringClobSqlType.cs" />
-    <Compile Include="SqlTypes\StringFixedLengthSqlType.cs" />
-    <Compile Include="SqlTypes\StringSqlType.cs" />
-    <Compile Include="StaleObjectStateException.cs" />
-    <Compile Include="Tool\hbm2ddl\SchemaExport.cs" />
-    <Compile Include="TransactionException.cs" />
-    <Compile Include="Transaction\AdoTransaction.cs" />
-    <Compile Include="Transaction\ITransactionFactory.cs" />
-    <Compile Include="Transform\AliasToEntityMapResultTransformer.cs" />
-    <Compile Include="Transform\DistinctRootEntityResultTransformer.cs" />
-    <Compile Include="Transform\IResultTransformer.cs" />
-    <Compile Include="Transform\RootEntityResultTransformer.cs" />
-    <Compile Include="TransientObjectException.cs" />
-    <Compile Include="Type\AbstractType.cs" />
-    <Compile Include="Type\AnsiStringType.cs" />
-    <Compile Include="Type\ArrayType.cs" />
-    <Compile Include="Type\BagType.cs" />
-    <Compile Include="Type\BinaryBlobType.cs" />
-    <Compile Include="Type\BinaryType.cs" />
-    <Compile Include="Type\BooleanType.cs" />
-    <Compile Include="Type\ByteType.cs" />
-    <Compile Include="Type\CharBooleanType.cs" />
-    <Compile Include="Type\CharType.cs" />
-    <Compile Include="Type\ComponentType.cs" />
-    <Compile Include="Type\CompositeCustomType.cs" />
-    <Compile Include="Type\CultureInfoType.cs" />
-    <Compile Include="Type\CustomType.cs" />
-    <Compile Include="Type\DateTimeType.cs" />
-    <Compile Include="Type\DateType.cs" />
-    <Compile Include="Type\DecimalType.cs" />
-    <Compile Include="Type\DoubleType.cs" />
-    <Compile Include="Type\EntityType.cs" />
-    <Compile Include="Type\EnumStringType.cs" />
-    <Compile Include="Type\GuidType.cs" />
-    <Compile Include="Type\IAbstractComponentType.cs" />
-    <Compile Include="Type\IAssociationType.cs" />
-    <Compile Include="Type\IdentifierBagType.cs" />
-    <Compile Include="Type\IDiscriminatorType.cs" />
-    <Compile Include="Type\IIdentifierType.cs" />
-    <Compile Include="Type\ILiteralType.cs" />
-    <Compile Include="Type\ImmutableType.cs" />
-    <Compile Include="Type\Int16Type.cs" />
-    <Compile Include="Type\Int32Type.cs" />
-    <Compile Include="Type\Int64Type.cs" />
-    <Compile Include="Type\IType.cs" />
-    <Compile Include="Type\IVersionType.cs" />
-    <Compile Include="Type\ListType.cs" />
-    <Compile Include="Type\ManyToOneType.cs" />
-    <Compile Include="Type\MapType.cs" />
-    <Compile Include="Type\MetaType.cs" />
-    <Compile Include="Type\MutableType.cs" />
-    <Compile Include="Type\NullableType.cs" />
-    <Compile Include="Type\OneToOneType.cs" />
-    <Compile Include="Type\PersistentEnumType.cs" />
-    <Compile Include="Type\SByteType.cs" />
-    <Compile Include="Type\SerializableType.cs" />
-    <Compile Include="Type\SerializationException.cs" />
-    <Compile Include="Type\SetType.cs" />
-    <Compile Include="Type\SingleType.cs" />
-    <Compile Include="Type\SortedMapType.cs" />
-    <Compile Include="Type\SortedSetType.cs" />
-    <Compile Include="Type\StringClobType.cs" />
-    <Compile Include="Type\StringType.cs" />
-    <Compile Include="Type\TicksType.cs" />
-    <Compile Include="Type\TimeSpanType.cs" />
-    <Compile Include="Type\TimestampType.cs" />
-    <Compile Include="Type\TimeType.cs" />
-    <Compile Include="Type\TrueFalseType.cs" />
-    <Compile Include="Type\TypeFactory.cs" />
-    <Compile Include="Type\TypeType.cs" />
-    <Compile Include="Type\UInt16Type.cs" />
-    <Compile Include="Type\UInt32Type.cs" />
-    <Compile Include="Type\UInt64Type.cs" />
-    <Compile Include="Type\PrimitiveType.cs" />
-    <Compile Include="Type\YesNoType.cs" />
-    <Compile Include="UnresolvableObjectException.cs" />
-    <Compile Include="Util\ADOExceptionReporter.cs" />
-    <Compile Include="Util\ArrayHelper.cs" />
-    <Compile Include="Util\CollectionPrinter.cs" />
-    <Compile Include="Util\IdentityMap.cs" />
-    <Compile Include="Util\JoinedEnumerable.cs" />
-    <Compile Include="Util\ObjectUtils.cs" />
-    <Compile Include="Util\PropertiesHelper.cs" />
-    <Compile Include="Util\ReflectHelper.cs" />
-    <Compile Include="Util\SequencedHashMap.cs" />
-    <Compile Include="Util\StringHelper.cs" />
-    <Compile Include="Util\StringTokenizer.cs" />
-    <Compile Include="WrongClassException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Action\BulkOperationCleanupAction.cs" />
-    <Compile Include="Action\CollectionAction.cs" />
-    <Compile Include="Action\CollectionRecreateAction.cs" />
-    <Compile Include="Action\CollectionRemoveAction.cs" />
-    <Compile Include="Action\CollectionUpdateAction.cs" />
-    <Compile Include="Action\DelayedPostInsertIdentifier.cs" />
-    <Compile Include="Action\EntityAction.cs" />
-    <Compile Include="Action\EntityDeleteAction.cs" />
-    <Compile Include="Action\EntityIdentityInsertAction.cs" />
-    <Compile Include="Action\EntityInsertAction.cs" />
-    <Compile Include="Action\EntityUpdateAction.cs" />
-    <Compile Include="Action\IExecutable.cs" />
-    <Compile Include="AdoNet\AdoNetContext.cs" />
-    <Compile Include="AdoNet\ColumnNameCache.cs" />
-    <Compile Include="AdoNet\Expectations.cs" />
-    <Compile Include="AdoNet\IBatcherFactory.cs" />
-    <Compile Include="AdoNet\IExpectation.cs" />
-    <Compile Include="AdoNet\NonBatchingBatcherFactory.cs" />
-    <Compile Include="AdoNet\OracleDataClientBatchingBatcherFactory.cs" />
-    <Compile Include="AdoNet\ResultSetWrapper.cs" />
-    <Compile Include="AdoNet\SqlClientBatchingBatcherFactory.cs" />
-    <Compile Include="AdoNet\TooManyRowsAffectedException.cs" />
-    <Compile Include="Bytecode\CodeDom\BytecodeProviderImpl.cs" />
-    <Compile Include="Bytecode\DefaultProxyFactoryFactory.cs" />
-    <Compile Include="Bytecode\IAccessOptimizer.cs" />
-    <Compile Include="Bytecode\IBytecodeProvider.cs" />
-    <Compile Include="Bytecode\IInjectableProxyFactoryFactory.cs" />
-    <Compile Include="Bytecode\IInstantiationOptimizer.cs" />
-    <Compile Include="Bytecode\IProxyFactoryFactory.cs" />
-    <Compile Include="Bytecode\IReflectionOptimizer.cs" />
-    <Compile Include="Bytecode\Lightweight\AccessOptimizer.cs" />
-    <Compile Include="Bytecode\Lightweight\BytecodeProviderImpl.cs" />
-    <Compile Include="Bytecode\Lightweight\Delegates.cs" />
-    <Compile Include="Bytecode\Lightweight\ReflectionOptimizer.cs" />
-    <Compile Include="Bytecode\NullBytecodeProvider.cs" />
-    <Compile Include="Bytecode\EmitUtil.cs" />
-    <Compile Include="CacheMode.cs" />
-    <Compile Include="Cache\CacheKey.cs" />
-    <Compile Include="Cache\Entry\CollectionCacheEntry.cs" />
-    <Compile Include="Cache\Entry\ICacheEntryStructure.cs" />
-    <Compile Include="Cache\Entry\StructuredCacheEntry.cs" />
-    <Compile Include="Cache\Entry\StructuredCollectionCacheEntry.cs" />
-    <Compile Include="Cache\Entry\StructuredMapCacheEntry.cs" />
-    <Compile Include="Cache\Entry\UnstructuredCacheEntry.cs" />
-    <Compile Include="Cache\FilterKey.cs" />
-    <Compile Include="Cache\IOptimisticCacheSource.cs" />
-    <Compile Include="Cache\NoCacheProvider.cs" />
-    <Compile Include="Cache\NoCachingEnabledException.cs" />
-    <Compile Include="Cfg\ClassExtractor.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\CfgXmlHelper.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\ClassCacheConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\CollectionCacheConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\EventConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\HibernateConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\ListenerConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\MappingConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\SessionFactoryConfiguration.cs" />
-    <Compile Include="Cfg\ExtendsQueueEntry.cs" />
-    <Compile Include="Cfg\HbmConstants.cs" />
-    <Compile Include="Cfg\HibernateConfigException.cs" />
-    <Compile Include="Cfg\IHibernateConfiguration.cs" />
-    <Compile Include="Cfg\NamedXmlDocument.cs" />
-    <Compile Include="Cfg\MappingsQueueEntry.cs" />
-    <Compile Include="Cfg\MappingSchema\EndsWithHbmXmlFilter.cs" />
-    <Compile Include="Cfg\MappingSchema\Hbm.generated.cs">
-      <SubType>code</SubType>
-    </Compile>
-    <Compile Include="Cfg\MappingSchema\HbmBase.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmClass.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmDatabaseObject.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmMapping.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmMeta.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmParam.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmQuery.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmSqlQuery.cs" />
-    <Compile Include="Cfg\MappingSchema\IAssemblyResourceFilter.cs" />
-    <Compile Include="Cfg\MappingSchema\IMappingDocumentParser.cs" />
-    <Compile Include="Cfg\MappingSchema\MappingDocumentAggregator.cs" />
-    <Compile Include="Cfg\MappingSchema\MappingDocumentParser.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\AuxiliaryDatabaseObjectFactory.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmFilterDef.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\CacheModeConverter.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassCompositeIdBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassDiscriminatorBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassIdBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\FilterDefinitionFactory.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\FlushModeConverter.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ResultSetMappingBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\Binder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\CollectionBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\RootClassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\JoinedSubclassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\MappingRootBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\NamedQueryBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\NamedSQLQueryBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\SubclassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\UnionSubclassBinder.cs" />
-    <Compile Include="Cfg\XmlSchemas.cs" />
-    <Compile Include="Classic\ILifecycle.cs" />
-    <Compile Include="Classic\IValidatable.cs" />
-    <Compile Include="Classic\ValidationFailure.cs" />
-    <Compile Include="Collection\AbstractPersistentCollection.cs" />
-    <Compile Include="Collection\Generic\PersistentGenericSet.cs" />
-    <Compile Include="Collection\Generic\PersistentGenericBag.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collection\Generic\PersistentGenericList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collection\Generic\PersistentGenericMap.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collection\Generic\PersistentGenericIdentifierBag.cs" />
-    <Compile Include="Collection\PersistentArrayHolder.cs" />
-    <Compile Include="Collection\PersistentBag.cs" />
-    <Compile Include="Collection\PersistentIdentifierBag.cs" />
-    <Compile Include="Collection\PersistentList.cs" />
-    <Compile Include="Collection\PersistentMap.cs" />
-    <Compile Include="Collection\PersistentSet.cs" />
-    <Compile Include="ConnectionReleaseMode.cs" />
-    <Compile Include="Context\CallSessionContext.cs" />
-    <Compile Include="Context\CurrentSessionContext.cs" />
-    <Compile Include="Context\ICurrentSessionContext.cs" />
-    <Compile Include="Context\ManagedWebSessionContext.cs" />
-    <Compile Include="Context\MapBasedSessionContext.cs" />
-    <Compile Include="Context\ThreadLocalSessionContext.cs" />
-    <Compile Include="Context\ThreadStaticSessionContext.cs" />
-    <Compile Include="Context\WebSessionContext.cs" />
-    <Compile Include="CriteriaTransformer.cs" />
-    <Compile Include="Criterion\NaturalIdentifier.cs" />
-    <Compile Include="Criterion\Restrictions.cs" />
-    <Compile Include="Criterion\RowCountInt64Projection.cs" />
-    <Compile Include="DebugHelpers\DictionaryProxy.cs" />
-    <Compile Include="DebugHelpers\CollectionProxy.cs" />
-    <Compile Include="Dialect\Function\AnsiExtractFunction.cs" />
-    <Compile Include="Dialect\Function\AnsiSubstringFunction.cs" />
-    <Compile Include="Dialect\Function\AnsiTrimEmulationFunction.cs" />
-    <Compile Include="Dialect\Function\AnsiTrimFunction.cs" />
-    <Compile Include="Dialect\Function\CastFunction.cs" />
-    <Compile Include="Dialect\Function\CharIndexFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicAggregateFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicAvgFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicCountFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicSumFunction.cs" />
-    <Compile Include="Dialect\Function\CommonGrammar.cs" />
-    <Compile Include="Dialect\Function\IFunctionGrammar.cs" />
-    <Compile Include="Dialect\Function\ISQLFunction.cs" />
-    <Compile Include="Dialect\Function\NoArgSQLFunction.cs" />
-    <Compile Include="Dialect\Function\NvlFunction.cs" />
-    <Compile Include="Dialect\Function\PositionSubstringFunction.cs" />
-    <Compile Include="Dialect\Function\SQLFunctionRegistry.cs" />
-    <Compile Include="Dialect\Function\SQLFunctionTemplate.cs" />
-    <Compile Include="Dialect\Function\StandardSafeSQLFunction.cs" />
-    <Compile Include="Dialect\Function\StandardSQLFunction.cs" />
-    <Compile Include="Dialect\Function\VarArgsSQLFunction.cs" />
-    <Compile Include="AdoNet\IEmbeddedBatcherFactoryProvider.cs" />
-    <Compile Include="Dialect\InformixDialect.cs" />
-    <Compile Include="Dialect\Lock\ILockingStrategy.cs" />
-    <Compile Include="Dialect\Lock\SelectLockingStrategy.cs" />
-    <Compile Include="Dialect\Lock\UpdateLockingStrategy.cs" />
-    <Compile Include="Dialect\MsSqlCeDialect.cs" />
-    <Compile Include="Dialect\MySQL5Dialect.cs" />
-    <Compile Include="Criterion\SelectSubqueryExpression.cs" />
-    <Compile Include="Dialect\PostgreSQL82Dialect.cs" />
-    <Compile Include="Dialect\Schema\FirebirdMetaData.cs" />
-    <Compile Include="Dialect\Schema\ITableMetadata.cs" />
-    <Compile Include="Dialect\Schema\MsSqlMetaData.cs" />
-    <Compile Include="Dialect\Schema\OracleMetaData.cs" />
-    <Compile Include="Dialect\Sybase11Dialect.cs" />
-    <Compile Include="Driver\ASA10ClientDriver.cs" />
-    <Compile Include="Driver\ISqlParameterFormatter.cs" />
-    <Compile Include="Driver\SqlStringFormatter.cs" />
-    <Compile Include="Criterion\SubqueryProjection.cs" />
-    <Compile Include="EmptyInterceptor.cs" />
-    <Compile Include="Engine\ActionQueue.cs" />
-    <Compile Include="Engine\AssociationKey.cs" />
-    <Compile Include="Engine\BatchFetchQueue.cs" />
-    <Compile Include="Engine\CascadeStyle.cs" />
-    <Compile Include="Engine\CascadingAction.cs" />
-    <Compile Include="Engine\Collections.cs" />
-    <Compile Include="Engine\EntityUniqueKey.cs" />
-    <Compile Include="Engine\FilterDefinition.cs" />
-    <Compile Include="Engine\ForeignKeys.cs" />
-    <Compile Include="Engine\IdentifierValue.cs" />
-    <Compile Include="Engine\IPersistenceContext.cs" />
-    <Compile Include="Engine\Loading\CollectionLoadContext.cs" />
-    <Compile Include="Engine\Loading\EntityLoadContext.cs" />
-    <Compile Include="Engine\Loading\LoadContexts.cs" />
-    <Compile Include="Engine\Loading\LoadingCollectionEntry.cs" />
-    <Compile Include="Engine\Nullability.cs" />
-    <Compile Include="Engine\Query\HQLQueryPlan.cs" />
-    <Compile Include="Engine\Query\NamedParameterDescriptor.cs" />
-    <Compile Include="Engine\Query\NativeSQLQueryPlan.cs" />
-    <Compile Include="Engine\Query\OrdinalParameterDescriptor.cs" />
-    <Compile Include="Engine\Query\ParameterMetadata.cs" />
-    <Compile Include="Engine\Query\ParamLocationRecognizer.cs" />
-    <Compile Include="Engine\Query\QueryMetadata.cs" />
-    <Compile Include="Engine\Query\QueryPlanCache.cs" />
-    <Compile Include="Engine\Query\ReturnMetadata.cs" />
-    <Compile Include="Engine\Query\FilterQueryPlan.cs" />
-    <Compile Include="Engine\Query\Sql\INativeSQLQueryReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryCollectionReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryJoinReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryNonScalarReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryRootReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryScalarReturn.cs" />
-    <Compile Include="Engine\StatefulPersistenceContext.cs" />
-    <Compile Include="Engine\TransactionHelper.cs" />
-    <Compile Include="Engine\Transaction\IIsolatedWork.cs" />
-    <Compile Include="Engine\Transaction\Isolater.cs" />
-    <Compile Include="Engine\TwoPhaseLoad.cs" />
-    <Compile Include="Engine\ValueInclusion.cs" />
-    <Compile Include="Engine\VersionValue.cs" />
-    <Compile Include="EntityMode.cs" />
-    <Compile Include="Event\AbstractCollectionEvent.cs" />
-    <Compile Include="Event\AbstractEvent.cs" />
-    <Compile Include="Event\AutoFlushEvent.cs" />
-    <Compile Include="Event\Default\AbstractFlushingEventListener.cs" />
-    <Compile Include="Event\Default\AbstractLockUpgradeEventListener.cs" />
-    <Compile Include="Event\Default\AbstractReassociateEventListener.cs" />
-    <Compile Include="Event\Default\AbstractSaveEventListener.cs" />
-    <Compile Include="Event\Default\AbstractVisitor.cs" />
-    <Compile Include="Event\Default\DefaultAutoFlushEventListener.cs" />
-    <Compile Include="Event\Default\DefaultDeleteEventListener.cs" />
-    <Compile Include="Event\Default\DefaultDirtyCheckEventListener.cs" />
-    <Compile Include="Event\Default\DefaultEvictEventListener.cs" />
-    <Compile Include="Event\Default\DefaultFlushEntityEventListener.cs" />
-    <Compile Include="Event\Default\DefaultFlushEventListener.cs" />
-    <Compile Include="Event\Default\DefaultInitializeCollectionEventListener.cs" />
-    <Compile Include="Event\Default\DefaultLoadEventListener.cs" />
-    <Compile Include="Event\Default\DefaultLockEventListener.cs" />
-    <Compile Include="Event\Default\DefaultMergeEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPersistEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPersistOnFlushEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPostLoadEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPreLoadEventListener.cs" />
-    <Compile Include="Event\Default\DefaultRefreshEventListener.cs" />
-    <Compile Include="Event\Default\DefaultReplicateEventListener.cs" />
-    <Compile Include="Event\Default\DefaultSaveEventListener.cs" />
-    <Compile Include="Event\Default\DefaultSaveOrUpdateCopyEventListener.cs" />
-    <Compile Include="Event\Default\DefaultSaveOrUpdateEventListener.cs" />
-    <Compile Include="Event\Default\DefaultUpdateEventListener.cs" />
-    <Compile Include="Event\Default\DirtyCollectionSearchVisitor.cs" />
-    <Compile Include="Event\Default\EvictVisitor.cs" />
-    <Compile Include="Event\Default\FlushVisitor.cs" />
-    <Compile Include="Event\Default\OnLockVisitor.cs" />
-    <Compile Include="Event\Default\OnReplicateVisitor.cs" />
-    <Compile Include="Event\Default\OnUpdateVisitor.cs" />
-    <Compile Include="Event\Default\ProxyVisitor.cs" />
-    <Compile Include="Event\Default\WrapVisitor.cs" />
-    <Compile Include="Event\DeleteEvent.cs" />
-    <Compile Include="Event\DirtyCheckEvent.cs" />
-    <Compile Include="Event\EventListeners.cs" />
-    <Compile Include="Event\EvictEvent.cs" />
-    <Compile Include="Event\FlushEntityEvent.cs" />
-    <Compile Include="Event\FlushEvent.cs" />
-    <Compile Include="Event\IAutoFlushEventListener.cs" />
-    <Compile Include="Event\IDeleteEventListener.cs" />
-    <Compile Include="Event\IDirtyCheckEventListener.cs" />
-    <Compile Include="Event\IEventSource.cs" />
-    <Compile Include="Event\IEvictEventListener.cs" />
-    <Compile Include="Event\IFlushEntityEventListener.cs" />
-    <Compile Include="Event\IFlushEventListener.cs" />
-    <Compile Include="Event\IInitializable.cs" />
-    <Compile Include="Event\IInitializeCollectionEventListener.cs" />
-    <Compile Include="Event\ILoadEventListener.cs" />
-    <Compile Include="Event\ILockEventListener.cs" />
-    <Compile Include="Event\IMergeEventListener.cs" />
-    <Compile Include="Event\InitializeCollectionEvent.cs" />
-    <Compile Include="Event\IPersistEventListener.cs" />
-    <Compile Include="Event\IPostCollectionRecreateEventListener.cs" />
-    <Compile Include="Event\IPostCollectionRemoveEventListener.cs" />
-    <Compile Include="Event\IPostCollectionUpdateEventListener.cs" />
-    <Compile Include="Event\IPostDeleteEventListener.cs" />
-    <Compile Include="Event\IPostInsertEventListener.cs" />
-    <Compile Include="Event\IPostLoadEventListener.cs" />
-    <Compile Include="Event\IPostUpdateEventListener.cs" />
-    <Compile Include="Event\IPreCollectionRecreateEventListener.cs" />
-    <Compile Include="Event\IPreCollectionRemoveEventListener.cs" />
-    <Compile Include="Event\IPreCollectionUpdateEventListener.cs" />
-    <Compile Include="Event\IPreDeleteEventListener.cs" />
-    <Compile Include="Event\IPreInsertEventListener.cs" />
-    <Compile Include="Event\IPreLoadEventListener.cs" />
-    <Compile Include="Event\IPreUpdateEventListener.cs" />
-    <Compile Include="Event\IRefreshEventListener.cs" />
-    <Compile Include="Event\IReplicateEventListener.cs" />
-    <Compile Include="Event\ISaveOrUpdateEventListener.cs" />
-    <Compile Include="Event\ListenerType.cs" />
-    <Compile Include="Even...
 
[truncated message content]

[Nhibernate-commit] SF.net SVN: nhibernate:[3791] branches/2.0.x/nhibernate/src

From: <fab...@us...> - 2008-09-28 13:49:53

Revision: 3791
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3791&view=rev
Author:   fabiomaulo
Date:     2008-09-28 13:49:40 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
Removed projects+solutions of VS2008

Removed Paths:
-------------
    branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj
    branches/2.0.x/nhibernate/src/NHibernate-3.5.sln
    branches/2.0.x/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-3.5.csproj
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj

Deleted: branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj	2008-09-27 16:45:09 UTC (rev 3790)
+++ branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj	2008-09-28 13:49:40 UTC (rev 3791)
@@ -1,1115 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NHibernate</RootNamespace>
-    <AssemblyName>NHibernate</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug-2.0\NHibernate.XML</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <WarningsAsErrors>1717;1574</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release-2.0\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.DynamicProxy2, Version=2.0.0.1, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Castle.DynamicProxy2.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ADOException.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="AssertionFailure.cs" />
-    <Compile Include="Cache\CachedItem.cs" />
-    <Compile Include="Cache\CacheException.cs" />
-    <Compile Include="Cache\CacheFactory.cs" />
-    <Compile Include="Cache\CacheLock.cs" />
-    <Compile Include="Cache\HashtableCache.cs" />
-    <Compile Include="Cache\HashtableCacheProvider.cs" />
-    <Compile Include="Cache\ICache.cs" />
-    <Compile Include="Cache\ICacheConcurrencyStrategy.cs" />
-    <Compile Include="Cache\ICacheProvider.cs" />
-    <Compile Include="Cache\IQueryCache.cs" />
-    <Compile Include="Cache\IQueryCacheFactory.cs" />
-    <Compile Include="Cache\ISoftLock.cs" />
-    <Compile Include="Cache\NonstrictReadWriteCache.cs" />
-    <Compile Include="Cache\QueryKey.cs" />
-    <Compile Include="Cache\ReadOnlyCache.cs" />
-    <Compile Include="Cache\ReadWriteCache.cs" />
-    <Compile Include="Cache\StandardQueryCache.cs" />
-    <Compile Include="Cache\StandardQueryCacheFactory.cs" />
-    <Compile Include="Cache\Timestamper.cs" />
-    <Compile Include="Cache\UpdateTimestampsCache.cs" />
-    <Compile Include="CallbackException.cs" />
-    <Compile Include="Cfg\MappingsQueue.cs" />
-    <Compile Include="Cfg\Configuration.cs" />
-    <Compile Include="Cfg\ConfigurationSectionHandler.cs" />
-    <Compile Include="Cfg\DefaultNamingStrategy.cs" />
-    <Compile Include="Cfg\Environment.cs" />
-    <Compile Include="Cfg\ImprovedNamingStrategy.cs" />
-    <Compile Include="Cfg\INamingStrategy.cs" />
-    <Compile Include="Cfg\Mappings.cs" />
-    <Compile Include="Cfg\Settings.cs" />
-    <Compile Include="Cfg\SettingsFactory.cs" />
-    <Compile Include="Collection\IPersistentCollection.cs" />
-    <Compile Include="Connection\ConnectionProvider.cs" />
-    <Compile Include="Connection\ConnectionProviderFactory.cs" />
-    <Compile Include="Connection\DriverConnectionProvider.cs" />
-    <Compile Include="Connection\IConnectionProvider.cs" />
-    <Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
-    <Compile Include="Dialect\DB2Dialect.cs" />
-    <Compile Include="Dialect\Dialect.cs" />
-    <Compile Include="Dialect\FirebirdDialect.cs" />
-    <Compile Include="Dialect\GenericDialect.cs" />
-    <Compile Include="Dialect\MsSql2000Dialect.cs" />
-    <Compile Include="Dialect\MsSql7Dialect.cs" />
-    <Compile Include="Dialect\MySQLDialect.cs" />
-    <Compile Include="Dialect\Oracle9Dialect.cs" />
-    <Compile Include="Dialect\OracleDialect.cs" />
-    <Compile Include="Dialect\PostgreSQLDialect.cs" />
-    <Compile Include="Dialect\SQLiteDialect.cs" />
-    <Compile Include="Dialect\SybaseDialect.cs" />
-    <Compile Include="Dialect\TypeNames.cs" />
-    <Compile Include="Driver\DB2Driver.cs" />
-    <Compile Include="Driver\DriverBase.cs" />
-    <Compile Include="Driver\FirebirdDriver.cs" />
-    <Compile Include="Driver\IDriver.cs" />
-    <Compile Include="Driver\MySqlDataDriver.cs" />
-    <Compile Include="Driver\NDataReader.cs" />
-    <Compile Include="Driver\NHybridDataReader.cs" />
-    <Compile Include="Driver\NpgsqlDriver.cs" />
-    <Compile Include="Driver\OdbcDriver.cs" />
-    <Compile Include="Driver\OleDbDriver.cs" />
-    <Compile Include="Driver\OracleClientDriver.cs" />
-    <Compile Include="Driver\OracleDataClientDriver.cs" />
-    <Compile Include="Driver\SqlClientDriver.cs" />
-    <Compile Include="Driver\SQLiteDriver.cs" />
-    <Compile Include="Driver\SybaseClientDriver.cs" />
-    <Compile Include="Engine\IBatcher.cs" />
-    <Compile Include="Engine\ICollectionSnapshot.cs" />
-    <Compile Include="Engine\IMapping.cs" />
-    <Compile Include="Engine\ISessionFactoryImplementor.cs" />
-    <Compile Include="Engine\ISessionImplementor.cs" />
-    <Compile Include="Engine\QueryParameters.cs" />
-    <Compile Include="Engine\RowSelection.cs" />
-    <Compile Include="Engine\TypedValue.cs" />
-    <Compile Include="Engine\UnsavedValueFactory.cs" />
-    <Compile Include="Engine\Versioning.cs" />
-    <Compile Include="Exceptions\ADOExceptionHelper.cs" />
-    <Compile Include="FetchMode.cs" />
-    <Compile Include="FlushMode.cs" />
-    <Compile Include="HibernateException.cs" />
-    <Compile Include="Hql\Classic\ClauseParser.cs" />
-    <Compile Include="Hql\Classic\FromParser.cs" />
-    <Compile Include="Hql\Classic\FromPathExpressionParser.cs" />
-    <Compile Include="Hql\Classic\GroupByParser.cs" />
-    <Compile Include="Hql\Classic\HavingParser.cs" />
-    <Compile Include="Hql\Classic\IParser.cs" />
-    <Compile Include="Hql\Classic\OrderByParser.cs" />
-    <Compile Include="Hql\Classic\ParserHelper.cs" />
-    <Compile Include="Hql\Classic\PathExpressionParser.cs" />
-    <Compile Include="Hql\Classic\PreprocessingParser.cs" />
-    <Compile Include="Hql\Classic\QueryTranslator.cs" />
-    <Compile Include="Hql\Classic\SelectParser.cs" />
-    <Compile Include="Hql\Classic\SelectPathExpressionParser.cs" />
-    <Compile Include="Hql\Classic\WhereParser.cs" />
-    <Compile Include="ICriteria.cs" />
-    <Compile Include="IDatabinder.cs" />
-    <Compile Include="Id\Assigned.cs" />
-    <Compile Include="Id\CounterGenerator.cs" />
-    <Compile Include="Id\ForeignGenerator.cs" />
-    <Compile Include="Id\GuidCombGenerator.cs" />
-    <Compile Include="Id\GuidGenerator.cs" />
-    <Compile Include="Id\IConfigurable.cs" />
-    <Compile Include="Id\IdentifierGenerationException.cs" />
-    <Compile Include="Id\IdentifierGeneratorFactory.cs" />
-    <Compile Include="Id\IdentityGenerator.cs" />
-    <Compile Include="Id\IIdentifierGenerator.cs" />
-    <Compile Include="Id\IncrementGenerator.cs" />
-    <Compile Include="Id\IPersistentIdentifierGenerator.cs" />
-    <Compile Include="Id\SequenceGenerator.cs" />
-    <Compile Include="Id\SequenceHiLoGenerator.cs" />
-    <Compile Include="Id\TableGenerator.cs" />
-    <Compile Include="Id\TableHiLoGenerator.cs" />
-    <Compile Include="Id\UUIDHexGenerator.cs" />
-    <Compile Include="Id\UUIDStringGenerator.cs" />
-    <Compile Include="IInterceptor.cs" />
-    <Compile Include="Impl\AbstractQueryImpl.cs" />
-    <Compile Include="AdoNet\AbstractBatcher.cs" />
-    <Compile Include="AdoNet\OracleDataClientBatchingBatcher.cs" />
-    <Compile Include="AdoNet\SqlClientBatchingBatcher.cs" />
-    <Compile Include="Cache\Entry\CacheEntry.cs" />
-    <Compile Include="Engine\CollectionEntry.cs" />
-    <Compile Include="Engine\CollectionKey.cs" />
-    <Compile Include="Impl\CriteriaImpl.cs" />
-    <Compile Include="Engine\EntityEntry.cs" />
-    <Compile Include="Impl\EnumerableImpl.cs" />
-    <Compile Include="Impl\FilterImpl.cs" />
-    <Compile Include="Impl\MessageHelper.cs" />
-    <Compile Include="AdoNet\NonBatchingBatcher.cs" />
-    <Compile Include="Impl\Printer.cs" />
-    <Compile Include="Impl\QueryImpl.cs" />
-    <Compile Include="Event\Default\ReattachVisitor.cs" />
-    <Compile Include="Impl\SessionFactoryImpl.cs" />
-    <Compile Include="Impl\SessionFactoryObjectFactory.cs" />
-    <Compile Include="Impl\SessionImpl.cs" />
-    <Compile Include="Impl\SqlQueryImpl.cs" />
-    <Compile Include="Engine\Status.cs" />
-    <Compile Include="InstantiationException.cs" />
-    <Compile Include="IQuery.cs" />
-    <Compile Include="ISession.cs" />
-    <Compile Include="ISessionFactory.cs" />
-    <Compile Include="ITransaction.cs" />
-    <Compile Include="LazyInitializationException.cs" />
-    <Compile Include="Loader\Loader.cs" />
-    <Compile Include="Loader\OuterJoinLoader.cs" />
-    <Compile Include="LockMode.cs" />
-    <Compile Include="MappingException.cs" />
-    <Compile Include="Mapping\Any.cs" />
-    <Compile Include="Mapping\Array.cs" />
-    <Compile Include="Mapping\Bag.cs" />
-    <Compile Include="Mapping\Collection.cs" />
-    <Compile Include="Mapping\Column.cs" />
-    <Compile Include="Mapping\Component.cs" />
-    <Compile Include="Mapping\Constraint.cs" />
-    <Compile Include="Mapping\ForeignKey.cs" />
-    <Compile Include="Mapping\Formula.cs" />
-    <Compile Include="Mapping\IdentifierBag.cs" />
-    <Compile Include="Mapping\IdentifierCollection.cs" />
-    <Compile Include="Mapping\IFetchable.cs" />
-    <Compile Include="Mapping\Index.cs" />
-    <Compile Include="Mapping\IndexedCollection.cs" />
-    <Compile Include="Mapping\IRelationalModel.cs" />
-    <Compile Include="Mapping\IValue.cs" />
-    <Compile Include="Mapping\List.cs" />
-    <Compile Include="Mapping\ManyToOne.cs" />
-    <Compile Include="Mapping\Map.cs" />
-    <Compile Include="Mapping\MetaAttribute.cs" />
-    <Compile Include="Mapping\OneToMany.cs" />
-    <Compile Include="Mapping\OneToOne.cs" />
-    <Compile Include="Mapping\PersistentClass.cs" />
-    <Compile Include="Mapping\PrimaryKey.cs" />
-    <Compile Include="Mapping\PrimitiveArray.cs" />
-    <Compile Include="Mapping\Property.cs" />
-    <Compile Include="Mapping\RootClass.cs" />
-    <Compile Include="Mapping\Set.cs" />
-    <Compile Include="Mapping\SimpleValue.cs" />
-    <Compile Include="Mapping\Subclass.cs" />
-    <Compile Include="Mapping\Table.cs" />
-    <Compile Include="Mapping\ToOne.cs" />
-    <Compile Include="Mapping\UniqueKey.cs" />
-    <Compile Include="Metadata\IClassMetadata.cs" />
-    <Compile Include="Metadata\ICollectionMetadata.cs" />
-    <Compile Include="NHibernateUtil.cs" />
-    <Compile Include="NonUniqueObjectException.cs" />
-    <Compile Include="NonUniqueResultException.cs" />
-    <Compile Include="ObjectDeletedException.cs" />
-    <Compile Include="ObjectNotFoundException.cs" />
-    <Compile Include="PersistentObjectException.cs" />
-    <Compile Include="Persister\PersisterFactory.cs" />
-    <Compile Include="PropertyAccessException.cs" />
-    <Compile Include="PropertyNotFoundException.cs" />
-    <Compile Include="PropertyValueException.cs" />
-    <Compile Include="Properties\BasicPropertyAccessor.cs" />
-    <Compile Include="Properties\CamelCaseStrategy.cs" />
-    <Compile Include="Properties\CamelCaseUnderscoreStrategy.cs" />
-    <Compile Include="Properties\FieldAccessor.cs" />
-    <Compile Include="Properties\IFieldNamingStrategy.cs" />
-    <Compile Include="Properties\IGetter.cs" />
-    <Compile Include="Properties\IPropertyAccessor.cs" />
-    <Compile Include="Properties\ISetter.cs" />
-    <Compile Include="Properties\LowerCaseStrategy.cs" />
-    <Compile Include="Properties\LowerCaseUnderscoreStrategy.cs" />
-    <Compile Include="Properties\NoSetterAccessor.cs" />
-    <Compile Include="Properties\PascalCaseMUnderscoreStrategy.cs" />
-    <Compile Include="Properties\PascalCaseUnderscoreStrategy.cs" />
-    <Compile Include="Properties\PropertyAccessorFactory.cs" />
-    <Compile Include="Proxy\Poco\Castle\CastleLazyInitializer.cs" />
-    <Compile Include="Proxy\Poco\Castle\CastleProxyFactory.cs" />
-    <Compile Include="Proxy\INHibernateProxy.cs" />
-    <Compile Include="Proxy\IProxyFactory.cs" />
-    <Compile Include="Proxy\AbstractLazyInitializer.cs" />
-    <Compile Include="Proxy\NHibernateProxyHelper.cs" />
-    <Compile Include="Proxy\ProxyTypeValidator.cs" />
-    <Compile Include="QueryException.cs" />
-    <Compile Include="ReplicationMode.cs" />
-    <Compile Include="SqlCommand\Alias.cs" />
-    <Compile Include="SqlCommand\ANSICaseFragment.cs" />
-    <Compile Include="SqlCommand\ANSIJoinFragment.cs" />
-    <Compile Include="SqlCommand\CaseFragment.cs" />
-    <Compile Include="SqlCommand\ConditionalFragment.cs" />
-    <Compile Include="SqlCommand\DecodeCaseFragment.cs" />
-    <Compile Include="SqlCommand\DisjunctionFragment.cs" />
-    <Compile Include="SqlCommand\ForUpdateFragment.cs" />
-    <Compile Include="SqlCommand\InFragment.cs" />
-    <Compile Include="SqlCommand\ISqlStringBuilder.cs" />
-    <Compile Include="SqlCommand\JoinFragment.cs" />
-    <Compile Include="SqlCommand\OracleJoinFragment.cs" />
-    <Compile Include="SqlCommand\Parameter.cs" />
-    <Compile Include="SqlCommand\QueryJoinFragment.cs" />
-    <Compile Include="SqlCommand\QuerySelect.cs" />
-    <Compile Include="SqlCommand\SelectFragment.cs" />
-    <Compile Include="SqlCommand\SqlBaseBuilder.cs" />
-    <Compile Include="SqlCommand\SqlDeleteBuilder.cs" />
-    <Compile Include="SqlCommand\SqlInsertBuilder.cs" />
-    <Compile Include="SqlCommand\SqlSelectBuilder.cs" />
-    <Compile Include="SqlCommand\SqlSimpleSelectBuilder.cs" />
-    <Compile Include="SqlCommand\SqlString.cs" />
-    <Compile Include="SqlCommand\SqlStringBuilder.cs" />
-    <Compile Include="SqlCommand\SqlUpdateBuilder.cs" />
-    <Compile Include="SqlCommand\Template.cs" />
-    <Compile Include="SqlCommand\WhereBuilder.cs" />
-    <Compile Include="SqlTypes\AnsiStringFixedLengthSqlType.cs" />
-    <Compile Include="SqlTypes\AnsiStringSqlType.cs" />
-    <Compile Include="SqlTypes\BinaryBlobSqlType.cs" />
-    <Compile Include="SqlTypes\BinarySqlType.cs" />
-    <Compile Include="SqlTypes\SqlType.cs" />
-    <Compile Include="SqlTypes\SqlTypeFactory.cs" />
-    <Compile Include="SqlTypes\StringClobSqlType.cs" />
-    <Compile Include="SqlTypes\StringFixedLengthSqlType.cs" />
-    <Compile Include="SqlTypes\StringSqlType.cs" />
-    <Compile Include="StaleObjectStateException.cs" />
-    <Compile Include="Tool\hbm2ddl\AdoColumn.cs" />
-    <Compile Include="Tool\hbm2ddl\AdoTable.cs" />
-    <Compile Include="Tool\hbm2ddl\SchemaExport.cs" />
-    <Compile Include="TransactionException.cs" />
-    <Compile Include="Transaction\AdoTransaction.cs" />
-    <Compile Include="Transaction\ITransactionFactory.cs" />
-    <Compile Include="Transform\AliasToEntityMapResultTransformer.cs" />
-    <Compile Include="Transform\DistinctRootEntityResultTransformer.cs" />
-    <Compile Include="Transform\IResultTransformer.cs" />
-    <Compile Include="Transform\RootEntityResultTransformer.cs" />
-    <Compile Include="TransientObjectException.cs" />
-    <Compile Include="Type\AbstractType.cs" />
-    <Compile Include="Type\AnsiStringType.cs" />
-    <Compile Include="Type\ArrayType.cs" />
-    <Compile Include="Type\BagType.cs" />
-    <Compile Include="Type\BinaryBlobType.cs" />
-    <Compile Include="Type\BinaryType.cs" />
-    <Compile Include="Type\BooleanType.cs" />
-    <Compile Include="Type\ByteType.cs" />
-    <Compile Include="Type\CharBooleanType.cs" />
-    <Compile Include="Type\CharType.cs" />
-    <Compile Include="Type\ComponentType.cs" />
-    <Compile Include="Type\CompositeCustomType.cs" />
-    <Compile Include="Type\CultureInfoType.cs" />
-    <Compile Include="Type\CustomType.cs" />
-    <Compile Include="Type\DateTimeType.cs" />
-    <Compile Include="Type\DateType.cs" />
-    <Compile Include="Type\DecimalType.cs" />
-    <Compile Include="Type\DoubleType.cs" />
-    <Compile Include="Type\EntityType.cs" />
-    <Compile Include="Type\EnumStringType.cs" />
-    <Compile Include="Type\GuidType.cs" />
-    <Compile Include="Type\IAbstractComponentType.cs" />
-    <Compile Include="Type\IAssociationType.cs" />
-    <Compile Include="Type\IdentifierBagType.cs" />
-    <Compile Include="Type\IDiscriminatorType.cs" />
-    <Compile Include="Type\IIdentifierType.cs" />
-    <Compile Include="Type\ILiteralType.cs" />
-    <Compile Include="Type\ImmutableType.cs" />
-    <Compile Include="Type\Int16Type.cs" />
-    <Compile Include="Type\Int32Type.cs" />
-    <Compile Include="Type\Int64Type.cs" />
-    <Compile Include="Type\IType.cs" />
-    <Compile Include="Type\IVersionType.cs" />
-    <Compile Include="Type\ListType.cs" />
-    <Compile Include="Type\ManyToOneType.cs" />
-    <Compile Include="Type\MapType.cs" />
-    <Compile Include="Type\MetaType.cs" />
-    <Compile Include="Type\MutableType.cs" />
-    <Compile Include="Type\NullableType.cs" />
-    <Compile Include="Type\OneToOneType.cs" />
-    <Compile Include="Type\PersistentEnumType.cs" />
-    <Compile Include="Type\SByteType.cs" />
-    <Compile Include="Type\SerializableType.cs" />
-    <Compile Include="Type\SerializationException.cs" />
-    <Compile Include="Type\SetType.cs" />
-    <Compile Include="Type\SingleType.cs" />
-    <Compile Include="Type\SortedMapType.cs" />
-    <Compile Include="Type\SortedSetType.cs" />
-    <Compile Include="Type\StringClobType.cs" />
-    <Compile Include="Type\StringType.cs" />
-    <Compile Include="Type\TicksType.cs" />
-    <Compile Include="Type\TimeSpanType.cs" />
-    <Compile Include="Type\TimestampType.cs" />
-    <Compile Include="Type\TimeType.cs" />
-    <Compile Include="Type\TrueFalseType.cs" />
-    <Compile Include="Type\TypeFactory.cs" />
-    <Compile Include="Type\TypeType.cs" />
-    <Compile Include="Type\UInt16Type.cs" />
-    <Compile Include="Type\UInt32Type.cs" />
-    <Compile Include="Type\UInt64Type.cs" />
-    <Compile Include="Type\PrimitiveType.cs" />
-    <Compile Include="Type\YesNoType.cs" />
-    <Compile Include="UnresolvableObjectException.cs" />
-    <Compile Include="Util\ADOExceptionReporter.cs" />
-    <Compile Include="Util\ArrayHelper.cs" />
-    <Compile Include="Util\CollectionPrinter.cs" />
-    <Compile Include="Util\IdentityMap.cs" />
-    <Compile Include="Util\JoinedEnumerable.cs" />
-    <Compile Include="Util\ObjectUtils.cs" />
-    <Compile Include="Util\PropertiesHelper.cs" />
-    <Compile Include="Util\ReflectHelper.cs" />
-    <Compile Include="Util\SequencedHashMap.cs" />
-    <Compile Include="Util\StringHelper.cs" />
-    <Compile Include="Util\StringTokenizer.cs" />
-    <Compile Include="WrongClassException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="nhibernate-generic.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <Compile Include="Action\BulkOperationCleanupAction.cs" />
-    <Compile Include="Action\CollectionAction.cs" />
-    <Compile Include="Action\CollectionRecreateAction.cs" />
-    <Compile Include="Action\CollectionRemoveAction.cs" />
-    <Compile Include="Action\CollectionUpdateAction.cs" />
-    <Compile Include="Action\DelayedPostInsertIdentifier.cs" />
-    <Compile Include="Action\EntityAction.cs" />
-    <Compile Include="Action\EntityDeleteAction.cs" />
-    <Compile Include="Action\EntityIdentityInsertAction.cs" />
-    <Compile Include="Action\EntityInsertAction.cs" />
-    <Compile Include="Action\EntityUpdateAction.cs" />
-    <Compile Include="Action\IExecutable.cs" />
-    <Compile Include="AdoNet\ColumnNameCache.cs" />
-    <Compile Include="AdoNet\Expectations.cs" />
-    <Compile Include="AdoNet\IBatcherFactory.cs" />
-    <Compile Include="AdoNet\IExpectation.cs" />
-    <Compile Include="AdoNet\NonBatchingBatcherFactory.cs" />
-    <Compile Include="AdoNet\OracleDataClientBatchingBatcherFactory.cs" />
-    <Compile Include="AdoNet\ResultSetWrapper.cs" />
-    <Compile Include="AdoNet\SqlClientBatchingBatcherFactory.cs" />
-    <Compile Include="AdoNet\TooManyRowsAffectedException.cs" />
-    <Compile Include="Bytecode\CodeDom\BytecodeProviderImpl.cs" />
-    <Compile Include="Bytecode\DefaultProxyFactoryFactory.cs" />
-    <Compile Include="Bytecode\IAccessOptimizer.cs" />
-    <Compile Include="Bytecode\IBytecodeProvider.cs" />
-    <Compile Include="Bytecode\IInjectableProxyFactoryFactory.cs" />
-    <Compile Include="Bytecode\IInstantiationOptimizer.cs" />
-    <Compile Include="Bytecode\IProxyFactoryFactory.cs" />
-    <Compile Include="Bytecode\IReflectionOptimizer.cs" />
-    <Compile Include="Bytecode\Lightweight\AccessOptimizer.cs" />
-    <Compile Include="Bytecode\Lightweight\BytecodeProviderImpl.cs" />
-    <Compile Include="Bytecode\Lightweight\Delegates.cs" />
-    <Compile Include="Bytecode\Lightweight\ReflectionOptimizer.cs" />
-    <Compile Include="Bytecode\NullBytecodeProvider.cs" />
-    <Compile Include="Bytecode\EmitUtil.cs" />
-    <Compile Include="CacheMode.cs" />
-    <Compile Include="Cache\CacheKey.cs" />
-    <Compile Include="Cache\Entry\CollectionCacheEntry.cs" />
-    <Compile Include="Cache\Entry\ICacheEntryStructure.cs" />
-    <Compile Include="Cache\Entry\StructuredCacheEntry.cs" />
-    <Compile Include="Cache\Entry\StructuredCollectionCacheEntry.cs" />
-    <Compile Include="Cache\Entry\StructuredMapCacheEntry.cs" />
-    <Compile Include="Cache\Entry\UnstructuredCacheEntry.cs" />
-    <Compile Include="Cache\FilterKey.cs" />
-    <Compile Include="Cache\IOptimisticCacheSource.cs" />
-    <Compile Include="Cache\NoCacheProvider.cs" />
-    <Compile Include="Cache\NoCachingEnabledException.cs" />
-    <Compile Include="Cfg\ClassExtractor.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\CfgXmlHelper.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\ClassCacheConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\CollectionCacheConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\EventConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\HibernateConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\ListenerConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\MappingConfiguration.cs" />
-    <Compile Include="Cfg\ConfigurationSchema\SessionFactoryConfiguration.cs" />
-    <Compile Include="Cfg\ExtendsQueueEntry.cs" />
-    <Compile Include="Cfg\HbmConstants.cs" />
-    <Compile Include="Cfg\HibernateConfigException.cs" />
-    <Compile Include="Cfg\IHibernateConfiguration.cs" />
-    <Compile Include="Cfg\NamedXmlDocument.cs" />
-    <Compile Include="Cfg\MappingsQueueEntry.cs" />
-    <Compile Include="Cfg\MappingSchema\EndsWithHbmXmlFilter.cs" />
-    <Compile Include="Cfg\MappingSchema\Hbm.generated.cs">
-      <SubType>code</SubType>
-    </Compile>
-    <Compile Include="Cfg\MappingSchema\HbmBase.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmClass.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmDatabaseObject.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmDefinition.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmMapping.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmMeta.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmParam.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmQuery.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmSqlQuery.cs" />
-    <Compile Include="Cfg\MappingSchema\IAssemblyResourceFilter.cs" />
-    <Compile Include="Cfg\MappingSchema\IMappingDocumentParser.cs" />
-    <Compile Include="Cfg\MappingSchema\MappingDocumentAggregator.cs" />
-    <Compile Include="Cfg\MappingSchema\MappingDocumentParser.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\AuxiliaryDatabaseObjectFactory.cs" />
-    <Compile Include="Cfg\MappingSchema\HbmFilterDef.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\CacheModeConverter.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassCompositeIdBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassDiscriminatorBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassIdBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\FilterDefinitionFactory.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\FlushModeConverter.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ResultSetMappingBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\Binder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\ClassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\CollectionBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\RootClassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\JoinedSubclassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\MappingRootBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\NamedQueryBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\NamedSQLQueryBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\SubclassBinder.cs" />
-    <Compile Include="Cfg\XmlHbmBinding\UnionSubclassBinder.cs" />
-    <Compile Include="Cfg\XmlSchemas.cs" />
-    <Compile Include="Classic\ILifecycle.cs" />
-    <Compile Include="Classic\IValidatable.cs" />
-    <Compile Include="Classic\ValidationFailure.cs" />
-    <Compile Include="Collection\AbstractPersistentCollection.cs" />
-    <Compile Include="Collection\Generic\PersistentGenericSet.cs" />
-    <Compile Include="Collection\Generic\PersistentGenericBag.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collection\Generic\PersistentGenericList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collection\Generic\PersistentGenericMap.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collection\Generic\PersistentGenericIdentifierBag.cs" />
-    <Compile Include="Collection\PersistentArrayHolder.cs" />
-    <Compile Include="Collection\PersistentBag.cs" />
-    <Compile Include="Collection\PersistentIdentifierBag.cs" />
-    <Compile Include="Collection\PersistentList.cs" />
-    <Compile Include="Collection\PersistentMap.cs" />
-    <Compile Include="Collection\PersistentSet.cs" />
-    <Compile Include="ConnectionReleaseMode.cs" />
-    <Compile Include="Context\CallSessionContext.cs" />
-    <Compile Include="Context\CurrentSessionContext.cs" />
-    <Compile Include="Context\ICurrentSessionContext.cs" />
-    <Compile Include="Context\ManagedWebSessionContext.cs" />
-    <Compile Include="Context\MapBasedSessionContext.cs" />
-    <Compile Include="Context\ThreadStaticSessionContext.cs" />
-    <Compile Include="Context\WebSessionContext.cs" />
-    <Compile Include="CriteriaTransformer.cs" />
-    <Compile Include="CriteriaUtil.cs" />
-    <Compile Include="Criterion\AbstractCriterion.cs" />
-    <Compile Include="Criterion\AbstractEmptinessExpression.cs" />
-    <Compile Include="Criterion\AggregateProjection.cs" />
-    <Compile Include="Criterion\AliasedProjection.cs" />
-    <Compile Include="Criterion\AndExpression.cs" />
-    <Compile Include="Criterion\AvgProjection.cs" />
-    <Compile Include="Criterion\BetweenExpression.cs" />
-    <Compile Include="Criterion\CastProjection.cs" />
-    <Compile Include="Criterion\ConditionalProjection.cs" />
-    <Compile Include="Criterion\Conjunction.cs" />
-    <Compile Include="Criterion\ConstantProjection.cs" />
-    <Compile Include="Criterion\CountProjection.cs" />
-    <Compile Include="Criterion\CriteriaSpecification.cs" />
-    <Compile Include="Criterion\CriterionUtil.cs" />
-    <Compile Include="Criterion\DetachedCriteria.cs" />
-    <Compile Include="Criterion\Disjunction.cs" />
-    <Compile Include="Criterion\Distinct.cs" />
-    <Compile Include="Criterion\EqPropertyExpression.cs" />
-    <Compile Include="Criterion\Example.cs" />
-    <Compile Include="Criterion\ExistsSubqueryExpression.cs" />
-    <Compile Include="Criterion\Expression.cs" />
-    <Compile Include="Criterion\GePropertyExpression.cs" />
-    <Compile Include="Criterion\GtPropertyExpression.cs" />
-    <Compile Include="Criterion\ICriteriaQuery.cs" />
-    <Compile Include="Criterion\ICriterion.cs" />
-    <Compile Include="Criterion\IdentifierEqExpression.cs" />
-    <Compile Include="Criterion\IdentifierProjection.cs" />
-    <Compile Include="Criterion\InExpression.cs" />
-    <Compile Include="Criterion\InsensitiveLikeExpression.cs" />
-    <Compile Include="Criterion\IProjection.cs" />
-    <Compile Include="Criterion\IsEmptyExpression.cs" />
-    <Compile Include="Criterion\IsNotEmptyExpression.cs" />
-    <Compile Include="Criterion\Junction.cs" />
-    <Compile Include="Criterion\LePropertyExpression.cs" />
-    <Compile Include="Criterion\LikeExpression.cs" />
-    <Compile Include="Criterion\LogicalExpression.cs" />
-    <Compile Include="Criterion\LtPropertyExpression.cs" />
-    <Compile Include="Criterion\MatchMode.cs" />
-    <Compile Include="Criterion\NotExpression.cs" />
-    <Compile Include="Criterion\NotNullExpression.cs" />
-    <Compile Include="Criterion\NullExpression.cs" />
-    <Compile Include="Criterion\Order.cs" />
-    <Compile Include="Criterion\OrExpression.cs" />
-    <Compile Include="Criterion\ProjectionList.cs" />
-    <Compile Include="Criterion\Projections.cs" />
-    <Compile Include="Criterion\Property.cs" />
-    <Compile Include="Criterion\PropertyExpression.cs" />
-    <Compile Include="Criterion\PropertyProjection.cs" />
-    <Compile Include="Criterion\PropertySubqueryExpression.cs" />
-    <Compile Include="Criterion\Restrictions.cs" />
-    <Compile Include="Criterion\RowCountInt64Projection.cs" />
-    <Compile Include="Criterion\RowCountProjection.cs" />
-    <Compile Include="Criterion\SimpleExpression.cs" />
-    <Compile Include="Criterion\SimpleProjection.cs" />
-    <Compile Include="Criterion\SimpleSubqueryExpression.cs" />
-    <Compile Include="Criterion\SQLCriterion.cs" />
-    <Compile Include="Criterion\SqlFunctionProjection.cs" />
-    <Compile Include="Criterion\SQLProjection.cs" />
-    <Compile Include="Criterion\Subqueries.cs" />
-    <Compile Include="Criterion\SubqueryExpression.cs" />
-    <Compile Include="DebugHelpers\DictionaryProxy.cs" />
-    <Compile Include="DebugHelpers\CollectionProxy.cs" />
-    <Compile Include="Dialect\Function\AnsiExtractFunction.cs" />
-    <Compile Include="Dialect\Function\AnsiSubstringFunction.cs" />
-    <Compile Include="Dialect\Function\AnsiTrimEmulationFunction.cs" />
-    <Compile Include="Dialect\Function\AnsiTrimFunction.cs" />
-    <Compile Include="Dialect\Function\CastFunction.cs" />
-    <Compile Include="Dialect\Function\CharIndexFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicAggregateFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicAvgFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicCountFunction.cs" />
-    <Compile Include="Dialect\Function\ClassicSumFunction.cs" />
-    <Compile Include="Dialect\Function\CommonGrammar.cs" />
-    <Compile Include="Dialect\Function\IFunctionGrammar.cs" />
-    <Compile Include="Dialect\Function\ISQLFunction.cs" />
-    <Compile Include="Dialect\Function\NoArgSQLFunction.cs" />
-    <Compile Include="Dialect\Function\NvlFunction.cs" />
-    <Compile Include="Dialect\Function\PositionSubstringFunction.cs" />
-    <Compile Include="Dialect\Function\SQLFunctionRegistry.cs" />
-    <Compile Include="Dialect\Function\SQLFunctionTemplate.cs" />
-    <Compile Include="Dialect\Function\StandardSafeSQLFunction.cs" />
-    <Compile Include="Dialect\Function\StandardSQLFunction.cs" />
-    <Compile Include="Dialect\Function\VarArgsSQLFunction.cs" />
-    <Compile Include="AdoNet\IEmbeddedBatcherFactoryProvider.cs" />
-    <Compile Include="Dialect\InformixDialect.cs" />
-    <Compile Include="Dialect\Lock\ILockingStrategy.cs" />
-    <Compile Include="Dialect\Lock\SelectLockingStrategy.cs" />
-    <Compile Include="Dialect\Lock\UpdateLockingStrategy.cs" />
-    <Compile Include="Dialect\MsSqlCeDialect.cs" />
-    <Compile Include="Dialect\MySQL5Dialect.cs" />
-    <Compile Include="Dialect\PostgreSQL82Dialect.cs" />
-    <Compile Include="Dialect\Sybase11Dialect.cs" />
-    <Compile Include="Driver\ISqlParameterFormatter.cs" />
-    <Compile Include="Driver\SqlStringFormatter.cs" />
-    <Compile Include="EmptyInterceptor.cs" />
-    <Compile Include="Engine\ActionQueue.cs" />
-    <Compile Include="Engine\AssociationKey.cs" />
-    <Compile Include="Engine\BatchFetchQueue.cs" />
-    <Compile Include="Engine\Cascade.cs" />
-    <Compile Include="Engine\CascadeStyle.cs" />
-    <Compile Include="Engine\CascadingAction.cs" />
-    <Compile Include="Engine\Collections.cs" />
-    <Compile Include="Engine\EntityUniqueKey.cs" />
-    <Compile Include="Engine\FilterDefinition.cs" />
-    <Compile Include="Engine\ForeignKeys.cs" />
-    <Compile Include="Engine\IdentifierValue.cs" />
-    <Compile Include="Engine\IPersistenceContext.cs" />
-    <Compile Include="Engine\Loading\CollectionLoadContext.cs" />
-    <Compile Include="Engine\Loading\EntityLoadContext.cs" />
-    <Compile Include="Engine\Loading\LoadContexts.cs" />
-    <Compile Include="Engine\Loading\LoadingCollectionEntry.cs" />
-    <Compile Include="Engine\Nullability.cs" />
-    <Compile Include="Engine\Query\HQLQueryPlan.cs" />
-    <Compile Include="Engine\Query\NamedParameterDescriptor.cs" />
-    <Compile Include="Engine\Query\NativeSQLQueryPlan.cs" />
-    <Compile Include="Engine\Query\OrdinalParameterDescriptor.cs" />
-    <Compile Include="Engine\Query\ParameterMetadata.cs" />
-    <Compile Include="Engine\Query\ParamLocationRecognizer.cs" />
-    <Compile Include="Engine\Query\QueryMetadata.cs" />
-    <Compile Include="Engine\Query\QueryPlanCache.cs" />
-    <Compile Include="Engine\Query\ReturnMetadata.cs" />
-    <Compile Include="Engine\Query\FilterQueryPlan.cs" />
-    <Compile Include="Engine\Query\Sql\INativeSQLQueryReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryCollectionReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryJoinReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryNonScalarReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryRootReturn.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQueryScalarReturn.cs" />
-    <Compile Include="Engine\StatefulPersistenceContext.cs" />
-    <Compile Include="Engine\TwoPhaseLoad.cs" />
-    <Compile Include="Engine\ValueInclusion.cs" />
-    <Compile Include="Engine\VersionValue.cs" />
-    <Compile Include="EntityMode.cs" />
-    <Compile Include="Event\AbstractEvent.cs" />
-    <Compile Include="Event\AutoFlushEvent.cs" />
-    <Compile Include="Event\Default\AbstractFlushingEventListener.cs" />
-    <Compile Include="Event\Default\AbstractLockUpgradeEventListener.cs" />
-    <Compile Include="Event\Default\AbstractReassociateEventListener.cs" />
-    <Compile Include="Event\Default\AbstractSaveEventListener.cs" />
-    <Compile Include="Event\Default\AbstractVisitor.cs" />
-    <Compile Include="Event\Default\DefaultAutoFlushEventListener.cs" />
-    <Compile Include="Event\Default\DefaultDeleteEventListener.cs" />
-    <Compile Include="Event\Default\DefaultDirtyCheckEventListener.cs" />
-    <Compile Include="Event\Default\DefaultEvictEventListener.cs" />
-    <Compile Include="Event\Default\DefaultFlushEntityEventListener.cs" />
-    <Compile Include="Event\Default\DefaultFlushEventListener.cs" />
-    <Compile Include="Event\Default\DefaultInitializeCollectionEventListener.cs" />
-    <Compile Include="Event\Default\DefaultLoadEventListener.cs" />
-    <Compile Include="Event\Default\DefaultLockEventListener.cs" />
-    <Compile Include="Event\Default\DefaultMergeEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPersistEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPersistOnFlushEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPostLoadEventListener.cs" />
-    <Compile Include="Event\Default\DefaultPreLoadEventListener.cs" />
-    <Compile Include="Event\Default\DefaultRefreshEventListener.cs" />
-    <Compile Include="Event\Default\DefaultReplicateEventListener.cs" />
-    <Compile Include="Event\Default\DefaultSaveEventListener.cs" />
-    <Compile Include="Event\Default\DefaultSaveOrUpdateCopyEventListener.cs" />
-    <Compile Include="Event\Default\DefaultSaveOrUpdateEventListener.cs" />
-    <Compile Include="Event\Default\DefaultUpdateEventListener.cs" />
-    <Compile Include="Event\Default\DirtyCollectionSearchVisitor.cs" />
-    <Compile Include="Event\Default\EvictVisitor.cs" />
-    <Compile Include="Event\Default\FlushVisitor.cs" />
-    <Compile Include="Event\Default\OnLockVisitor.cs" />
-    <Compile Include="Event\Default\OnReplicateVisitor.cs" />
-    <Compile Include="Event\Default\OnUpdateVisitor.cs" />
-    <Compile Include="Event\Default\ProxyVisitor.cs" />
-    <Compile Include="Event\Default\WrapVisitor.cs" />
-    <Compile Include="Event\DeleteEvent.cs" />
-    <Compile Include="Event\DirtyCheckEvent.cs" />
-    <Compile Include="Event\EventListeners.cs" />
-    <Compile Include="Event\EvictEvent.cs" />
-    <Compile Include="Event\FlushEntityEvent.cs" />
-    <Compile Include="Event\FlushEvent.cs" />
-    <Compile Include="Event\IAutoFlushEventListener.cs" />
-    <Compile Include="Event\IDeleteEventListener.cs" />
-    <Compile Include="Event\IDirtyCheckEventListener.cs" />
-    <Compile Include="Event\IEventSource.cs" />
-    <Compile Include="Event\IEvictEventListener.cs" />
-    <Compile Include="Event\IFlushEntityEventListener.cs" />
-    <Compile Include="Event\IFlushEventListener.cs" />
-    <Compile Include="Event\IInitializable.cs" />
-    <Compile Include="Event\IInitializeCollectionEventListener.cs" />
-    <Compile Include="Event\ILoadEventListener.cs" />
-    <Compile Include="Event\ILockEventListener.cs" />
-    <Compile Include="Event\IMergeEventListener.cs" />
-    <Compile Include="Event\InitializeCollectionEvent.cs" />
-    <Compile Include="Event\IPersistEventListener.cs" />
-    <Compile Include="Event\IPostDeleteEventListener.cs" />
-    <Compile Include="Event\IPostInsertEventListener.cs" />
-    <Compile Include="Event\IPostLoadEventListener.cs" />
-    <Compile Include="Event\IPostUpdateEventListener.cs" />
-    <Compile Include="Event\IPreDeleteEventListener.cs" />
-    <Compile Include="Event\IPreInsertEventListener.cs" />
-    <Compile Include="Event\IPreLoadEventListener.cs" />
-    <Compile Include="Event\IPreUpdateEventListener.cs" />
-    <Compile Include="Event\IRefreshEventListener.cs" />
-    <Compile Include="Event\IReplicateEventListener.cs" />
-    <Compile Include="Event\ISaveOrUpdateEventListener.cs" />
-    <Compile Include="Event\ListenerType.cs" />
-    <Compile Include="Event\LoadEvent.cs" />
-    <Compile Include="Event\LoadEventListener.cs" />
-    <Compile Include="Event\LoadType.cs" />
-    <Compile Include="Event\LockEvent.cs" />
-    <Compile Include="Event\MergeEvent.cs" />
-    <Compile Include="Event\PersistEvent.cs" />
-    <Compile Include="Event\PostDeleteEvent.cs" />
-    <Compile Include="Event\PostInsertEvent.cs" />
-    <Compile Include="Event\PostLoadEvent.cs" />
-    <Compile Include="Event\PostUpdateEvent.cs" />
-    <Compile Include="Event\PreDeleteEvent.cs" />
-    <Compile Include="Event\PreInsertEvent.cs" />
-    <Compile Include="Event\PreLoadEvent.cs" />
-    <Compile Include="Event\PreUpdateEvent.cs" />
-    <Compile Include="Event\RefreshEvent.cs" />
-    <Compile Include="Event\ReplicateEvent.cs" />
-    <Compile Include="Event\SaveOrUpdateEvent.cs" />
-    <Compile Include="Exceptions\ADOConnectionException.cs" />
-    <Compile Include="Exceptions\ConstraintViolationException.cs" />
-    <Compile Include="Exceptions\DataException.cs" />
-    <Compile Include="Exceptions\GenericADOException.cs" />
-    <Compile Include="Exceptions\IConfigurable.cs" />
-    <Compile Include="Exceptions\ISQLExceptionConverter.cs" />
-    <Compile Include="Exceptions\IViolatedConstraintNameExtracter.cs" />
-    <Compile Include="Exceptions\LockAcquisitionException.cs" />
-    <Compile Include="Exceptions\SQLExceptionConverterFactory.cs" />
-    <Compile Include="Exceptions\SQLGrammarException.cs" />
-    <Compile Include="Exceptions\SQLStateConverter.cs" />
-    <Compile Include="FKUnmatchingColumnsException.cs" />
-    <Compile Include="Id\AbstractPostInsertGenerator.cs" />
-    <Compile Include="Id\Insert\AbstractReturningDelegate.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Id\Insert\AbstractSelectingDelegate.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Id\Insert\IBinder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Id\Insert\IdentifierGeneratingInsert.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Id\Insert\IInsertGeneratedIdentifierDelegate.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Id\Insert\InsertSelectIdentityInsert.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Id\IPostInsertIdentifierGenerator.cs" />
-    <Compile Include="Id\IPostInsertIdentityPersister.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Impl\AbstractDetachedQuery.cs" />
-    <Compile Include="Hql\Classic\FunctionStack.cs" />
-    <Compile Include="Impl\AbstractSessionImpl.cs" />
-    <Compile Include="Impl\DbCommandSet.cs" />
-    <Compile Include="Impl\DetachedNamedQuery.cs" />
-    <Compile Include="Impl\DetachedQuery.cs" />
-    <Compile Include="IDetachedQuery.cs" />
-    <Compile Include="IdentityEqualityComparer.cs" />
-    <Compile Include="Impl\IDbCommandSet.cs" />
-    <Compile Include="Impl\IDetachedQueryImplementor.cs" />
-    <Compile Include="Impl\MultiCriteriaImpl.cs" />
-    <Compile Include="Impl\MultipleQueriesCacheAssembler.cs" />
-    <Compile Include="Impl\OracleClientCommandSet.cs" />
-    <Compile Include="Impl\SqlClientCommandSet.cs" />
-    <Compile Include="Impl\StatelessSessionImpl.cs" />
-    <Compile Include="IMultiCriteria.cs" />
-    <Compile Include="Intercept\AbstractFieldInterceptor.cs" />
-    <Compile Include="Intercept\FieldInterceptionHelper.cs" />
-    <Compile Include="Intercept\IFieldInterceptor.cs" />
-    <Compile Include="Intercept\ILazyPropertyInitializer.cs" />
-    <Compile Include="IStatelessSession.cs" />
-    <Compile Include="Loader\Entity\CascadeEntityLoader.cs" />
-    <Compile Include="Loader\Entity\CollectionElementLoader.cs" />
-    <Compile Include="Mapping\Backref.cs" />
-    <Compile Include="Mapping\DenormalizedTable.cs" />
-    <Compile Include="Mapping\IMetaAttributable.cs" />
-    <Compile Include="Mapping\IndexBackref.cs" />
-    <Compile Include="Mapping\IPersistentClassVisitor.cs" />
-    <Compile Include="Mapping\IValueVisitor.cs" />
-    <Compile Include="Mapping\PropertyGeneration.cs" />
-    <Compile Include="Mapping\TypeDef.cs" />
-    <Compile Include="Mapping\UnionSubclass.cs" />
-    <Compile Include="Persister\Entity\ILockable.cs" />
-    <Compile Include="Persister\Entity\UnionSubclassEntityPersister.cs" />
-    <Compile Include="Properties\BackrefPropertyAccessor.cs" />
-    <Compile Include="Properties\EmbeddedPropertyAccessor.cs" />
-    <Compile Include="Properties\IndexPropertyAccessor.cs" />
-    <Compile Include="Properties\MapAccessor.cs" />
-    <Compile Include="Properties\NoopAccessor.cs" />
-    <Compile Include="Proxy\IEntityNotFoundDelegate.cs" />
-    <Compile Include="Proxy\ILazyInitializer.cs" />
-    <Compile Include="Proxy\Map\MapLazyInitializer.cs" />
-    <Compile Include="Proxy\Map\MapProxy.cs" />
-    <Compile Include="Proxy\Map\MapProxyFactory.cs" />
-    <Compile Include="Proxy\Poco\BasicLazyInitializer.cs" />
-    <Compile Include="QueryParameterException.cs" />
-    <Compile Include="SessionException.cs" />
-    <Compile Include="SqlCommand\SubselectClauseExtractor.cs" />
-    <Compile Include="Engine\SubselectFetch.cs" />
-    <Compile Include="Engine\JoinSequence.cs" />
-    <Compile Include="Hql\Classic\ClassicQueryTranslatorFactory.cs" />
-    <Compile Include="Hql\CollectionSubqueryFactory.cs" />
-    <Compile Include="Hql\HolderInstantiator.cs" />
-    <Compile Include="Hql\IFilterTranslator.cs" />
-    <Compile Include="Hql\IParameterTranslations.cs" />
-    <Compile Include="Hql\IQueryTranslator.cs" />
-    <Compile Include="Hql\IQueryTranslatorFactory.cs" />
-    <Compile Include="Hql\NameGenerator.cs" />
-    <Compile Include="Hql\QueryExecutionRequestException.cs" />
-    <Compile Include="Hql\QuerySplitter.cs" />
-    <Compile Include="IFilter.cs" />
-    <Compile Include="Dialect\DB2400Dialect.cs" />
-    <Compile Include="Dialect\IngresDialect.cs" />
-    <Compile Include="Dialect\MsSql2005Dialect.cs" />
-    <Compile Include="Dialect\PostgreSQL81Dialect.cs" />
-    <Compile Include="Dialect\SybaseAnywhereDialect.cs" />
-    <Compile Include="Driver\ASAClientDriver.cs" />
-    <Compile Include="Driver\DB2400Driver.cs" />
-    <Compile Include="Driver\FirebirdClientDriver.cs" />
-    <Compile Include="Driver\IngresDriver.cs" />
-    <Compile Include="Driver\ReflectionBasedDriver.cs" />
-    <Compile Include="Driver\SQLite20Driver.cs" />
-    <Compile Include="Driver\SqlServerCeDriver.cs" />
-    <Compile Include="DuplicateMappingException.cs" />
-    <Compile Include="Engine\EntityKey.cs" />
-    <Compile Include="Engine\ExecuteUpdateResultCheckStyle.cs" />
-    <Compile Include="Engine\JoinHelper.cs" />
-    <Compile Include="Engine\NamedQueryDefinition.cs" />
-    <Compile Include="Engine\NamedSQLQueryDefinition.cs" />
-    <Compile Include="Engine\Query\Sql\NativeSQLQuerySpecification.cs" />
-    <Compile Include="Engine\Query\ParameterParser.cs" />
-    <Compile Include="Engine\ResultSetMappingDefinition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Hql\Util\SessionFactoryHelper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AdoNet\ConnectionManager.cs" />
-    <Compile Include="Impl\MultiQueryImpl.cs" />
-    <Compile Include="AdoNet\SqlClientSqlCommandSet.cs" />
-    <Compile Include="Impl\CollectionFilterImpl.cs" />
-    <Compile Include="IMultiQuery.cs" />
-    <Compile Include="InvalidProxyTypeException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ISQLQuery.cs" />
-    <Compile Include="Loader\AbstractEntityJoinWalker.cs" />
-    <Compile Include="Loader\BasicLoader.cs" />
-    <Compile Include="Loader\Collection\BasicCollectionJoinWalker.cs" />
-    <Compile Include="Loader\Collection\BasicCollectionLoader.cs" />
-    <Compile Include="Loader\Collection\BatchingCollectionInitializer.cs" />
-    <Compile Include="Loader\Collection\CollectionJoinWalker.cs" />
-    <Compile Include="Loader\Collection\CollectionLoader.cs" />
-    <Compile Include="Loader\Collection\ICollectionInitializer.cs" />
-    <Compile Include="Loader\Collection\OneToManyJoinWalker.cs" />
-    <Compile Include="Loader\Collection\OneToManyLoader.cs" />
-    <Compile Include="Loader\Collection\SubselectCollectionLoader.cs" />
-    <Compile Include="Loader\Collection\SubselectOneToManyLoader.cs" />
-    <Compile Include="Loader\Criteria\CriteriaJoinWalker.cs" />
-    <Compile Include="Loader\Criteria\CriteriaLoader.cs" />
-    <Compile Include="Loader\Criteria\CriteriaQueryTranslator.cs" />
-    <Compile Include="Loader\Custom\CollectionFetchReturn.cs" />
-    <Compile Include="Loader\Custom\CollectionReturn.cs" />
-    <Compile Include="Loader\Custom\ColumnCollectionAliases.cs" />
-    <Compile Include="Loader\Custom\ColumnEntityAliases.cs" />
-    <Compile Include="Loader\Custom\CustomLoader.cs" />
-    <Compile Include="Loader\Custom\EntityFetchReturn.cs" />
-    <Compile Include="Loader\Custom\FetchReturn.cs" />
-    <Compile Include="Loader\Custom\ICustomQuery.cs" />
-    <Compile Include="Loader\Custom\IReturn.cs" />
-    <Compile Include="Loader\Custom\NonScalarReturn.cs" />
-    <Compile Include="Loader\Custom\RootReturn.cs" />
-    <Compile Include="Loader\Custom\ScalarReturn.cs" />
-    <Compile Include="Loader\Custom\Sql\SQLCustomQuery.cs" />
-    <Compile Include="Loader\Custom\Sql\SQLQueryParser.cs" />
-    <Compile Include="Loader\Custom\Sql\SQLQueryReturnProcessor.cs" />
-    <Compile Include="Loader\DefaultEntityAliases.cs" />
-    <Compile Include="Loader\Entity\AbstractEntityLoader.cs" />
-    <Compile Include="Loader\Entity\BatchingEntityLoader.cs" />
-    <Compile Include="Loader\Entity\CascadeEntityJoinWalker.cs" />
-    <Compile Include="Loader\Entity\EntityJoinWalker.cs" />
-    <Compile Include="Loader\Entity\EntityLoader.cs" />
-    <Compile Include="Loader\Entity\IUniqueEntityLoader.cs" />
-    <Compile Include="Loader\GeneratedCollectionAliases.cs" />
-    <Compile Include="Loader\ICollectionAliases.cs" />
-    <Compile Include="Loader\IEntityAliases.cs" />
-    <Compile Include="Loader\JoinWalker.cs" />
-    <Compile Include="Loader\OuterJoinableAssociation.cs" />
-    <Compile Include="Mapping\AbstractAuxiliaryDatabaseObject.cs" />
-    <Compile Include="Mapping\DependantValue.cs" />
-    <Compile Include="Mapping\IAuxiliaryDatabaseObject.cs" />
-    <Compile Include="Mapping\IFilterable.cs" />
-    <Compile Include="Mapping\IKeyValue.cs" />
-    <Compile Include="Mapping\ISelectable.cs" />
-    <Compile Include="Mapping\ITableOwner.cs" />
-    <Compile Include="Mapping\Join.cs" />
-    <Compile Include="Mapping\JoinedSubclass.cs" />
-    <Compile Include="Mapping\SimpleAuxiliaryDatabaseObject.cs" />
-    <Compile Include="Mapping\SingleTableSubclass.cs" />
-    <Compile Include="Persister\Collection\AbstractCollectionPersister.cs" />
-    <Compile Include="Persister\Collection\BasicCollectionPersister.cs" />
-    <Compile Include="Persister\Collection\CollectionPropertyMapping.cs" />
-    <Compile Include="Persister\Collection\CollectionPropertyNames.cs" />
-    <Compile Include="Persister\Collection\CompositeElementPropertyMapping.cs" />
-    <Compile Include="Persister\Collection\ElementPropertyMapping.cs" />
-    <Compile Include="Persister\Collection\ICollectionPersister.cs" />
-    <Compile Include="Persister\Collection\IQueryableCollection.cs" />
-    <Compile Include="Persister\Collection\ISqlLoadableCollection.cs" />
-    <Compile Include="Persister\Collection\NamedQueryCollectionInitializer.cs" />
-    <Compile Include="Persister\Collection\OneToManyPersister.cs" />
-    <Compile Include="Persister\Entity\AbstractEntityPersister.cs" />
-    <Compile Include="Persister\Entity\AbstractPropertyMapping.cs" />
-    <Compile Include="Persister\Entity\BasicEntityPropertyMapping.cs" />
-    <Compile Include="Persister\Entity\IEntityPersister.cs" />
-    <Compile Include="Persister\Entity\IJoinable.cs" />
-    <Compile Include="Persister\Entity\ILoadable.cs" />
-    <Compile Include="Persister\Entity\IOuterJoinLoadable.cs" />
-    <Compile Include="Persister\Entity\IPropertyMapping.cs" />
-    <Compile Include="Persister\Entity\IQueryable.cs" />
-    <Compile Include="Persister\Entity\ISqlLoadable.cs" />
-    <Compile Include="Persister\Entity\IUniqueKeyLoadable.cs" />
-    <Compile Include="Persister\Entity\JoinedSubclassEntityPersister.cs" />
-    <Compile Include="Persister\Entity\NamedQueryLoader.cs" />
-    <Compile Include="Persister\Entity\SingleTableEntityPersister.cs" />
-    <Compile Include="Properties\ChainedPropertyAccessor.cs" />
-    <Compile Include="Properties\IOptimizableGetter.cs" />
-    <Compile Include="Properties\IOptimizableSetter.cs" />
-    <Compile Include="Properties\PascalCaseMStrategy.cs" />
-    <Compile Include="SqlCommand\ISqlStringVisitor.cs" />
-    <Compile Include="SqlCommand\SqlCommandInfo.cs" />
-    <Compile Include="StaleStateException.cs" />
-    <Compile Include="Stat\CategorizedStatistics.cs" />
-    <Compile Include="Stat\CollectionStatistics.cs" />
-    <Compile Include="Stat\EntityStatistics.cs" />
-    <Compile Include="Stat\ISessionStatistics.cs" />
-    <Compile Include="Stat\IStatistics.cs" />
-    <Compile Include="Stat\IStatisticsImplementor.cs" />
-    <Compile Include="Stat\QueryStatistics.cs" />
-    <Compile Include="Stat\SecondLevelCacheStatistics.cs" />
-    <Compile Include="Stat\SessionStatisticsImpl.cs" />
-    <Compile Include="Stat\StatisticsImpl.cs" />
-    <Compile Include="Tool\hbm2ddl\ColumnMetadata.cs" />
-    <Compile Include="Tool\hbm2ddl\DatabaseMetadata.cs" />
-    <Compile Include="Tool\hbm2ddl\ForeignKeyMetadata.cs" />
-    <Compile Include="Tool\hbm2ddl\IConnectionHelper.cs" />
-    <Compile Include="Tool\hbm2ddl\IndexMetadata.cs" />
-    <Compile Include="Tool\hbm2ddl\ISchemaReader.cs" />
-    <Compile Include="Tool\hbm2ddl\ManagedProviderConnectionHelper.cs" />
-    <Compile Include="Tool\hbm2ddl\InformationSchemaReader.cs" />
-    <Compile Include="Tool\hbm2ddl\SchemaUpdate.cs" />
-    <Compile Include="Tool\hbm2ddl\SuppliedConnectionHelper.cs" />
-    <Compile Include="Tool\hbm2ddl\SuppliedConnectionProviderConnectionHelper.cs" />
-    <Compile Include="Tool\hbm2ddl\TableMetadata.cs" />
-    <Compile Include="Transaction\AdoNetTransactionFactory.cs" />
-    <Compile Include="Transaction\ISynchronization.cs" />
-    <Compile Include="Transform\AliasToBeanConstructorResultTransformer.cs" />
-    <Compile Include="Transform\AliasToBeanResultTransformer.cs" />
-    <Compile Include="Transform\PassThroughResultTransformer.cs" />
-    <Compile Include="Transform\Transformers.cs" />
-    <Compile Include="Tuple\Component\AbstractComponentTuplizer.cs" />
-    <Compile Include="Tuple\Component\ComponentEntityModeToTuplizerMapping.cs" />
-    <Compile Include="Tuple\Component\ComponentMetamodel.cs" />
-    <Compile Include="Tuple\Component\DynamicMapComponentTuplizer.cs" />
-    <Compile Include="Tuple\Component\IComponentTuplizer.cs" />
-    <Compile Include="Tuple\Component\PocoComponentTuplizer.cs" />
-    <Compile Include="Tuple\DynamicMapInstantiator.cs" />
-    <Compile Include="Tuple\EntityModeToTuplizerMapping.cs" />
-    <Compile Include="Tuple\Entity\AbstractEntityTuplizer.cs" />
-    <Compile Include="Tuple\Entity\DynamicMapEntityTuplizer.cs" />
-    <Compile Include="Tuple\Entity\EntityEntityModeToTuplizerMapping.cs" />
-    <Compile Include="Tuple\Entity\EntityMetamodel.cs" />
-    <Compile Include="Tuple\Entity\IEntityTuplizer.cs" />
-    <Compile Include="Tuple\Entity\PocoEntityTuplizer.cs" />
-    <Compile Include="Tuple\IdentifierProperty.cs" />
-    <Compile Include="Tuple\IInstantiator.cs" />
-    <Compile Include="Tuple\ITuplizer.cs" />
-    <Compile Include="Tuple\PocoInstantiator.cs" />
-    <Compile Include="Tuple\Property.cs" />
-    <Compile Include="Tuple\PropertyFactory.cs" />
-    <Compile Include="Tuple\StandardProperty.cs" />
-    <Compile Include="Tuple\VersionProperty.cs" />
-    <Compile Include="TypeMismatchException.cs" />
-    <Compile Include="Type\AbstractBynaryType.cs" />
-    <Compile Include="Type\AbstractStringType.cs" />
-    <Compile Include="Type\AnsiCharType.cs" />
-    <Compile Include="Type\AnyType.cs" />
-    <Compile Include="Type\AbstractCharType.cs" />
-    <Compile Include="Type\ClassMetaType.cs" />
-    <Compile Include="Type\CollectionType.cs" />
-    <Compile Include="Type\CustomCollectionType.cs" />
-    <Compile Include="Type\EmbeddedComponentType.cs" />
-    <Compile Include="Type\ICacheAssembler.cs" />
-    <Compile Include="Type\OrderedSetType.cs" />
-    <Compile Include="Type\OrderedMapType.cs" />
-    <Compile Include="Type\GenericSortedDictionaryType.cs" />
-    <Compile Include="Type\GenericIdentifierBagType.cs" />
-    <Compile Include="Type\GenericSortedListType.cs" />
-    <Compile Include="Type\GenericSortedSetType.cs" />
-    <Compile Include="Type\GenericSetType.cs" />
-    <Compile Include="Type\ForeignKeyDirection.cs" />
-    <Compile Include="Type\GenericBagType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Type\GenericListType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Type\GenericMapType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Type\SpecialOneToOneType.cs" />
-    <Compile Include="UserTypes\ICompositeUserType.cs" />
-    <Compile Include="UserTypes\IEnhancedUserType.cs" />
-    <Compile Include="UserTypes\ILoggableUserType.cs" />
-    <Compile Include="UserTypes\IParameterizedType.cs" />
-    <Compile Include="UserTypes\IUserCollectionType.cs" />
-    <Compile Include="UserTypes\IUserType.cs" />
-    <Compile Include="UserTypes\IUserVersionType.cs" />
-    <Compile Include="Util\AssemblyQualifiedTypeName.cs" />
-    <Compile Include="Util\CollectionHelper.cs" />
-    <Compile Include="Util\EqualsHelper.cs" />
-    <Compile Include="Util\FilterHelper.cs" />
-    <Compile Include="Util\IdentitySet.cs" />
-    <Compile Include="Util\LinkedHashMap.cs" />
-    <Compile Include="Util\LRUMap.cs" />
-    <Compile Include="Util\SafetyEnumerable.cs" />
-    <Compile Include="Util\SerializationHelper.cs" />
-    <Compile Include="Util\SimpleMRUCache.cs" />
-    <Compile Include="Util\SingletonEnumerable.cs" />
-    <Compile Include="Util\SoftLimitMRUCache.cs" />
-    <Compile Include="Util\TypeNameParser.cs" />
-    <Compile Include="Util\WeakHashtable.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\XmlHelper.cs" />
-    <EmbeddedResource Include="nhibernate-configuration.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <None Include="nhibernate-configuration.xsx">
-      <DependentUpon>nhibernate-configuration.xsd</DependentUpon>
-    </None>
-    <None Include="nhibernate-generic.xsx">
-      <...
 
[truncated message content]

[Nhibernate-commit] SF.net SVN: nhibernate:[3790] branches/2.0.x/nhibernate/src/NHibernate.Test /NHibernate.Test-2.0.csproj

From: <te...@us...> - 2008-09-27 16:45:22

Revision: 3790
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3790&view=rev
Author:   tehlike
Date:     2008-09-27 16:45:09 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Adding NH1499 tests to 2.0 Test project.

Modified Paths:
--------------
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj

Modified: branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj	2008-09-27 12:43:16 UTC (rev 3789)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj	2008-09-27 16:45:09 UTC (rev 3790)
@@ -373,6 +373,9 @@
     <Compile Include="NHSpecificTest\NH1483\SubClass.cs" />
     <Compile Include="NHSpecificTest\NH1488\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1488\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Document.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Person.cs" />
     <Compile Include="NHSpecificTest\NH280\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Foo.cs" />
     <Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -1337,6 +1340,9 @@
     <EmbeddedResource Include="NHSpecificTest\NH1488\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH1499\Mappings.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3789] trunk/nhibernate/src/NHibernate

From: <fab...@us...> - 2008-09-27 12:43:22

Revision: 3789
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3789&view=rev
Author:   fabiomaulo
Date:     2008-09-27 12:43:16 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Corrections on VS2005

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj

Modified: trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs	2008-09-27 11:56:36 UTC (rev 3788)
+++ trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs	2008-09-27 12:43:16 UTC (rev 3789)
@@ -148,7 +148,7 @@
 			{
 				for (int i = 0; i < results.Count; i++)
 				{
-					var critImp = criteriaQueries[i] as CriteriaImpl;
+					CriteriaImpl critImp = criteriaQueries[i] as CriteriaImpl;
 					if(critImp==null || critImp.ResultTransformer==null)
 						continue;
 					results[i] = critImp.ResultTransformer.TransformList((IList)results[i]);

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj	2008-09-27 11:56:36 UTC (rev 3788)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-2.0.csproj	2008-09-27 12:43:16 UTC (rev 3789)
@@ -475,6 +475,11 @@
     <Compile Include="NHSpecificTest\NH1483\SubClass.cs" />
     <Compile Include="NHSpecificTest\NH1488\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1488\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Document.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Person.cs" />
+    <Compile Include="NHSpecificTest\NH1502\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1502\Person.cs" />
     <Compile Include="NHSpecificTest\NH280\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Foo.cs" />
     <Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -1462,6 +1467,8 @@
     <EmbeddedResource Include="Cascade\JobBatch.hbm.xml" />
     <EmbeddedResource Include="Deletetransient\Person.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <Content Include="NHSpecificTest\NH1499\Mappings.hbm.xml" />
+    <Content Include="NHSpecificTest\NH1502\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1488\Mappings.hbm.xml" />
     <EmbeddedResource Include="Extendshbm\allinone.hbm.xml" />
     <EmbeddedResource Include="Extendshbm\allseparateinone.hbm.xml" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3788] trunk/nhibernate/src/NHibernate/Cfg/ Configuration.cs

From: <te...@us...> - 2008-09-27 11:56:43

Revision: 3788
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3788&view=rev
Author:   tehlike
Date:     2008-09-27 11:56:36 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Adding log message when no HbmXml is found in a mapped assembly (Fix NH1496 by Victor Toni)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs	2008-09-27 11:56:13 UTC (rev 3787)
+++ trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs	2008-09-27 11:56:36 UTC (rev 3788)
@@ -613,7 +613,10 @@
 		public Configuration AddAssembly(Assembly assembly)
 		{
 			IList<string> resourceNames = GetAllHbmXmlResourceNames(assembly);
-
+			if (resourceNames.Count == 0)
+			{
+				log.Warn("No mapped documents found in assembly: " + assembly.FullName);
+			} 
 			foreach (string name in resourceNames)
 			{
 				AddResource(name, assembly);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3787] branches/2.0.x/nhibernate/src/NHibernate/Cfg/ Configuration.cs

From: <te...@us...> - 2008-09-27 11:56:19

Revision: 3787
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3787&view=rev
Author:   tehlike
Date:     2008-09-27 11:56:13 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Adding log message when no HbmXml is found in a mapped assembly (Fix NH1496 by Victor Toni)

Modified Paths:
--------------
    branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs

Modified: branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs	2008-09-27 10:39:13 UTC (rev 3786)
+++ branches/2.0.x/nhibernate/src/NHibernate/Cfg/Configuration.cs	2008-09-27 11:56:13 UTC (rev 3787)
@@ -614,7 +614,10 @@
 		public Configuration AddAssembly(Assembly assembly)
 		{
 			IList<string> resourceNames = GetAllHbmXmlResourceNames(assembly);
-
+			if (resourceNames.Count==0)
+			{
+				log.Warn("No mapped documents found in assembly: " + assembly.FullName);
+			} 
 			foreach (string name in resourceNames)
 			{
 				AddResource(name, assembly);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3786] trunk/nhibernate/src/NHibernate/Cfg/ ConfigurationSchema/SessionFactoryConfiguration.cs

From: <te...@us...> - 2008-09-27 10:39:20

Revision: 3786
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3786&view=rev
Author:   tehlike
Date:     2008-09-27 10:39:13 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Spelling correction (Fix NH1500)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs	2008-09-27 10:36:26 UTC (rev 3785)
+++ trunk/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs	2008-09-27 10:39:13 UTC (rev 3786)
@@ -33,7 +33,7 @@
 			ParseProperties(navigator);
 			ParseMappings(navigator);
 			ParseClassesCache(navigator);
-			ParseColectionsCache(navigator);
+			ParseCollectionsCache(navigator);
 			ParseListeners(navigator);
 			ParseEvents(navigator);
 		}
@@ -113,7 +113,7 @@
 		}
 
 
-		private void ParseColectionsCache(XPathNavigator navigator)
+		private void ParseCollectionsCache(XPathNavigator navigator)
 		{
 			XPathNodeIterator xpni = navigator.Select(CfgXmlHelper.SessionFactoryCollectionsCacheExpression);
 			while (xpni.MoveNext())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3785] branches/2.0.x/nhibernate/src/NHibernate/Cfg/ ConfigurationSchema/SessionFactoryConfiguration.cs

From: <te...@us...> - 2008-09-27 10:36:43

Revision: 3785
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3785&view=rev
Author:   tehlike
Date:     2008-09-27 10:36:26 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Spelling correction (Fix NH1500)

Modified Paths:
--------------
    branches/2.0.x/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs

Modified: branches/2.0.x/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs	2008-09-26 23:25:05 UTC (rev 3784)
+++ branches/2.0.x/nhibernate/src/NHibernate/Cfg/ConfigurationSchema/SessionFactoryConfiguration.cs	2008-09-27 10:36:26 UTC (rev 3785)
@@ -33,7 +33,7 @@
 			ParseProperties(navigator);
 			ParseMappings(navigator);
 			ParseClassesCache(navigator);
-			ParseColectionsCache(navigator);
+			ParseCollectionsCache(navigator);
 			ParseListeners(navigator);
 			ParseEvents(navigator);
 		}
@@ -113,7 +113,7 @@
 		}
 
 
-		private void ParseColectionsCache(XPathNavigator navigator)
+		private void ParseCollectionsCache(XPathNavigator navigator)
 		{
 			XPathNodeIterator xpni = navigator.Select(CfgXmlHelper.SessionFactoryCollectionsCacheExpression);
 			while (xpni.MoveNext())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3784] trunk/nhibernate/src/NHibernate

From: <te...@us...> - 2008-09-26 23:25:23

Revision: 3784
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3784&view=rev
Author:   tehlike
Date:     2008-09-26 23:25:05 +0000 (Fri, 26 Sep 2008)

Log Message:
-----------
Applying patch for NH1502 by Jaroslav Mart?\195?\161sek with a little modification.
Converting "string orderByString" to "SqlString orderByString" in order to keep placeholder

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Criterion/Order.cs
    trunk/nhibernate/src/NHibernate/Loader/AbstractEntityJoinWalker.cs
    trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
    trunk/nhibernate/src/NHibernate/Loader/Entity/CascadeEntityJoinWalker.cs
    trunk/nhibernate/src/NHibernate/Loader/Entity/EntityJoinWalker.cs
    trunk/nhibernate/src/NHibernate/Loader/JoinWalker.cs
    trunk/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs
    trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
    trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Fixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Mappings.hbm.xml
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs

Modified: trunk/nhibernate/src/NHibernate/Criterion/Order.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/Order.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate/Criterion/Order.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -43,7 +43,7 @@
 		/// <summary>
 		/// Render the SQL fragment
 		/// </summary>
-		public virtual string ToSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery)
+		public virtual SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			if(projection!=null)
 			{
@@ -52,7 +52,7 @@
 				SqlString truncated = NHibernate.Util.StringHelper.RemoveAsAliasesFromSql(produced);
 				sb = sb.Append(truncated);
 				sb = sb.Append(ascending ? " asc" : " desc");
-				return sb.ToString();
+				return sb;
 			}
 
 			string[] columns = criteriaQuery.GetColumnAliasesUsingProjection(criteria, propertyName);
@@ -67,13 +67,13 @@
 				if (lower)
 				{
 					fragment.Append(factory.Dialect.LowercaseFunction)
-						.Append('(');
+						.Append("(");
 				}
 				fragment.Append(columns[i]);
 
 				if (lower)
 				{
-					fragment.Append(')');
+					fragment.Append(")");
 				}
 
 				fragment.Append(ascending ? " asc" : " desc");
@@ -84,7 +84,7 @@
 				}
 			}
 
-			return fragment.ToString();
+			return new SqlString(fragment.ToString());
 		}
 
 		public override string ToString()

Modified: trunk/nhibernate/src/NHibernate/Loader/AbstractEntityJoinWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/AbstractEntityJoinWalker.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate/Loader/AbstractEntityJoinWalker.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -28,7 +28,7 @@
 			alias = rootSqlAlias;
 		}
 
-		protected void InitAll(SqlString whereString,string orderByString,LockMode lockMode)
+		protected void InitAll(SqlString whereString, SqlString orderByString, LockMode lockMode)
 		{
 			WalkEntityTree(persister, Alias);
 			IList<OuterJoinableAssociation> allAssociations = new List<OuterJoinableAssociation>(associations);
@@ -41,20 +41,20 @@
 		}
 
 		protected void InitProjection(SqlString projectionString, SqlString whereString,
-			string orderByString, string groupByString, SqlString havingString, LockMode lockMode)
+			SqlString orderByString, string groupByString, SqlString havingString, LockMode lockMode)
 		{
 			WalkEntityTree(persister, Alias);
 			Persisters = new ILoadable[0];
 			InitStatementString(projectionString, whereString, orderByString, groupByString, havingString, lockMode);
 		}
 
-		private void InitStatementString(SqlString condition, string orderBy, LockMode lockMode)
+		private void InitStatementString(SqlString condition, SqlString orderBy, LockMode lockMode)
 		{
 			InitStatementString(null, condition, orderBy, string.Empty, null, lockMode);
 		}
 
 		private void InitStatementString(SqlString projection,SqlString condition,
-			string orderBy,string groupBy, SqlString having, LockMode lockMode)
+			SqlString orderBy,string groupBy, SqlString having, LockMode lockMode)
 		{
 			int joins = CountEntityPersisters(associations);
 			Suffixes = BasicLoader.GenerateSuffixes(joins + 1);

Modified: trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -189,21 +189,21 @@
 			return condition.ToSqlString();
 		}
 
-		public string GetOrderBy()
+		public SqlString GetOrderBy()
 		{
-			StringBuilder orderBy = new StringBuilder(30);
+			SqlStringBuilder orderBy = new SqlStringBuilder(30);
 
 			bool first = true;
 			foreach (CriteriaImpl.OrderEntry oe in rootCriteria.IterateOrderings())
 			{
 				if (!first)
 				{
-					orderBy.Append(StringHelper.CommaSpace);
+					orderBy.Add(StringHelper.CommaSpace);
 				}
 				first = false;
-				orderBy.Append(oe.Order.ToSqlString(oe.Criteria, this));
+				orderBy.Add(oe.Order.ToSqlString(oe.Criteria, this));
 			}
-			return orderBy.ToString();
+			return orderBy.ToSqlString();
 		}
 
 		public ISessionFactoryImplementor Factory
@@ -718,4 +718,4 @@
 
 		#endregion
 	}
-}
\ No newline at end of file
+}

Modified: trunk/nhibernate/src/NHibernate/Loader/Entity/CascadeEntityJoinWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Entity/CascadeEntityJoinWalker.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate/Loader/Entity/CascadeEntityJoinWalker.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -19,7 +19,7 @@
 				//include the discriminator and class-level where, but not filters
 				.Add(persister.FilterFragment(Alias, new CollectionHelper.EmptyMapClass<string, IFilter>()));
 
-			InitAll(whereCondition.ToSqlString(), string.Empty, LockMode.Read);
+			InitAll(whereCondition.ToSqlString(), SqlString.Empty, LockMode.Read);
 		}
 
 		protected override bool IsJoinedFetchEnabled(IAssociationType type, FetchMode config, CascadeStyle cascadeStyle)
@@ -38,4 +38,4 @@
 			get { return "load " + Persister.EntityName; }
 		}
 	}
-}
\ No newline at end of file
+}

Modified: trunk/nhibernate/src/NHibernate/Loader/Entity/EntityJoinWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Entity/EntityJoinWalker.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate/Loader/Entity/EntityJoinWalker.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -25,7 +25,7 @@
 				//include the discriminator and class-level where, but not filters
 				.Add(persister.FilterFragment(Alias, new CollectionHelper.EmptyMapClass<string, IFilter>()));
 
-			InitAll(whereCondition.ToSqlString(), string.Empty, lockMode);
+			InitAll(whereCondition.ToSqlString(), SqlString.Empty, lockMode);
 		}
 
 		/// <summary>
@@ -42,4 +42,4 @@
 			get { return "load " + Persister.EntityName; }
 		}
 	}
-}
\ No newline at end of file
+}

Modified: trunk/nhibernate/src/NHibernate/Loader/JoinWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/JoinWalker.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate/Loader/JoinWalker.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -525,21 +525,34 @@
 			return !tooDeep && !IsDuplicateAssociation(lhsTable, lhsColumnNames, type);
 		}
 
-		protected string OrderBy(IList<OuterJoinableAssociation> associations, string orderBy)
+		protected SqlString OrderBy(IList<OuterJoinableAssociation> associations, SqlString orderBy)
 		{
 			return MergeOrderings(OrderBy(associations), orderBy);
 		}
 
-		protected string MergeOrderings(string ass, string orderBy)
+		protected SqlString OrderBy(IList<OuterJoinableAssociation> associations, string orderBy)
 		{
+			return MergeOrderings(OrderBy(associations), new SqlString(orderBy));
+		}
+
+		protected SqlString MergeOrderings(SqlString ass, SqlString orderBy)
+		{
 			if (ass.Length == 0)
 				return orderBy;
 			else if (orderBy.Length == 0)
 				return ass;
 			else
-				return ass + StringHelper.CommaSpace + orderBy;
+				return ass.Append(StringHelper.CommaSpace).Append(orderBy);
 		}
 
+		protected SqlString MergeOrderings(string ass, SqlString orderBy) {
+			return this.MergeOrderings(new SqlString(ass), orderBy);
+		}
+
+		protected SqlString MergeOrderings(string ass, string orderBy) {
+			return this.MergeOrderings(new SqlString(ass), new SqlString(orderBy));
+		}
+
 		/// <summary>
 		/// Generate a sequence of <c>LEFT OUTER JOIN</c> clauses for the given associations.
 		/// </summary>
@@ -597,9 +610,9 @@
 		/// <summary>
 		/// Get the order by string required for collection fetching
 		/// </summary>
-		protected static string OrderBy(IList<OuterJoinableAssociation> associations)
+		protected SqlString OrderBy(IList<OuterJoinableAssociation> associations)
 		{
-			StringBuilder buf = new StringBuilder();
+			SqlStringBuilder buf = new SqlStringBuilder();
 
 			OuterJoinableAssociation last = null;
 			foreach (OuterJoinableAssociation oj in associations)
@@ -612,7 +625,7 @@
 						if (queryableCollection.HasOrdering)
 						{
 							string orderByString = queryableCollection.GetSQLOrderByString(oj.RHSAlias);
-							buf.Append(orderByString).Append(StringHelper.CommaSpace);
+							buf.Add(orderByString).Add(StringHelper.CommaSpace);
 						}
 					}
 					else
@@ -627,7 +640,7 @@
 								if (queryableCollection.HasManyToManyOrdering)
 								{
 									string orderByString = queryableCollection.GetManyToManyOrderByString(oj.RHSAlias);
-									buf.Append(orderByString).Append(StringHelper.CommaSpace);
+									buf.Add(orderByString).Add(StringHelper.CommaSpace);
 								}
 							}
 						}
@@ -636,10 +649,11 @@
 				last = oj;
 			}
 
-			if (buf.Length > 0)
-				buf.Length = buf.Length - 2;
+			if (buf.Count > 0) {
+				buf.RemoveAt(buf.Count-1);
+			}
 
-			return buf.ToString();
+			return buf.ToSqlString();
 		}
 
 		/// <summary>

Modified: trunk/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -17,7 +17,7 @@
 		private SqlString outerJoinsAfterFrom;
 		private SqlString whereClause;
 		private SqlString outerJoinsAfterWhere;
-		private string orderByClause;
+		private SqlString orderByClause;
 		private string groupByClause;
 		private SqlString havingClause;
 		private LockMode lockMode;
@@ -72,7 +72,7 @@
 		/// </summary>
 		/// <param name="orderByClause">The orderByClause to set</param>
 		/// <returns>The SqlSelectBuilder</returns>
-		public SqlSelectBuilder SetOrderByClause(string orderByClause)
+		public SqlSelectBuilder SetOrderByClause(SqlString orderByClause)
 		{
 			this.orderByClause = orderByClause;
 			return this;

Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/CriteriaQueryTest.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -1675,5 +1675,22 @@
 			t.Rollback();
 			s.Close();
 		}
+
+		[Test]
+		public void OrderProjectionTest() {
+			using (ISession session = this.OpenSession()) {
+				ICriteria criteria = session.CreateCriteria(typeof (Student), "c");
+
+				criteria
+					.AddOrder(Order.Asc(
+											Projections.Conditional(
+												Restrictions.Eq("StudentNumber", (long)1),
+												Projections.Constant(0),
+												Projections.Constant(1)
+												)));
+
+				criteria.List();
+			}
+		}
 	}
 }

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Fixture.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -0,0 +1,63 @@
+using System.Collections;
+using System.Collections.Generic;
+using NHibernate.Criterion;
+using NHibernate.Dialect.Function;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1502
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+			using (ISession session = OpenSession())
+			{
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					session.Delete("from Person");
+					tx.Commit();
+				}
+			}
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession s = OpenSession())
+			{
+				using (ITransaction tx = s.BeginTransaction())
+				{
+					Person e1 = new Person("Joe", 10, 9);
+					Person e2 = new Person("Sally", 100, 8);
+					Person e3 = new Person("Tim", 20, 7); //20
+					Person e4 = new Person("Fred", 40, 40);
+					Person e5 = new Person("Mike", 50, 50);
+					s.Save(e1);
+					s.Save(e2);
+					s.Save(e3);
+					s.Save(e4);
+					s.Save(e5);
+					tx.Commit();
+				}
+			}
+		}
+
+		[Test]
+		public void OrderProjectionTest() 
+		{
+			ISQLFunction arithmaticMultiplication = new VarArgsSQLFunction("(", "*", ")");
+			using (ISession session = this.OpenSession()) {
+				ICriteria criteria = session.CreateCriteria(typeof (Person), "c");
+
+				criteria.AddOrder(Order.Asc(
+				                  	Projections.SqlFunction(arithmaticMultiplication, NHibernateUtil.GuessType(typeof (int)),
+				                  	                        Projections.Property("IQ"), Projections.Constant(-1))));
+				IList<Person> results=criteria.List<Person>();
+				Assert.AreEqual(5, results.Count);
+				Assert.AreEqual("Sally", results[0].Name);
+				Assert.AreEqual("Joe", results[4].Name);
+			}
+		}
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Mappings.hbm.xml	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Mappings.hbm.xml	2008-09-26 23:25:05 UTC (rev 3784)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+	assembly="NHibernate.Test"
+	namespace="NHibernate.Test.NHSpecificTest.NH1502">
+
+	<class name="Person" lazy="false">
+		<id name="Id">
+			<generator class="native" />
+		</id>
+		<property name="Name"/>
+		<property name="IQ"/>
+		<property name="ShoeSize"/>
+	</class>
+</hibernate-mapping>

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1502/Person.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -0,0 +1,51 @@
+using System.Collections;
+
+namespace NHibernate.Test.NHSpecificTest.NH1502
+{
+	public class Person
+	{
+		private int id;
+		private int iq;
+		private string name;
+		private IList pets;
+		private int shoeSize;
+
+		public Person()
+		{
+			pets = new ArrayList();
+		}
+
+		public Person(string name, int iq, int shoeSize)
+		{
+			this.name = name;
+			this.iq = iq;
+			this.shoeSize = shoeSize;
+			pets = new ArrayList();
+		}
+
+		public virtual int Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+
+		public virtual string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+
+		public virtual int IQ
+		{
+			get { return iq; }
+			set { iq = value; }
+		}
+
+		public virtual int ShoeSize
+		{
+			get { return shoeSize; }
+			set { shoeSize = value; }
+		}
+
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 23:25:05 UTC (rev 3784)
@@ -494,6 +494,8 @@
     <Compile Include="NHSpecificTest\NH1499\Document.cs" />
     <Compile Include="NHSpecificTest\NH1499\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1499\Person.cs" />
+    <Compile Include="NHSpecificTest\NH1502\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1502\Person.cs" />
     <Compile Include="NHSpecificTest\NH280\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Foo.cs" />
     <Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -1470,6 +1472,9 @@
     <EmbeddedResource Include="NHSpecificTest\NH1499\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH1502\Mappings.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="Properties\" />
     <Folder Include="Unionsubclass2\" />
   </ItemGroup>

Modified: trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs	2008-09-26 20:18:17 UTC (rev 3783)
+++ trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlSelectBuilderFixture.cs	2008-09-26 23:25:05 UTC (rev 3784)
@@ -27,7 +27,7 @@
 			select.SetOuterJoins(
 				new SqlString(" LEFT OUTER JOIN before ON select_test_alias.column1 = before.column1"),
 				new SqlString(" after.some_field = after.another_field "));
-			select.SetOrderByClause("column1 DESC");
+			select.SetOrderByClause(new SqlString("column1 DESC"));
 
 			select.SetWhereClause("select_test_alias", new string[] {"identity_column"}, NHibernateUtil.Int64);
 
@@ -49,4 +49,4 @@
 			Assert.AreEqual(1, sqlString.GetParameterCount(), "One parameter");
 		}
 	}
-}
\ No newline at end of file
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3783] branches/2.0.x/nhibernate/src/NHibernate

From: <te...@us...> - 2008-09-26 20:18:27

Revision: 3783
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3783&view=rev
Author:   tehlike
Date:     2008-09-26 20:18:17 +0000 (Fri, 26 Sep 2008)

Log Message:
-----------
-Synchronizing with 2.0 project
-Fix for NH1499 by adding meaningful exception message

Modified Paths:
--------------
    branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
    branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj

Added Paths:
-----------
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml
    branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs

Modified: branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs	2008-09-26 20:07:14 UTC (rev 3782)
+++ branches/2.0.x/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs	2008-09-26 20:18:17 UTC (rev 3783)
@@ -107,9 +107,16 @@
                                                      this.criteriaImpl.EntityOrClassName,
                                                      criteriaQuery.GenerateSQLAlias(),
                                                      criteriaQuery);
-			
-            parameters = innerQuery.GetQueryParameters();
-            types = innerQuery.ProjectedTypes;
+
+			if (innerQuery.HasProjection)
+			{
+				parameters = innerQuery.GetQueryParameters();
+				types = innerQuery.ProjectedTypes;
+			}
+			else
+			{
+				types = null;
+			}
         }
     }
 }

Modified: branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj	2008-09-26 20:07:14 UTC (rev 3782)
+++ branches/2.0.x/nhibernate/src/NHibernate/NHibernate-3.5.csproj	2008-09-26 20:18:17 UTC (rev 3783)
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -1027,6 +1027,7 @@
     <Compile Include="Type\AnsiCharType.cs" />
     <Compile Include="Type\AnyType.cs" />
     <Compile Include="Type\AbstractCharType.cs" />
+    <Compile Include="Type\ClassMetaType.cs" />
     <Compile Include="Type\CollectionType.cs" />
     <Compile Include="Type\CustomCollectionType.cs" />
     <Compile Include="Type\EmbeddedComponentType.cs" />

Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs	                        (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs	2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,27 @@
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+	public class Document
+	{
+		private int id;
+		private Person person;
+		private string title;
+
+		public virtual int Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+		
+		public virtual string Title
+		{
+			get { return title; }
+			set { title = value; }
+		}
+
+		public virtual Person Person
+		{
+			get { return person; }
+			set { person = value; }
+		}
+	}
+}

Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs	                        (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs	2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+
+using NHibernate.Criterion;
+
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			Person john = new Person();
+			john.Name = "John";
+
+			Document doc1 = new Document();
+			doc1.Person = john;
+			doc1.Title = "John's Doc";
+			Document doc2 = new Document();
+			doc2.Title = "Spec";
+
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				session.Save(john);
+				session.Save(doc1);
+				session.Save(doc2);
+
+				tx.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				session.Delete("from Person");
+				session.Delete("from Document");
+				tx.Commit();
+			}
+		}
+		[Test]
+		[ExpectedException(typeof(QueryException))]
+		public void CheckIfDetachedCriteriaCanBeUsedOnPropertyRestriction()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				DetachedCriteria detached = DetachedCriteria.For(typeof(Person))
+				.Add(Property.ForName("Name").Eq("John"));
+				ICriteria criteria = session.CreateCriteria(typeof(Document))
+					.Add(Restrictions.Or(
+							Property.ForName("Title").Eq("Spec"),
+							Property.ForName("Person").Eq(detached)
+							));
+				IList<Document> results = criteria.List<Document>();
+			}
+		}
+
+
+	}
+}

Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml	                        (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml	2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH1499">
+	<class name="Document">
+		<id name="Id">
+			<generator class="native"/>
+		</id>
+		<many-to-one name="Person"  column="PersonID"/>
+		<property name="Title"/>
+	</class>
+
+	<class name="Person">
+		<id name="Id">
+			<generator class="native" />
+		</id>
+		<property name="Name"/>
+	</class>
+</hibernate-mapping>

Added: branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs	                        (rev 0)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs	2008-09-26 20:18:17 UTC (rev 3783)
@@ -0,0 +1,20 @@
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+	public class Person
+	{
+		private int id;
+		private string name;
+
+		public virtual int Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+
+		public virtual string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+	}
+}

Modified: branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
===================================================================
--- branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 20:07:14 UTC (rev 3782)
+++ branches/2.0.x/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 20:18:17 UTC (rev 3783)
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7AEE5B37-C552-4E59-9B6F-88755BCB5070}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -163,6 +163,10 @@
     <Compile Include="FilterTest\Product.cs" />
     <Compile Include="FilterTest\Salesperson.cs" />
     <Compile Include="FilterTest\TestClass.cs" />
+    <Compile Include="Generatedkeys\Identity\IdentityGeneratedKeysTest.cs" />
+    <Compile Include="Generatedkeys\Identity\MyChild.cs" />
+    <Compile Include="Generatedkeys\Identity\MyEntity.cs" />
+    <Compile Include="Generatedkeys\Identity\MySibling.cs" />
     <Compile Include="GeneratedTest\AbstractGeneratedPropertyTest.cs" />
     <Compile Include="GeneratedTest\Component.cs" />
     <Compile Include="GeneratedTest\ComponentOwner.cs" />
@@ -269,12 +273,20 @@
     <Compile Include="NHSpecificTest\BasicTimeFixture.cs" />
     <Compile Include="NHSpecificTest\BugTestCase.cs" />
     <Compile Include="NHSpecificTest\CollectionFixture.cs" />
+    <Compile Include="NHSpecificTest\NH1077\A.cs" />
+    <Compile Include="NHSpecificTest\NH1077\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1101\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH1101\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1144\Classes.cs" />
     <Compile Include="NHSpecificTest\NH1144\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1290\AuxType.cs" />
     <Compile Include="NHSpecificTest\NH1290\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1300\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH1300\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1301\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1301\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1304\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1304\Funny.cs" />
     <Compile Include="NHSpecificTest\NH1313\A.cs" />
     <Compile Include="NHSpecificTest\NH1313\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1324\Fixture.cs" />
@@ -329,8 +341,43 @@
     <Compile Include="NHSpecificTest\NH1230\FooIdentity.cs" />
     <Compile Include="NHSpecificTest\NH1230\PreSaveDoVeto.cs" />
     <Compile Include="NHSpecificTest\NH1326\Person.cs" />
+    <Compile Include="NHSpecificTest\NH1332\A.cs" />
+    <Compile Include="NHSpecificTest\NH1332\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1347\A.cs" />
     <Compile Include="NHSpecificTest\NH1347\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1355\Category.cs" />
+    <Compile Include="NHSpecificTest\NH1355\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1355\UserTypeTimestamp.cs" />
+    <Compile Include="NHSpecificTest\NH1362\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1362\Model.cs" />
+    <Compile Include="NHSpecificTest\NH1383\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH1383\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1399\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Female.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Hobby.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Male.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Person.cs" />
+    <Compile Include="NHSpecificTest\NH1405\Column.cs" />
+    <Compile Include="NHSpecificTest\NH1405\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1408\DbResource.cs" />
+    <Compile Include="NHSpecificTest\NH1408\DbResourceKey.cs" />
+    <Compile Include="NHSpecificTest\NH1408\DetachedSubCriteriaTest.cs" />
+    <Compile Include="NHSpecificTest\NH1408\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH1413\Foo.cs" />
+    <Compile Include="NHSpecificTest\NH1413\PagingTest.cs" />
+    <Compile Include="NHSpecificTest\NH1419\Blog.cs" />
+    <Compile Include="NHSpecificTest\NH1419\Entry.cs" />
+    <Compile Include="NHSpecificTest\NH1419\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1464\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1483\BaseClass.cs" />
+    <Compile Include="NHSpecificTest\NH1483\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1483\SubClass.cs" />
+    <Compile Include="NHSpecificTest\NH1488\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH1488\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Document.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Person.cs" />
     <Compile Include="NHSpecificTest\NH280\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Foo.cs" />
     <Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -341,6 +388,8 @@
     <Compile Include="NHSpecificTest\NH1080\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1080\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH364\Invoice.cs" />
+    <Compile Include="NHSpecificTest\NH693\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH693\Something.cs" />
     <Compile Include="NHSpecificTest\NH883\Cat.cs" />
     <Compile Include="NHSpecificTest\NH883\Fixture.cs" />
     <Compile Include="NHSpecificTest\Docs\Associations\BiM21\Address.cs" />
@@ -557,6 +606,16 @@
     <Compile Include="NHSpecificTest\UserTypeFixture.cs" />
     <Compile Include="NHSpecificTest\VersionTest.cs" />
     <Compile Include="ObjectAssertion.cs" />
+    <Compile Include="Ondelete\Address.cs" />
+    <Compile Include="Ondelete\Child.cs" />
+    <Compile Include="Ondelete\EFG.cs" />
+    <Compile Include="Ondelete\Employee.cs" />
+    <Compile Include="Ondelete\JoinedSubclassFixture.cs" />
+    <Compile Include="Ondelete\OnDeleteFixture.cs" />
+    <Compile Include="Ondelete\Parent.cs" />
+    <Compile Include="Ondelete\ParentChildFixture.cs" />
+    <Compile Include="Ondelete\Person.cs" />
+    <Compile Include="Ondelete\Salesperson.cs" />
     <Compile Include="PropertyRef\A.cs" />
     <Compile Include="PropertyRef\B.cs" />
     <Compile Include="PropertyRef\KeyPropertyRefFixture.cs" />
@@ -1174,10 +1233,34 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="NHSpecificTest\NH1324\Mappings.hbm.xml" />
-    <Content Include="NHSpecificTest\NH1098\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1077\Mappings.hbm.xml" />
+    <EmbeddedResource Include="Generatedkeys\Identity\MyEntity.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1098\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1101\Mappings.hbm.xml" />
     <Content Include="NHSpecificTest\NH1250\Mappings.hbm.xml" />
     <Content Include="NHSpecificTest\NH1252\Mappings.hbm.xml" />
     <Content Include="NHSpecificTest\NH1275\Mappings.hbm.xml" />
+    <EmbeddedResource Include="Ondelete\EFGJoinedSubclass.hbm.xml" />
+    <EmbeddedResource Include="Ondelete\ParentChild.hbm.xml" />
+    <EmbeddedResource Include="Ondelete\Person.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH693\EmptyTableName.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH693\SpaceTableName.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1300\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1301\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1304\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1313\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1332\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1355\Category.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1362\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1383\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1403\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1405\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1408\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1413\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1419\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1483\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1488\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1499\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1326\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3782] trunk/nhibernate/src/NHibernate.Test/ NHSpecificTest/NH1499

From: <te...@us...> - 2008-09-26 20:07:22

Revision: 3782
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3782&view=rev
Author:   tehlike
Date:     2008-09-26 20:07:14 +0000 (Fri, 26 Sep 2008)

Log Message:
-----------
Adding missing tests for  NH1499

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Document.cs	2008-09-26 20:07:14 UTC (rev 3782)
@@ -0,0 +1,27 @@
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+	public class Document
+	{
+		private int id;
+		private Person person;
+		private string title;
+
+		public virtual int Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+		
+		public virtual string Title
+		{
+			get { return title; }
+			set { title = value; }
+		}
+
+		public virtual Person Person
+		{
+			get { return person; }
+			set { person = value; }
+		}
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Fixture.cs	2008-09-26 20:07:14 UTC (rev 3782)
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+
+using NHibernate.Criterion;
+
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			Person john = new Person();
+			john.Name = "John";
+
+			Document doc1 = new Document();
+			doc1.Person = john;
+			doc1.Title = "John's Doc";
+			Document doc2 = new Document();
+			doc2.Title = "Spec";
+
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				session.Save(john);
+				session.Save(doc1);
+				session.Save(doc2);
+
+				tx.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				session.Delete("from Person");
+				session.Delete("from Document");
+				tx.Commit();
+			}
+		}
+		[Test]
+		[ExpectedException(typeof(QueryException))]
+		public void CheckIfDetachedCriteriaCanBeUsedOnPropertyRestriction()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				DetachedCriteria detached = DetachedCriteria.For(typeof(Person))
+				.Add(Property.ForName("Name").Eq("John"));
+				ICriteria criteria = session.CreateCriteria(typeof(Document))
+					.Add(Restrictions.Or(
+							Property.ForName("Title").Eq("Spec"),
+							Property.ForName("Person").Eq(detached)
+							));
+				IList<Document> results = criteria.List<Document>();
+			}
+		}
+
+
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Mappings.hbm.xml	2008-09-26 20:07:14 UTC (rev 3782)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH1499">
+	<class name="Document">
+		<id name="Id">
+			<generator class="native"/>
+		</id>
+		<many-to-one name="Person"  column="PersonID"/>
+		<property name="Title"/>
+	</class>
+
+	<class name="Person">
+		<id name="Id">
+			<generator class="native" />
+		</id>
+		<property name="Name"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/Person.cs	2008-09-26 20:07:14 UTC (rev 3782)
@@ -0,0 +1,20 @@
+namespace NHibernate.Test.NHSpecificTest.NH1499
+{
+	public class Person
+	{
+		private int id;
+		private string name;
+
+		public virtual int Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+
+		public virtual string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+	}
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3781] trunk/nhibernate/src/NHibernate

From: <te...@us...> - 2008-09-26 19:23:24

Revision: 3781
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3781&view=rev
Author:   tehlike
Date:     2008-09-26 19:23:17 +0000 (Fri, 26 Sep 2008)

Log Message:
-----------
Fix for NH1499 by adding meaningful exception: Cannot use subqueries on a criteria without a projection.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/

Modified: trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs	2008-09-26 18:24:00 UTC (rev 3780)
+++ trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs	2008-09-26 19:23:17 UTC (rev 3781)
@@ -104,9 +104,15 @@
 			innerQuery =
 				new CriteriaQueryTranslator(factory, criteriaImpl, //implicit polymorphism not supported (would need a union) 
 				                            criteriaImpl.EntityOrClassName, criteriaQuery.GenerateSQLAlias(), criteriaQuery);
-
-			parameters = innerQuery.GetQueryParameters();
-			types = innerQuery.ProjectedTypes;
+			if (innerQuery.HasProjection)
+			{
+				parameters = innerQuery.GetQueryParameters();
+				types = innerQuery.ProjectedTypes;
+			}
+			else
+			{
+				types = null;
+			}
 		}
 
 		public ICriteria Criteria

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 18:24:00 UTC (rev 3780)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 19:23:17 UTC (rev 3781)
@@ -491,6 +491,9 @@
     <Compile Include="NHSpecificTest\NH1483\SubClass.cs" />
     <Compile Include="NHSpecificTest\NH1488\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1488\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Document.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Person.cs" />
     <Compile Include="NHSpecificTest\NH280\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Foo.cs" />
     <Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -1464,6 +1467,9 @@
     <EmbeddedResource Include="NHSpecificTest\NH1403\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH1499\Mappings.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="Properties\" />
     <Folder Include="Unionsubclass2\" />
   </ItemGroup>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3780] trunk/nhibernate/src/NHibernate.Test/ NHibernate.Test-3.5.csproj

From: <te...@us...> - 2008-09-26 18:24:08

Revision: 3780
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3780&view=rev
Author:   tehlike
Date:     2008-09-26 18:24:00 +0000 (Fri, 26 Sep 2008)

Log Message:
-----------
Synchronizing with 2.0 project.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-25 09:50:03 UTC (rev 3779)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 18:24:00 UTC (rev 3780)
@@ -201,6 +201,10 @@
     <Compile Include="ExpressionTest\SQLExpressionFixture.cs" />
     <Compile Include="ExpressionTest\SubQueries\Classes.cs" />
     <Compile Include="ExpressionTest\SubQueries\SubQueriesSqlFixture.cs" />
+    <Compile Include="Extendshbm\Customer.cs" />
+    <Compile Include="Extendshbm\Employee.cs" />
+    <Compile Include="Extendshbm\ExtendsFixture.cs" />
+    <Compile Include="Extendshbm\Person.cs" />
     <Compile Include="Extralazy\Document.cs" />
     <Compile Include="Extralazy\ExtraLazyFixture.cs" />
     <Compile Include="Extralazy\Group.cs" />
@@ -373,6 +377,8 @@
     </Compile>
     <Compile Include="NHSpecificTest\NH1301\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1301\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1304\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1304\Funny.cs" />
     <Compile Include="NHSpecificTest\NH1313\A.cs" />
     <Compile Include="NHSpecificTest\NH1313\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1324\Fixture.cs" />
@@ -458,6 +464,33 @@
     <Compile Include="NHSpecificTest\NH1362\Model.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="NHSpecificTest\NH1393\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1393\Person.cs" />
+    <Compile Include="NHSpecificTest\NH1394\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1394\Person.cs" />
+    <Compile Include="NHSpecificTest\NH1399\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Female.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Hobby.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Male.cs" />
+    <Compile Include="NHSpecificTest\NH1403\Person.cs" />
+    <Compile Include="NHSpecificTest\NH1405\Column.cs" />
+    <Compile Include="NHSpecificTest\NH1405\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1408\DbResource.cs" />
+    <Compile Include="NHSpecificTest\NH1408\DbResourceKey.cs" />
+    <Compile Include="NHSpecificTest\NH1408\DetachedSubCriteriaTest.cs" />
+    <Compile Include="NHSpecificTest\NH1408\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH1413\Foo.cs" />
+    <Compile Include="NHSpecificTest\NH1413\PagingTest.cs" />
+    <Compile Include="NHSpecificTest\NH1419\Blog.cs" />
+    <Compile Include="NHSpecificTest\NH1419\Entry.cs" />
+    <Compile Include="NHSpecificTest\NH1419\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1464\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1483\BaseClass.cs" />
+    <Compile Include="NHSpecificTest\NH1483\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1483\SubClass.cs" />
+    <Compile Include="NHSpecificTest\NH1488\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH1488\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Foo.cs" />
     <Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -941,9 +974,9 @@
       <Project>{5C649B55-1B3F-4C38-9998-1B043E94A244}</Project>
       <Name>NHibernate.DomainModel-2.0</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NHibernate\NHibernate-2.0.csproj">
+    <ProjectReference Include="..\NHibernate\NHibernate-3.5.csproj">
       <Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project>
-      <Name>NHibernate-2.0</Name>
+      <Name>NHibernate-3.5</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -1407,6 +1440,30 @@
     <EmbeddedResource Include="TypeParameters\Typedef.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH1304\Mappings.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH1393\Mappings.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Extendshbm\allinone.hbm.xml" />
+    <EmbeddedResource Include="Extendshbm\allseparateinone.hbm.xml" />
+    <EmbeddedResource Include="Extendshbm\Customer.hbm.xml" />
+    <EmbeddedResource Include="Extendshbm\Employee.hbm.xml" />
+    <EmbeddedResource Include="Extendshbm\entitynames.hbm.xml" />
+    <EmbeddedResource Include="Extendshbm\packageentitynames.hbm.xml" />
+    <EmbeddedResource Include="Extendshbm\Person.hbm.xml" />
+    <EmbeddedResource Include="Extendshbm\unionsubclass.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1394\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1488\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1483\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1419\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1413\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1408\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1405\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH1403\Mappings.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="Properties\" />
     <Folder Include="Unionsubclass2\" />
   </ItemGroup>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3779] trunk/nhibernate/src/NHibernate

From: <aye...@us...> - 2008-09-25 09:51:42

Revision: 3779
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3779&view=rev
Author:   ayenderahien
Date:     2008-09-25 09:50:03 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
Better handling resultTransformers on multi criteria and multi queries

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs
    trunk/nhibernate/src/NHibernate/Impl/MultiQueryImpl.cs
    trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs	2008-09-20 22:06:36 UTC (rev 3778)
+++ trunk/nhibernate/src/NHibernate/Impl/MultiCriteriaImpl.cs	2008-09-25 09:50:03 UTC (rev 3779)
@@ -18,8 +18,8 @@
 {
 	public class MultiCriteriaImpl : IMultiCriteria
 	{
-		private static readonly ILog log = LogManager.GetLogger(typeof (MultiCriteriaImpl));
-		private readonly IList criteriaQueries = new ArrayList();
+		private static readonly ILog log = LogManager.GetLogger(typeof(MultiCriteriaImpl));
+		private readonly IList<ICriteria> criteriaQueries = new List<ICriteria>();
 
 		private readonly SessionImpl session;
 		private readonly ISessionFactoryImplementor factory;
@@ -30,7 +30,7 @@
 		private readonly List<CriteriaLoader> loaders = new List<CriteriaLoader>();
 		private readonly Dialect.Dialect dialect;
 		private IList criteriaResults;
-		private Dictionary<string, int> criteriaResultPositions = new Dictionary<string, int>();
+		private readonly Dictionary<string, int> criteriaResultPositions = new Dictionary<string, int>();
 		private bool isCacheable = false;
 		private bool forceCacheRefresh = false;
 		private string cacheRegion;
@@ -114,10 +114,10 @@
 
 			IList result =
 				assembler.GetResultFromQueryCache(session,
-				                                  combinedParameters,
-				                                  querySpaces,
-				                                  queryCache,
-				                                  key);
+												  combinedParameters,
+												  querySpaces,
+												  queryCache,
+												  key);
 
 			if (result == null)
 			{
@@ -139,11 +139,21 @@
 		{
 			if (resultTransformer != null)
 			{
-				for (int i = 0, len = results.Count; i < len; ++i)
+				for (int i = 0; i < results.Count; i++)
 				{
 					results[i] = resultTransformer.TransformList((IList)results[i]);
 				}
 			}
+			else
+			{
+				for (int i = 0; i < results.Count; i++)
+				{
+					var critImp = criteriaQueries[i] as CriteriaImpl;
+					if(critImp==null || critImp.ResultTransformer==null)
+						continue;
+					results[i] = critImp.ResultTransformer.TransformList((IList)results[i]);
+				}
+			}
 			return results;
 		}
 
@@ -200,11 +210,11 @@
 							Loader.Loader.Advance(reader, selection);
 						}
 						int count;
-            for (count = 0; count < maxRows && reader.Read(); count++)
+						for (count = 0; count < maxRows && reader.Read(); count++)
 						{
 							object o =
 								loader.GetRowFromResultSet(reader, session, queryParameters, loader.GetLockModes(queryParameters.LockModes),
-								                           null, hydratedObjects[i], keys, false);
+														   null, hydratedObjects[i], keys, false);
 							if (createSubselects[i])
 							{
 								subselectResultKeys[i].Add(keys);
@@ -307,7 +317,7 @@
 		{
 			for (int i = 0; i < loaders.Count; i++)
 			{
-				QueryParameters parameter =  parameters[i];
+				QueryParameters parameter = parameters[i];
 				RowSelection selection = parameter.RowSelection;
 				if (Loader.Loader.UseLimit(selection, dialect) && dialect.BindLimitParametersFirst)
 				{
@@ -326,7 +336,8 @@
 		public IMultiCriteria Add(string key, ICriteria criteria)
 		{
 			ThrowIfKeyAlreadyExists(key);
-			criteriaResultPositions.Add(key, criteriaQueries.Add(criteria));
+			criteriaQueries.Add(criteria);
+			criteriaResultPositions.Add(key, criteriaQueries.Count - 1);
 			return this;
 		}
 
@@ -341,7 +352,8 @@
 		public IMultiCriteria Add(string key, DetachedCriteria detachedCriteria)
 		{
 			ThrowIfKeyAlreadyExists(key);
-			criteriaResultPositions.Add(key, criteriaQueries.Add(detachedCriteria.GetExecutableCriteria(session)));
+			criteriaQueries.Add(detachedCriteria.GetExecutableCriteria(session));
+			criteriaResultPositions.Add(key, criteriaQueries.Count-1);
 			return this;
 		}
 
@@ -399,8 +411,8 @@
 				positionalParameterTypes.AddRange(queryParameters.PositionalParameterTypes);
 				positionalParameterValues.AddRange(queryParameters.PositionalParameterValues);
 			}
-			combinedQueryParameters.PositionalParameterTypes = (IType[]) positionalParameterTypes.ToArray(typeof (IType));
-			combinedQueryParameters.PositionalParameterValues = (object[]) positionalParameterValues.ToArray(typeof (object));
+			combinedQueryParameters.PositionalParameterTypes = (IType[])positionalParameterTypes.ToArray(typeof(IType));
+			combinedQueryParameters.PositionalParameterValues = (object[])positionalParameterValues.ToArray(typeof(object));
 			return combinedQueryParameters;
 		}
 

Modified: trunk/nhibernate/src/NHibernate/Impl/MultiQueryImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/MultiQueryImpl.cs	2008-09-20 22:06:36 UTC (rev 3778)
+++ trunk/nhibernate/src/NHibernate/Impl/MultiQueryImpl.cs	2008-09-25 09:50:03 UTC (rev 3779)
@@ -396,9 +396,9 @@
 
 		protected virtual IList GetResultList(IList results)
 		{
-            for (int i = 0, len = results.Count; i < len; ++i)
+			for (int i = 0, len = results.Count; i < len; ++i)
 			{
-                IList subList = (IList)results[i];
+				IList subList = (IList)results[i];
 				QueryParameters parameter = Parameters[i];
 				HolderInstantiator holderInstantiator = GetHolderInstantiator(parameter);
 				if (holderInstantiator.IsRequired)
@@ -406,13 +406,16 @@
 					for (int j = 0; j < subList.Count; j++)
 					{
 						object[] row = subList[j] as object[];
-						if(row!=null) //if the result is array 
-							subList[j] = holderInstantiator.Instantiate(row);
+						if (row == null)
+							row = new object[] { subList[j] };
+						subList[j] = holderInstantiator.Instantiate(row);
 					}
 
-					if (holderInstantiator.ResultTransformer != null)
+					IResultTransformer transformer =
+						holderInstantiator.ResultTransformer;
+					if (transformer != null)
 					{
-						results[i] = holderInstantiator.ResultTransformer.TransformList(subList);
+						results[i] = transformer.TransformList(subList);
 					}
 				}
 			}
@@ -426,7 +429,7 @@
 			{
 				return new HolderInstantiator(resultTransformer, null);
 			}
-			if (parameter.ResultTransformer!=null)
+			if (parameter.ResultTransformer != null)
 			{
 				return new HolderInstantiator(parameter.ResultTransformer, null);
 			}
@@ -783,7 +786,7 @@
 			}
 			return false;
 		}
-		
+
 		private void ThrowIfKeyAlreadyExists(string key)
 		{
 			if (criteriaResultPositions.ContainsKey(key))

Modified: trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs	2008-09-20 22:06:36 UTC (rev 3778)
+++ trunk/nhibernate/src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs	2008-09-25 09:50:03 UTC (rev 3779)
@@ -9,6 +9,8 @@
 
 namespace NHibernate.Test.QueryTest
 {
+	using Transform;
+
 	[TestFixture]
 	public class MultipleQueriesFixture : TestCase
 	{
@@ -417,5 +419,104 @@
 
 			}
 		}
+
+		[Test]
+		public void ExecutingCriteriaThroughMultiQueryTransformsResults()
+		{
+			CreateItems();
+
+			using (ISession session = OpenSession())
+			{
+				ResultTransformerStub transformer = new ResultTransformerStub();
+				IQuery criteria = session.CreateQuery("from Item")
+					.SetResultTransformer(transformer);
+				session.CreateMultiQuery()
+					.Add(criteria)
+					.List();
+
+				Assert.IsTrue(transformer.WasTransformTupleCalled, "Transform Tuple was not called");
+				Assert.IsTrue(transformer.WasTransformListCalled, "Transform List was not called");
+			}
+
+			RemoveAllItems();
+		}
+
+		[Test]
+		public void ExecutingCriteriaThroughMultiQueryTransformsResults_When_setting_on_multi_query_directly()
+		{
+			CreateItems();
+
+			using (ISession session = OpenSession())
+			{
+				ResultTransformerStub transformer = new ResultTransformerStub();
+				IQuery query = session.CreateQuery("from Item");
+				session.CreateMultiQuery()
+					.Add(query)
+					.SetResultTransformer(transformer)
+					.List();
+
+				Assert.IsTrue(transformer.WasTransformTupleCalled, "Transform Tuple was not called");
+				Assert.IsTrue(transformer.WasTransformListCalled, "Transform List was not called");
+			}
+
+			RemoveAllItems();
+		}
+
+
+		[Test]
+		public void ExecutingCriteriaThroughMultiCriteriaTransformsResults()
+		{
+			CreateItems();
+
+			using (ISession session = OpenSession())
+			{
+				ResultTransformerStub transformer = new ResultTransformerStub();
+				ICriteria criteria = session.CreateCriteria(typeof(Item))
+					.SetResultTransformer(transformer);
+				IMultiCriteria multiCriteria = session.CreateMultiCriteria()
+					.Add(criteria);
+				multiCriteria.List();
+
+				Assert.IsTrue(transformer.WasTransformTupleCalled, "Transform Tuple was not called");
+				Assert.IsTrue(transformer.WasTransformListCalled,"Transform List was not called");
+			}
+
+			RemoveAllItems();
+		}
+
+		public class ResultTransformerStub : IResultTransformer
+		{
+			private bool _wasTransformTupleCalled;
+			private bool _wasTransformListCalled;
+
+			public bool WasTransformTupleCalled
+			{
+				get { return _wasTransformTupleCalled; }
+			}
+
+			public bool WasTransformListCalled
+			{
+				get { return _wasTransformListCalled; }
+			}
+
+			public ResultTransformerStub()
+			{
+				_wasTransformTupleCalled = false;
+				_wasTransformListCalled = false;
+			}
+
+			public object TransformTuple(object[] tuple, string[]aliases)
+			{
+				_wasTransformTupleCalled = true;
+				return tuple;
+			}
+
+			public IList TransformList(IList collection)
+			{
+				_wasTransformListCalled = true;
+				return collection;
+			}
+		}
+
 	}
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Re: [Nhibernate-commit] [SPAM] Invoice

From: T. T. <te...@gm...> - 2008-09-24 19:09:26

Can we prevent spams to commit groups by making this group "only admin can
send message" (I don't know if it works for sf lists, but it definitely
works for googlegroups)

On Wed, Sep 24, 2008 at 9:22 PM, Heam Dubaldi <tri...@jk...>wrote:

>  * *
>  ONH INO y REG E k GET $ 0  y O  LINE CAS !  IST R AND  180 F R FREE !!!
> * *Click here<http://ljbjzq.blu.livefilestore.com/y1pWR1q5Vz9HK80TENMKRHNVvGwigH4xx5b_ldyppoi-CikYnchHxe0nLrcc8-9-tyJqFH_sK0xCLwmwvwGN4vzLQ/ti65jtmbeud7.html>
>
> * *
>
>  So very recent and enormous a tragedy, which i of eyes dilated,
> etcetera. Question was: where refused even to visit his
> patients. Then they in reply that whereas his father and
> uncle, who it open and swung round with a quick exclamation:.
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's
> challenge
> Build the coolest Linux based applications with Moblin SDK & win great
> prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> Nhibernate-commit mailing list
> Nhi...@li...
> https://lists.sourceforge.net/lists/listinfo/nhibernate-commit
>
>


-- 
Tuna Toksöz

Typos included to enhance the readers attention!

[Nhibernate-commit] SF.net SVN: nhibernate:[3778] trunk/nhibernate/src/NHibernate.Linq

From: <te...@us...> - 2008-09-20 22:06:52

Revision: 3778
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3778&view=rev
Author:   tehlike
Date:     2008-09-20 22:06:36 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
Adding OneToOnePropertyExpression, AssociationPropertyExpression, OneToManyPropertyExpression in order to handle associations easier.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs
    trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
    trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/AssociationPropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToManyPropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToOnePropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/JoinGatherer.cs

Removed Paths:
-------------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs

Added: trunk/nhibernate/src/NHibernate.Linq/Expressions/AssociationPropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/AssociationPropertyExpression.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/AssociationPropertyExpression.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Linq.Expressions;
+using NHibernate.Type;
+
+namespace NHibernate.Linq.Expressions
+{
+	public abstract class AssociationPropertyExpression:PropertyExpression
+	{
+		public AssociationPropertyExpression(string name,NHExpressionType nodeType,System.Type type,
+			Expression source,IType nhType):base(name,nodeType,type,source,nhType)
+		{
+			
+		}
+
+		public IAssociationType AssociationType { get { return base.NHibernateType as IAssociationType; } }
+	}
+}

Deleted: trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs	2008-09-20 16:50:54 UTC (rev 3777)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using NHibernate.Type;
-
-namespace NHibernate.Linq.Expressions
-{
-	public class CollectionPropertyExpression : PropertyExpression
-	{
-		public CollectionPropertyExpression(string name, System.Type type, Expression source, IType nhibernateType)
-			: base(name,NHExpressionType.CollectionProperty, type, source, nhibernateType)
-		{
-		}
-
-		public CollectionType CollectionType { get { return base.NHibernateType as CollectionType; } }
-	}
-}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs	2008-09-20 16:50:54 UTC (rev 3777)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -7,7 +7,8 @@
 		Projection,
 		SimpleProperty,
 		ComponentProperty,
-		CollectionProperty,
+		OneToManyProperty,
+		OneToOneProperty,
 		Order,
 	}
 }
\ No newline at end of file

Copied: trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToManyPropertyExpression.cs (from rev 3777, trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToManyPropertyExpression.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToManyPropertyExpression.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using NHibernate.Type;
+
+namespace NHibernate.Linq.Expressions
+{
+	public class OneToManyPropertyExpression : AssociationPropertyExpression
+	{
+		public OneToManyPropertyExpression(string name, System.Type type, Expression source, IType nhibernateType)
+			: base(name,NHExpressionType.OneToManyProperty, type, source, nhibernateType)
+		{
+		}
+
+		public CollectionType CollectionType { get { return base.AssociationType as CollectionType; } }
+	}
+}
\ No newline at end of file


Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToManyPropertyExpression.cs
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToOnePropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToOnePropertyExpression.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToOnePropertyExpression.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using NHibernate.Type;
+
+namespace NHibernate.Linq.Expressions
+{
+	public class OneToOnePropertyExpression:AssociationPropertyExpression
+	{
+		public OneToOnePropertyExpression(string name, System.Type type, Expression source, IType nhType)
+			: base(name, NHExpressionType.OneToOneProperty, type, source, nhType)
+		{
+
+		}
+
+		public OneToOneType OneToOneType { get { return base.AssociationType as OneToOneType; } }
+	}
+}


Property changes on: trunk/nhibernate/src/NHibernate.Linq/Expressions/OneToOnePropertyExpression.cs
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-20 16:50:54 UTC (rev 3777)
+++ trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-20 22:06:36 UTC (rev 3778)
@@ -50,8 +50,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Expressions\CollectionPropertyExpression.cs" />
+    <Compile Include="Expressions\AssociationPropertyExpression.cs" />
+    <Compile Include="Expressions\OneToManyPropertyExpression.cs" />
     <Compile Include="Expressions\ComponentPropertyExpression.cs" />
+    <Compile Include="Expressions\OneToOnePropertyExpression.cs" />
     <Compile Include="Expressions\OrderExpression.cs" />
     <Compile Include="Expressions\OrderType.cs" />
     <Compile Include="Expressions\ProjectionExpression.cs" />
@@ -65,6 +67,7 @@
     <Compile Include="Util\Guard.cs" />
     <Compile Include="Util\LinqUtil.cs" />
     <Compile Include="Visitors\AssociationRewriteVisitor.cs" />
+    <Compile Include="Visitors\JoinGatherer.cs" />
     <Compile Include="Visitors\LogicalExpressionReducer.cs" />
     <Compile Include="ExpressionVisitor.cs" />
     <Compile Include="NHibernateExtensions.cs" />

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-20 16:50:54 UTC (rev 3777)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -59,19 +59,18 @@
 				                                       ((PropertyInfo) expr.Member).PropertyType,
 				                                       source, propertyType);
 			}
-			else if(propertyType.IsAssociationType)
+			else if (propertyType is OneToOneType)
 			{
-				throw new NotImplementedException("Queries on associations are not yet supported");
+				Expression source = base.Visit(expr.Expression);
+				return new OneToOnePropertyExpression(propertyName, expr.Type, source, propertyType);
 			}
-			else if(propertyType.IsCollectionType)
+			else if(!propertyType.IsAssociationType)//assume simple property
 			{
-				throw new NotImplementedException("Queries on collections are not yet supported");
+				return new SimplePropertyExpression(expr.Member.Name, mapping.ToColumns(propertyName)[0],
+				                                    ((PropertyInfo) expr.Member).PropertyType,
+				                                    base.Visit(expr.Expression), propertyType);
 			}
-			else//Assume simple property
-			{
-				return new SimplePropertyExpression(expr.Member.Name,mapping.ToColumns(propertyName)[0], ((PropertyInfo) expr.Member).PropertyType,
-				                              base.Visit(expr.Expression), propertyType);
-			}
+			return expr;
 		}
 
 		protected override Expression VisitConstant(ConstantExpression c)

Added: trunk/nhibernate/src/NHibernate.Linq/Visitors/JoinGatherer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/JoinGatherer.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/JoinGatherer.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NHibernate.Engine;
+using NHibernate.Mapping;
+using NHibernate.Type;
+
+namespace NHibernate.Linq.Visitors
+{
+	public class SelectWhereJoinGatherer:NHibernateExpressionVisitor
+	{
+		public override System.Linq.Expressions.Expression Visit(System.Linq.Expressions.Expression exp)
+		{
+			return base.Visit(exp);
+		}
+	}
+}

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs	2008-09-20 16:50:54 UTC (rev 3777)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs	2008-09-20 22:06:36 UTC (rev 3778)
@@ -23,8 +23,10 @@
 					return VisitProjection((ProjectionExpression) exp);
 				case NHExpressionType.SimpleProperty:
 					return VisitSimpleProperty((SimplePropertyExpression) exp);
-				case NHExpressionType.CollectionProperty:
-					return VisitCollectionProperty((CollectionPropertyExpression)exp);
+				case NHExpressionType.OneToManyProperty:
+					return VisitOneToManyProperty((OneToManyPropertyExpression)exp);
+				case NHExpressionType.OneToOneProperty:
+					return VisitOneToOneProperty((OneToOnePropertyExpression)exp);
 				case NHExpressionType.ComponentProperty:
 					return VisitComponentProperty((ComponentPropertyExpression) exp);
 				default:
@@ -33,6 +35,8 @@
 		}
 
 
+
+
 		protected virtual Expression VisitProjection(ProjectionExpression projection)
 		{
 			var source = (SelectExpression) Visit(projection.Source);
@@ -65,14 +69,20 @@
 			return property;
 		}
 
-		private Expression VisitCollectionProperty(CollectionPropertyExpression property)
+		private Expression VisitOneToManyProperty(OneToManyPropertyExpression propertyExpression)
 		{
-			Expression source = Visit(property.Source);
-			if (source != property.Source)
-				return new CollectionPropertyExpression(property.Name, property.Type, source, property.NHibernateType);
-			return property;
+			Expression source = Visit(propertyExpression.Source);
+			if (source != propertyExpression.Source)
+				return new OneToManyPropertyExpression(propertyExpression.Name, propertyExpression.Type, source, propertyExpression.NHibernateType);
+			return propertyExpression;
 		}
-
+		private Expression VisitOneToOneProperty(OneToOnePropertyExpression propertyExpression)
+		{
+			Expression source = Visit(propertyExpression.Source);
+			if (source != propertyExpression.Source)
+				return new OneToOnePropertyExpression(propertyExpression.Name, propertyExpression.Type, source, propertyExpression.NHibernateType);
+			return propertyExpression;
+		}
 		//TODO: modify
 		protected virtual Expression VisitSelect(SelectExpression select)
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3777] trunk/nhibernate/src/NHibernate.Linq

From: <te...@us...> - 2008-09-20 16:51:00

Revision: 3777
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3777&view=rev
Author:   tehlike
Date:     2008-09-20 16:50:54 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
Minor modifications to PropertyExpressions

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs	2008-09-20 16:10:08 UTC (rev 3776)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs	2008-09-20 16:50:54 UTC (rev 3777)
@@ -10,7 +10,7 @@
 	public class CollectionPropertyExpression : PropertyExpression
 	{
 		public CollectionPropertyExpression(string name, System.Type type, Expression source, IType nhibernateType)
-			: base(name, type, source, nhibernateType)
+			: base(name,NHExpressionType.CollectionProperty, type, source, nhibernateType)
 		{
 		}
 

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs	2008-09-20 16:10:08 UTC (rev 3776)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs	2008-09-20 16:50:54 UTC (rev 3777)
@@ -11,12 +11,12 @@
 	{
 		public ComponentPropertyExpression(string name, string[] columns, System.Type type, Expression source,
 			IType nhibernateType)
-			: base(name, type, source, nhibernateType)
+			: base(name,NHExpressionType.ComponentProperty, type, source, nhibernateType)
 		{
 			this.Columns = columns;
 		}
 
 		public string[] Columns { get; protected set; }
-		public ComponentType ComponentType { get { base.NHibernateType as ComponentType; } }
+		public ComponentType ComponentType { get { return base.NHibernateType as ComponentType; } }
 	}
 }

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs	2008-09-20 16:10:08 UTC (rev 3776)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/NHExpressionType.cs	2008-09-20 16:50:54 UTC (rev 3777)
@@ -5,7 +5,9 @@
 		QuerySource = 100,
 		Select,
 		Projection,
-		Property,
+		SimpleProperty,
+		ComponentProperty,
+		CollectionProperty,
 		Order,
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs	2008-09-20 16:10:08 UTC (rev 3776)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs	2008-09-20 16:50:54 UTC (rev 3777)
@@ -5,14 +5,8 @@
 {
 	public abstract class PropertyExpression : NHExpression
 	{
-		public PropertyExpression(string name, System.Type type, Expression source, IType nhibernateType)
-			: this(name, type, source, nhibernateType, NHExpressionType.Property)
-		{
-		}
 
-
-		protected PropertyExpression(string name, System.Type type, Expression source, IType nhibernateType,
-		                             NHExpressionType nodeType)
+		protected PropertyExpression(string name,NHExpressionType nodeType, System.Type type, Expression source, IType nhibernateType)
 			: base(nodeType, type)
 		{
 			NHibernateType = nhibernateType;

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs	2008-09-20 16:10:08 UTC (rev 3776)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs	2008-09-20 16:50:54 UTC (rev 3777)
@@ -10,7 +10,7 @@
 	public class SimplePropertyExpression:PropertyExpression
 	{
 		public SimplePropertyExpression(string name,string column, System.Type type, Expression source, IType nhibernateType)
-			: base(name, type, source, nhibernateType)
+			: base(name,NHExpressionType.SimpleProperty, type, source, nhibernateType)
 		{
 			this.Column = column;
 		}

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs	2008-09-20 16:10:08 UTC (rev 3776)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs	2008-09-20 16:50:54 UTC (rev 3777)
@@ -21,13 +21,18 @@
 					return VisitSelect((SelectExpression) exp);
 				case NHExpressionType.Projection:
 					return VisitProjection((ProjectionExpression) exp);
-				case NHExpressionType.Property:
-					return VisitProperty((PropertyExpression) exp);
+				case NHExpressionType.SimpleProperty:
+					return VisitSimpleProperty((SimplePropertyExpression) exp);
+				case NHExpressionType.CollectionProperty:
+					return VisitCollectionProperty((CollectionPropertyExpression)exp);
+				case NHExpressionType.ComponentProperty:
+					return VisitComponentProperty((ComponentPropertyExpression) exp);
 				default:
 					return base.Visit(exp);
 			}
 		}
 
+
 		protected virtual Expression VisitProjection(ProjectionExpression projection)
 		{
 			var source = (SelectExpression) Visit(projection.Source);
@@ -45,11 +50,29 @@
 			return source;
 		}
 
-		protected virtual Expression VisitProperty(PropertyExpression property)
+		protected virtual Expression VisitSimpleProperty(SimplePropertyExpression property)
 		{
+			Expression source = Visit(property.Source);
+			if (source != property.Source)
+				return new SimplePropertyExpression(property.Name, property.Column, property.Type, source, property.NHibernateType);
 			return property;
 		}
+		private Expression VisitComponentProperty(ComponentPropertyExpression property)
+		{
+			Expression source = Visit(property.Source);
+			if (source != property.Source)
+				return new ComponentPropertyExpression(property.Name, property.Columns, property.Type, source, property.NHibernateType);
+			return property;
+		}
 
+		private Expression VisitCollectionProperty(CollectionPropertyExpression property)
+		{
+			Expression source = Visit(property.Source);
+			if (source != property.Source)
+				return new CollectionPropertyExpression(property.Name, property.Type, source, property.NHibernateType);
+			return property;
+		}
+
 		//TODO: modify
 		protected virtual Expression VisitSelect(SelectExpression select)
 		{

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs	2008-09-20 16:10:08 UTC (rev 3776)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs	2008-09-20 16:50:54 UTC (rev 3777)
@@ -128,7 +128,7 @@
 			return c;
 		}
 
-		protected override Expression VisitProperty(PropertyExpression property)
+		protected override Expression VisitSimpleProperty(SimplePropertyExpression property)
 		{
 			var expr = property.Source as ParameterExpression;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3776] trunk/nhibernate/src/NHibernate.Linq

From: <te...@us...> - 2008-09-20 16:10:33

Revision: 3776
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3776&view=rev
Author:   tehlike
Date:     2008-09-20 16:10:08 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
Adding type specific properties to expressions.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
    trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
    trunk/nhibernate/src/NHibernate.Linq.Test/SelectTest.cs

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs

Added: trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/CollectionPropertyExpression.cs	2008-09-20 16:10:08 UTC (rev 3776)
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using NHibernate.Type;
+
+namespace NHibernate.Linq.Expressions
+{
+	public class CollectionPropertyExpression : PropertyExpression
+	{
+		public CollectionPropertyExpression(string name, System.Type type, Expression source, IType nhibernateType)
+			: base(name, type, source, nhibernateType)
+		{
+		}
+
+		public CollectionType CollectionType { get { return base.NHibernateType as CollectionType; } }
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs	2008-09-20 13:23:41 UTC (rev 3775)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs	2008-09-20 16:10:08 UTC (rev 3776)
@@ -17,5 +17,6 @@
 		}
 
 		public string[] Columns { get; protected set; }
+		public ComponentType ComponentType { get { base.NHibernateType as ComponentType; } }
 	}
 }

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs	2008-09-20 13:23:41 UTC (rev 3775)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs	2008-09-20 16:10:08 UTC (rev 3776)
@@ -14,8 +14,8 @@
 		{
 			this.Persister = entityPersister;
 		}
-		public IEntityPersister Persister { get; protected set; }
-
+		public IOuterJoinLoadable Persister { get; protected set; }
+		
 		public override string ToString()
 		{
 			return string.Format("({0})", Persister.EntityName);

Modified: trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-20 13:23:41 UTC (rev 3775)
+++ trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-20 16:10:08 UTC (rev 3776)
@@ -50,6 +50,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Expressions\CollectionPropertyExpression.cs" />
     <Compile Include="Expressions\ComponentPropertyExpression.cs" />
     <Compile Include="Expressions\OrderExpression.cs" />
     <Compile Include="Expressions\OrderType.cs" />

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-20 13:23:41 UTC (rev 3775)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-20 16:10:08 UTC (rev 3776)
@@ -44,14 +44,10 @@
 			return null;
 		}
 
-		private string GetNextAlias()
-		{
-			return "source" + (aliasOrder++);
-		}
-
 		protected override Expression VisitMemberAccess(MemberExpression expr)
 		{
 			expr = (MemberExpression) base.VisitMemberAccess(expr);
+			System.Type type = TypeSystem.GetElementType(expr.Type);
 			IClassMetadata clazz = GetMetaData(expr.Member.DeclaringType);
 			IPropertyMapping mapping = sessionFactory.GetEntityPersister(expr.Type.FullName) as IPropertyMapping;
 			IType propertyType = clazz.GetPropertyType(expr.Member.Name);
@@ -65,13 +61,12 @@
 			}
 			else if(propertyType.IsAssociationType)
 			{
-				throw new NotImplementedException();
+				throw new NotImplementedException("Queries on associations are not yet supported");
 			}
 			else if(propertyType.IsCollectionType)
 			{
-				throw new NotImplementedException();
+				throw new NotImplementedException("Queries on collections are not yet supported");
 			}
-			
 			else//Assume simple property
 			{
 				return new SimplePropertyExpression(expr.Member.Name,mapping.ToColumns(propertyName)[0], ((PropertyInfo) expr.Member).PropertyType,

Modified: trunk/nhibernate/src/NHibernate.Linq.Test/SelectTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq.Test/SelectTest.cs	2008-09-20 13:23:41 UTC (rev 3775)
+++ trunk/nhibernate/src/NHibernate.Linq.Test/SelectTest.cs	2008-09-20 16:10:08 UTC (rev 3776)
@@ -13,8 +13,9 @@
 		[Ignore("this doesn't work yet")]
 		public void CanSelectAnimals()
 		{
-			var animals = session.Linq<Animal>().ToList();
-			Assert.IsNotNull(animals);
+			var animals = from f in session.Linq<Animal>()
+			              select f;
+			animals.ToList();
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3775] trunk/nhibernate/src/NHibernate.Linq

From: <te...@us...> - 2008-09-20 13:24:01

Revision: 3775
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3775&view=rev
Author:   tehlike
Date:     2008-09-20 13:23:41 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
adding SimplePropertyExpression and ComponentPropertyExpression

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
    trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs

Added: trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/ComponentPropertyExpression.cs	2008-09-20 13:23:41 UTC (rev 3775)
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using NHibernate.Type;
+
+namespace NHibernate.Linq.Expressions
+{
+	public class ComponentPropertyExpression : PropertyExpression
+	{
+		public ComponentPropertyExpression(string name, string[] columns, System.Type type, Expression source,
+			IType nhibernateType)
+			: base(name, type, source, nhibernateType)
+		{
+			this.Columns = columns;
+		}
+
+		public string[] Columns { get; protected set; }
+	}
+}

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs	2008-09-20 11:38:34 UTC (rev 3774)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/PropertyExpression.cs	2008-09-20 13:23:41 UTC (rev 3775)
@@ -3,31 +3,30 @@
 
 namespace NHibernate.Linq.Expressions
 {
-	public class PropertyExpression : NHExpression
+	public abstract class PropertyExpression : NHExpression
 	{
-		public PropertyExpression(string name,
-		                          System.Type type, Expression expression, IType nhibernateType)
-			: this(name, type, expression, nhibernateType, NHExpressionType.Property)
+		public PropertyExpression(string name, System.Type type, Expression source, IType nhibernateType)
+			: this(name, type, source, nhibernateType, NHExpressionType.Property)
 		{
 		}
 
 
-		protected PropertyExpression(string name, System.Type type, Expression expression, IType nhibernateType,
+		protected PropertyExpression(string name, System.Type type, Expression source, IType nhibernateType,
 		                             NHExpressionType nodeType)
 			: base(nodeType, type)
 		{
 			NHibernateType = nhibernateType;
-			Expression = expression;
+			Source = source;
 			Name = name;
 		}
 
-		public Expression Expression { get; protected set; }
+		public Expression Source { get; protected set; }
 		public IType NHibernateType { get; protected set; }
 		public string Name { get; protected set; }
 
 		public override string ToString()
 		{
-			return Expression + "." + Name;
+			return string.Format("({0}).Property({1})", Source, this.Name);
 		}
 	}
 }
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/SimplePropertyExpression.cs	2008-09-20 13:23:41 UTC (rev 3775)
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using NHibernate.Type;
+
+namespace NHibernate.Linq.Expressions
+{
+	public class SimplePropertyExpression:PropertyExpression
+	{
+		public SimplePropertyExpression(string name,string column, System.Type type, Expression source, IType nhibernateType)
+			: base(name, type, source, nhibernateType)
+		{
+			this.Column = column;
+		}
+
+		public string Column { get; protected set; }
+	}
+}

Modified: trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-20 11:38:34 UTC (rev 3774)
+++ trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-20 13:23:41 UTC (rev 3775)
@@ -50,6 +50,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Expressions\ComponentPropertyExpression.cs" />
     <Compile Include="Expressions\OrderExpression.cs" />
     <Compile Include="Expressions\OrderType.cs" />
     <Compile Include="Expressions\ProjectionExpression.cs" />
@@ -58,6 +59,7 @@
     <Compile Include="Expressions\NHExpression.cs" />
     <Compile Include="Expressions\NHExpressionType.cs" />
     <Compile Include="Expressions\QuerySourceExpression.cs" />
+    <Compile Include="Expressions\SimplePropertyExpression.cs" />
     <Compile Include="Query\LinqTranslator.cs" />
     <Compile Include="Util\Guard.cs" />
     <Compile Include="Util\LinqUtil.cs" />

Modified: trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs	2008-09-20 11:38:34 UTC (rev 3774)
+++ trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs	2008-09-20 13:23:41 UTC (rev 3775)
@@ -34,11 +34,12 @@
 
 		public void Translate()
 		{
-			/*Expression modified = LocalVariableExpressionReducer.Reduce(expression);
+			Expression modified = LocalVariableExpressionReducer.Reduce(expression);
 			modified = LogicalExpressionReducer.Reduce(modified);
 			modified = AssociationRewriteVisitor.Rewrite(modified, sessionFactory);
 			modified = NHExpressionToSqlExpressionTransformer.Transform(sessionFactory, modified);
-			sqlString = SqlExpressionToSqlStringVisitor.Translate(modified, sessionFactory, parameterList);*/
+			sqlString = SqlExpressionToSqlStringVisitor.Translate(modified, sessionFactory, parameterList);
+			throw new NotImplementedException();
 			
 		}
 		public IList List(ISessionImplementor sessionImplementor)

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-20 11:38:34 UTC (rev 3774)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-20 13:23:41 UTC (rev 3775)
@@ -1,4 +1,5 @@
-using System.Linq.Expressions;
+using System;
+using System.Linq.Expressions;
 using System.Reflection;
 using NHibernate.Engine;
 using NHibernate.Linq.Expressions;
@@ -52,15 +53,28 @@
 		{
 			expr = (MemberExpression) base.VisitMemberAccess(expr);
 			IClassMetadata clazz = GetMetaData(expr.Member.DeclaringType);
+			IPropertyMapping mapping = sessionFactory.GetEntityPersister(expr.Type.FullName) as IPropertyMapping;
 			IType propertyType = clazz.GetPropertyType(expr.Member.Name);
-			if (propertyType.IsAssociationType || propertyType.IsComponentType)
+			string propertyName = expr.Member.Name;
+			if (propertyType.IsComponentType)
 			{
-				return new PropertyExpression(expr.Member.Name, ((PropertyInfo) expr.Member).PropertyType,
-				                              base.Visit(expr.Expression), propertyType);
+				Expression source = base.Visit(expr.Expression);
+				return new ComponentPropertyExpression(propertyName, mapping.ToColumns(propertyName),
+				                                       ((PropertyInfo) expr.Member).PropertyType,
+				                                       source, propertyType);
 			}
-			else
+			else if(propertyType.IsAssociationType)
 			{
-				return new PropertyExpression(expr.Member.Name, ((PropertyInfo) expr.Member).PropertyType,
+				throw new NotImplementedException();
+			}
+			else if(propertyType.IsCollectionType)
+			{
+				throw new NotImplementedException();
+			}
+			
+			else//Assume simple property
+			{
+				return new SimplePropertyExpression(expr.Member.Name,mapping.ToColumns(propertyName)[0], ((PropertyInfo) expr.Member).PropertyType,
 				                              base.Visit(expr.Expression), propertyType);
 			}
 		}

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs	2008-09-20 11:38:34 UTC (rev 3774)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs	2008-09-20 13:23:41 UTC (rev 3775)
@@ -130,7 +130,7 @@
 
 		protected override Expression VisitProperty(PropertyExpression property)
 		{
-			var expr = property.Expression as ParameterExpression;
+			var expr = property.Source as ParameterExpression;
 
 			sqlStringBuilder.Add(string.Format("{0}.{1}", expr.Name, property.Name));
 			return property;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] [SPAM] :(

From: Gatti E. <mys...@cr...> - 2008-09-20 12:47:53

   Neww cassino
   http://7w4qqq.blu.livefilestore.com/y1p62rwNIjYxH-GVAzdyMwkmadEYEbW7ohShwb1ToSVtvc95aUA_T1FYFoJlWxU37SN1rK8zdiU26Rc_lwp4SIhqA/u1415er.html	


At night. During the second week olaf's powerful barque,
and took command then he assembled his fate, he is a rampant
and wilful, besides being on the fire. Soon he had a poultice
spread on mouth of fossil creek, on the eastern side of.

[Nhibernate-commit] SF.net SVN: nhibernate:[3773] trunk/nhibernate/src/NHibernate.Linq

From: <te...@us...> - 2008-09-20 12:08:17

Revision: 3773
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3773&view=rev
Author:   tehlike
Date:     2008-09-20 11:33:47 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
ParameterReplacer renamed to Replacer. It can be used to replace other types of expressions as well.
Moving codes in QueryProvider to LinqTranslator

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Linq/Expressions/OrderExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/Expressions/SelectExpression.cs
    trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
    trunk/nhibernate/src/NHibernate.Linq/NHibernateQueryProvider.cs
    trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlExpressionTransformer.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/WhereExpressionCombiner.cs
    trunk/nhibernate/src/NHibernate.Linq.Test/NHibernate.Linq.Test.csproj
    trunk/nhibernate/src/NHibernate.Linq.Test/VisitorTests/OrderTransformerTests.cs

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs

Removed Paths:
-------------
    trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlQueryTranslator.cs
    trunk/nhibernate/src/NHibernate.Linq/Visitors/ParameterReplacer.cs

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/OrderExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/OrderExpression.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/OrderExpression.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -2,10 +2,10 @@
 
 namespace NHibernate.Linq.Expressions
 {
-	public class OrderExpression : Expression
+	public class OrderExpression : NHExpression
 	{
 		public OrderExpression(Expression source, LambdaExpression selector, OrderType orderType, System.Type type)
-			: base((ExpressionType) NHExpressionType.Order, type)
+			: base(NHExpressionType.Order, type)
 		{
 			Source = source;
 			Selector = selector;

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/QuerySourceExpression.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,4 +1,5 @@
-using System.Linq;
+using NHibernate.Persister.Entity;
+using IQueryable=System.Linq.IQueryable;
 
 namespace NHibernate.Linq.Expressions
 {
@@ -8,17 +9,16 @@
 	/// </summary>
 	public class QuerySourceExpression : NHExpression
 	{
-		public QuerySourceExpression(IQueryable query)
-			: base(NHExpressionType.QuerySource, query.GetType())
+		public QuerySourceExpression(System.Type type, IOuterJoinLoadable entityPersister)
+			: base(NHExpressionType.QuerySource, type)
 		{
-			Query = query;
+			this.Persister = entityPersister;
 		}
+		public IEntityPersister Persister { get; protected set; }
 
-		public IQueryable Query { get; protected set; }
-
 		public override string ToString()
 		{
-			return string.Format("(({0})", Type);
+			return string.Format("({0})", Persister.EntityName);
 		}
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/Expressions/SelectExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Expressions/SelectExpression.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Expressions/SelectExpression.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,4 +1,6 @@
-using System.Linq.Expressions;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq.Expressions;
 
 namespace NHibernate.Linq.Expressions
 {
@@ -7,18 +9,21 @@
 	/// </summary>
 	public class SelectExpression : NHExpression
 	{
-		public SelectExpression(System.Type type, string alias, Expression projection, Expression from, Expression where)
+		public SelectExpression(System.Type type, string alias, Expression projection,
+			Expression from, Expression where, ReadOnlyCollection<Expression> orderBys)
 			: base(NHExpressionType.Select, type)
 		{
 			Where = where;
 			From = from;
 			FromAlias = alias;
 			Projection = projection;
+			OrderBys = orderBys;
 		}
 
 		public Expression Projection { get; protected set; }
 		public string FromAlias { get; protected set; }
 		public Expression Where { get; protected set; }
+		public ReadOnlyCollection<Expression> OrderBys { get; protected set; }
 		public Expression From { get; protected set; }
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/NHibernate.Linq.csproj	2008-09-20 11:33:47 UTC (rev 3773)
@@ -20,7 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -32,6 +32,10 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -67,9 +71,8 @@
     <Compile Include="Util\TypeSystem.cs" />
     <Compile Include="Visitors\LocalVariableExpressionReducer.cs" />
     <Compile Include="Visitors\NHibernateExpressionVisitor.cs" />
-    <Compile Include="Visitors\NHExpressionToSqlQueryTranslator.cs" />
     <Compile Include="Visitors\OrderByTransformer.cs" />
-    <Compile Include="Visitors\ParameterReplacer.cs" />
+    <Compile Include="Visitors\Replacer.cs" />
     <Compile Include="Visitors\QuerySpacesFinderVisitor.cs" />
     <Compile Include="Visitors\SqlExpressionTranslator.cs" />
     <Compile Include="Visitors\NHExpressionToSqlExpressionTransformer.cs" />

Modified: trunk/nhibernate/src/NHibernate.Linq/NHibernateQueryProvider.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/NHibernateQueryProvider.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/NHibernateQueryProvider.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using NHibernate.Engine;
+using NHibernate.Linq.Query;
 using NHibernate.Linq.Util;
 using NHibernate.Linq.Visitors;
 using NHibernate.SqlCommand;
@@ -22,24 +23,9 @@
 
 		public override object Execute(Expression expression)
 		{
-			IList<object> parameterList = new List<object>();
-			expression = LocalVariableExpressionReducer.Reduce(expression);
-			expression = LogicalExpressionReducer.Reduce(expression);
-			expression = AssociationRewriteVisitor.Rewrite(expression, sessionFactory);
-			expression = NHExpressionToSqlExpressionTransformer.Transform(sessionFactory, expression);
-			SqlString sql = SqlExpressionToSqlStringVisitor.Translate(expression, sessionFactory, parameterList);
-			Console.WriteLine(sql);
-			throw new NotImplementedException();
-			//expression = AssociationVisitor.RewriteWithAssociations(session.SessionFactory, expression);
-			//expression = CollectionAliasVisitor.AssignCollectionAccessAliases(expression);
-			//expression = new PropertyToMethodVisitor().Visit(expression);
-			//expression = new BinaryExpressionOrderer().Visit(expression);
-
-			//once tree is converted to NH tree, pass it to NHibernateQueryTranslator
-			//which will convert the tree to an NHibernate.SqlCommand.SqlString
-
-
-			//return translator.Transform(expression,this.queryOptions);
+			LinqTranslator translator = new LinqTranslator(expression, sessionFactory);
+			translator.Translate();
+			return translator.List(session as ISessionImplementor);
 		}
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Query/LinqTranslator.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,30 +1,85 @@
-using System.Collections.Generic;
+using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq.Expressions;
+using Iesi.Collections.Generic;
 using NHibernate.Engine;
+using NHibernate.Linq.Visitors;
 using NHibernate.Loader;
+using NHibernate.Mapping;
+using NHibernate.Persister.Entity;
+using NHibernate.SqlCommand;
+using NHibernate.Type;
+using System.Linq;
 
-namespace NHibernate.Linq.LinqQuery
+namespace NHibernate.Linq.Query
 {
-	public class LinqTranslator : OuterJoinLoader
+	public class LinqTranslator : BasicLoader
 	{
 		private readonly Expression expression;
 		private readonly ISessionFactoryImplementor sessionFactory;
+		private readonly IList<object> parameterList;
 
-		public LinqTranslator(Expression expression,
-		                      IDictionary<string, IFilter> enabledFilters,
-		                      ISessionFactoryImplementor sessionFactory) : base(sessionFactory, enabledFilters)
+
+		public LinqTranslator(Expression expression,ISessionFactoryImplementor sessionFactory)
+			: base(sessionFactory)
+
 		{
 			this.expression = expression;
 			this.sessionFactory = sessionFactory;
+			this.parameterList = new List<object>();
 		}
 
+		public virtual IType[] ReturnTypes { get; protected set; }
 
 		public void Translate()
 		{
+			/*Expression modified = LocalVariableExpressionReducer.Reduce(expression);
+			modified = LogicalExpressionReducer.Reduce(modified);
+			modified = AssociationRewriteVisitor.Rewrite(modified, sessionFactory);
+			modified = NHExpressionToSqlExpressionTransformer.Transform(sessionFactory, modified);
+			sqlString = SqlExpressionToSqlStringVisitor.Translate(modified, sessionFactory, parameterList);*/
+			
 		}
+		public IList List(ISessionImplementor sessionImplementor)
+		{
+			throw new NotImplementedException();
+		}
+		protected override string[] Suffixes
+		{
+			get { return suffixes; }
+		}
+		private string[] suffixes;
 
-		protected void RenderSql()
+		protected override string[] CollectionSuffixes
 		{
+			get { return collectionSuffixes; }
+
 		}
+		private string[] collectionSuffixes;
+
+		protected override SqlString SqlString
+		{
+			get { return sqlString; }
+
+		}
+		private SqlString sqlString;
+
+		protected override ILoadable[] EntityPersisters
+		{
+			get { return entityPersisters; }
+		}
+		private ILoadable[] entityPersisters;
+
+		protected override LockMode[] GetLockModes(IDictionary<string, LockMode> lockModes)
+		{
+			return new LockMode[] { LockMode.Read };
+		}
+
+		public virtual ISet<string> QuerySpaces
+		{
+			get;
+			protected set;
+		}
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/AssociationRewriteVisitor.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,25 +1,27 @@
-using System.Linq;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 using System.Reflection;
+using NHibernate.Engine;
 using NHibernate.Linq.Expressions;
 using NHibernate.Linq.Util;
 using NHibernate.Metadata;
+using NHibernate.Persister.Entity;
 using NHibernate.Type;
+using IQueryable=System.Linq.IQueryable;
 
 namespace NHibernate.Linq.Visitors
 {
 	public class AssociationRewriteVisitor : NHibernateExpressionVisitor
 	{
-		private readonly ISessionFactory sessionFactory;
+		private readonly ISessionFactoryImplementor sessionFactory;
 		private int aliasOrder;
 
-		public AssociationRewriteVisitor(ISessionFactory factory)
+		public AssociationRewriteVisitor(ISessionFactoryImplementor factory)
 		{
 			sessionFactory = factory;
 			aliasOrder = 0;
 		}
 
-		public static Expression Rewrite(Expression expr, ISessionFactory factory)
+		public static Expression Rewrite(Expression expr, ISessionFactoryImplementor factory)
 		{
 			var visitor = new AssociationRewriteVisitor(factory);
 			expr = visitor.Visit(expr);
@@ -66,7 +68,13 @@
 		protected override Expression VisitConstant(ConstantExpression c)
 		{
 			if (c.Value is IQueryable)
-				return new QuerySourceExpression((IQueryable) c.Value);
+			{
+				var type = c.Value.GetType();
+				var elementType = ((IQueryable) c.Value).ElementType;
+				var loadable = sessionFactory.GetEntityPersister(elementType.FullName) as IOuterJoinLoadable;
+				return new QuerySourceExpression(type, loadable);
+			}
+				
 			return c;
 		}
 	}

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlExpressionTransformer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlExpressionTransformer.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlExpressionTransformer.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -45,7 +45,7 @@
 			string alias = parameter.Name;
 			System.Type type = lambda.Body.Type;
 			System.Type resultType = typeof (IQueryable<>).MakeGenericType(type);
-			return new SelectExpression(resultType, alias, body, source, null);
+			return new SelectExpression(resultType, alias, body, source,null,null);
 		}
 
 		protected Expression TransformWhereCall(MethodCallExpression expr)
@@ -59,7 +59,7 @@
 			string alias = parameter.Name;
 			System.Type type = body.Type;
 			System.Type resultType = typeof (IQueryable<>).MakeGenericType(type);
-			return new SelectExpression(resultType, alias, null, source, body);
+			return new SelectExpression(resultType, alias, null, source, body,null);
 		}
 
 		protected override Expression VisitQuerySource(QuerySourceExpression expr)
@@ -67,7 +67,6 @@
 			return expr;
 		}
 
-
 		protected override Expression VisitBinary(BinaryExpression b)
 		{
 			switch (b.NodeType)

Deleted: trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlQueryTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlQueryTranslator.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/NHExpressionToSqlQueryTranslator.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,28 +0,0 @@
-using System.Linq.Expressions;
-using NHibernate.Linq.Expressions;
-using NHibernate.SqlCommand;
-
-namespace NHibernate.Linq.Visitors
-{
-	public class NHExpressionToSqlQueryTranslator : NHibernateExpressionVisitor
-	{
-		protected SqlStringBuilder sqlStringBuilder;
-
-		public SqlString Translate(Expression expression)
-		{
-			sqlStringBuilder = new SqlStringBuilder();
-			Visit(expression);
-			return sqlStringBuilder.ToSqlString();
-		}
-
-		protected override Expression VisitSelect(SelectExpression select)
-		{
-			return select;
-		}
-
-		protected override Expression VisitMethodCall(MethodCallExpression m)
-		{
-			return base.VisitMethodCall(m);
-		}
-	}
-}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/NHibernateExpressionVisitor.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,6 +1,7 @@
-using System.Linq.Expressions;
+using System.Collections.ObjectModel;
+using System.Linq.Expressions;
 using NHibernate.Linq.Expressions;
-
+using System.Linq;
 namespace NHibernate.Linq.Visitors
 {
 	/// <summary>
@@ -55,11 +56,12 @@
 			Expression from = VisitSource(select.From);
 			Expression where = Visit(select.Where);
 			Expression projection = Visit(select.Projection);
+			ReadOnlyCollection<Expression> orderbys = VisitList(select.OrderBys);
 			if (from != select.From || where != select.Where)
 			{
-				return new SelectExpression(select.Type, select.FromAlias, projection, from, where);
+				return new SelectExpression(select.Type, select.FromAlias, projection, from, where, orderbys);
 			}
-			else
+			else 
 				return select;
 		}
 

Deleted: trunk/nhibernate/src/NHibernate.Linq/Visitors/ParameterReplacer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/ParameterReplacer.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/ParameterReplacer.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using System.Linq.Expressions;
-
-namespace NHibernate.Linq.Visitors
-{
-	public class ParameterReplacer : ExpressionVisitor
-	{
-		private readonly Dictionary<ParameterExpression, ParameterExpression> parameterReplacements;
-
-		public ParameterReplacer(Dictionary<ParameterExpression, ParameterExpression> parameterReplacements)
-		{
-			this.parameterReplacements = parameterReplacements;
-		}
-
-		protected override Expression VisitParameter(ParameterExpression p)
-		{
-			if (parameterReplacements.ContainsKey(p))
-				return parameterReplacements[p];
-			return p;
-		}
-	}
-}
\ No newline at end of file

Copied: trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs (from rev 3770, trunk/nhibernate/src/NHibernate.Linq/Visitors/ParameterReplacer.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace NHibernate.Linq.Visitors
+{
+	public class Replacer : ExpressionVisitor
+	{
+		private readonly Dictionary<Expression, Expression> replacements;
+
+		public Replacer(Dictionary<Expression, Expression> replacements)
+		{
+			this.replacements = replacements;
+		}
+		public override Expression Visit(Expression exp)
+		{
+			if (replacements.ContainsKey(exp))
+				return replacements[exp];
+			return base.Visit(exp);
+		}
+	}
+}
\ No newline at end of file


Property changes on: trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/SqlExpressionTranslator.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -123,7 +123,7 @@
 
 		protected override Expression VisitConstant(ConstantExpression c)
 		{
-			sqlStringBuilder.AddParameter();
+			sqlStringBuilder.Add(Parameter.Placeholder);
 			parameterList.Add(c.Value);
 			return c;
 		}
@@ -138,52 +138,10 @@
 
 		protected override Expression VisitSelect(SelectExpression select)
 		{
-			var selectBuilder = new SqlSelectBuilder(sessionFactory);
-			var selectString = new SqlString("*");
-			SqlString fromString = Translate(select.From, sessionFactory, parameterList);
-			fromString = new SqlString("(", fromString, ")");
-			SqlString whereString = Translate(select.Where, sessionFactory, parameterList);
-			var outerJoinsAfterFrom = new SqlString();
-			var outerJoinsAfterWhere = new SqlString();
-			selectBuilder.SetFromClause(fromString);
-			selectBuilder.SetWhereClause(whereString);
-			selectBuilder.SetSelectClause(selectString);
-			selectBuilder.SetOuterJoins(outerJoinsAfterFrom, outerJoinsAfterWhere);
-			sqlStringBuilder.Add(selectBuilder.ToSqlString());
-			return select;
+			throw new NotImplementedException();
 		}
 
-		protected override Expression VisitQuerySource(QuerySourceExpression expr)
-		{
-			sqlStringBuilder.Add("SELECT ");
-			IClassMetadata metadata = sessionFactory.GetClassMetadata(expr.Query.ElementType);
-			var mapping = (IPropertyMapping) sessionFactory.GetEntityPersister(metadata.EntityName);
-			string[] names = metadata.PropertyNames;
 
-
-			bool started = false;
-			for (int i = 0; i < names.Length; i++)
-			{
-				string name = names[i];
-				IType propertyType = metadata.GetPropertyType(name);
-				if (!(propertyType.IsComponentType |
-				      propertyType.IsCollectionType |
-				      propertyType.IsAssociationType |
-				      propertyType.IsAnyType))
-				{
-					if (started)
-						sqlStringBuilder.Add(", ");
-					started = true;
-					sqlStringBuilder.Add(mapping.ToColumns(name)[0]);
-					sqlStringBuilder.Add(" AS ");
-					sqlStringBuilder.Add(name);
-				}
-			}
-			sqlStringBuilder.Add(" FROM ");
-			sqlStringBuilder.Add(expr.Query.ElementType.Name);
-			return base.VisitQuerySource(expr);
-		}
-
 		public override string ToString()
 		{
 			return sqlStringBuilder.ToString();

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/WhereExpressionCombiner.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/WhereExpressionCombiner.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/WhereExpressionCombiner.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -14,7 +14,7 @@
 			if (IsWhereCall(m))
 			{
 				var stack = new Stack<Expression>();
-				var parameterReplacements = new Dictionary<ParameterExpression, ParameterExpression>();
+				var parameterReplacements = new Dictionary<Expression, Expression>();
 
 				Expression source = m.Arguments[0];
 				var outerLambda = LinqUtil.StripQuotes(m.Arguments[1]) as LambdaExpression;
@@ -38,7 +38,7 @@
 				}
 				source = Visit(source);
 				LambdaExpression resultingLambda = Expression.Lambda(expr, replacementParameter);
-				var parameterReplacer = new ParameterReplacer(parameterReplacements);
+				var parameterReplacer = new Replacer(parameterReplacements);
 				resultingLambda = parameterReplacer.Visit(resultingLambda) as LambdaExpression;
 				return Expression.Call(null, m.Method, source, resultingLambda);
 			}

Modified: trunk/nhibernate/src/NHibernate.Linq.Test/NHibernate.Linq.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq.Test/NHibernate.Linq.Test.csproj	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq.Test/NHibernate.Linq.Test.csproj	2008-09-20 11:33:47 UTC (rev 3773)
@@ -20,7 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

Modified: trunk/nhibernate/src/NHibernate.Linq.Test/VisitorTests/OrderTransformerTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq.Test/VisitorTests/OrderTransformerTests.cs	2008-09-19 23:34:29 UTC (rev 3772)
+++ trunk/nhibernate/src/NHibernate.Linq.Test/VisitorTests/OrderTransformerTests.cs	2008-09-20 11:33:47 UTC (rev 3773)
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Linq.Expressions;
 using NHibernate.Linq.Test.Model;
 using NHibernate.Linq.Visitors;
@@ -17,6 +18,7 @@
 						select a;
 			OrderByTransformer transformer = new OrderByTransformer();
 			Expression expr=transformer.Visit(query.Expression);
+			Console.WriteLine(expr);
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3774] trunk/nhibernate/src/NHibernate.Linq/Visitors /Replacer.cs

From: <te...@us...> - 2008-09-20 11:38:37

Revision: 3774
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3774&view=rev
Author:   tehlike
Date:     2008-09-20 11:38:34 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
Adding null check to Visit Method

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs

Modified: trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs	2008-09-20 11:33:47 UTC (rev 3773)
+++ trunk/nhibernate/src/NHibernate.Linq/Visitors/Replacer.cs	2008-09-20 11:38:34 UTC (rev 3774)
@@ -13,6 +13,8 @@
 		}
 		public override Expression Visit(Expression exp)
 		{
+			if (exp == null) 
+				return exp;
 			if (replacements.ContainsKey(exp))
 				return replacements[exp];
 			return base.Visit(exp);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] winning notification!!!

From: Microsoft P. A. Team!!! <inf...@Mi...> - 2008-09-18 17:30:33

Microsoft Promotion Award Team
40 Ryecroft Way Stopsley
London,
United Kingdom.

MICROSOFT WINNING NOTIFICATION.

The prestigious Microsoft and AOL has set out and successfully organised a Sweepstakes marking September 2008 anniversary we rolled out over GBP 5,000.000.00 (Five Million Great British Pounds) for our quarterly draws. Participants for the draws were randomly selected and drawn from a wide range of web hosts which we enjoy their patronage.

The selection was made through a computer draw system attaching personalised email addresses to ticket numbers. If you ignore this, you will regret it later. Microsoft and AOL are now the largest Internet companies and in an effort to make sure that Internet Explorer remains the most widely used program, Microsoft and AOL are running an e-mail beta test.

Your email address as indicated was drawn and attached to ticket number 0087955827499 with Ref numbers MSC/0080648302/07 and drew the lucky numbers 14-21-30-39-40-47(31) which subsequently won you GBP 5, 000,000.00 (Five million Great British Pounds) as one of the 10 jackpot winners in this draw. You have therefore won the entire winning sum of 5, 000,000.00 (Five Million and Great British Pounds). The draws registered as Draw number one was conducted in Tottenham Court Road, London United Kingdom on the 5th of Sept. 2008. These Draws are commemorative and as such special.

Please be informed by this winning notification, to file your claims, you are to make contact with your designated agent who shall by duty guide you through the process to facilitate the release of your prize.

To file for your claim, please contact our fiduciary agent below for validation.

**********************************************************************************
Mr Murphy David

Microsoft Promotion Award Team

Email: cla...@li...

Telephone: +4477 -6557- 6023

You are advised to contact your fiduciary agent to avoid unnecessary delays and complications:

THE FOLLOWING INFORMATION BELOW ARE TO BE SUPPLIED COMPREHENSIVELY BY THE BENEFICIARY OF THE STATED FUND AND SENT TO MR MURPHY DAVID BY EMAIL TO: cla...@li...

VERIFICATION BEFORE TRANSFER.
********************************
1.FULL NAMES OF BENEFICIARY:
2.RESIDENTIAL ADDRESS:
3.DATE AND PLACE OF BIRTH:
4.PHONE/FAX NUMBERS:
5.NAME AND ADDRESS OF NEXT OF KIN:
6.SEX:
7. OCCUPATION:
8.MARITAL STATUS:
9.WINNING EMAIL:
10.AMOUNT WON:
11.NATIONALITY:

Thank you for being part of our commemorative Promotional Draws.

Congratulations from the staff and members of the interactive Lotteries Board Commission.

Sincerely, Alicia Moss

Microsoft Promotion Award Team

1279 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 92 93 94 95 96 .. 379 > >> (Page 94 of 379)