Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5294] trunk/nhibernate/src
|
From: <jul...@us...> - 2010-12-05 08:35:56
|
Revision: 5294
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5294&view=rev
Author: julian-maughan
Date: 2010-12-05 08:35:46 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
Relocation of Northwind domain entities and mappings from NHibernate.Tests to NHibernate.DomainModel project
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Address.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Animal.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/AnotherEntity.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Customer.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Employee.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Entity.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Northwind.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Order.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/OrderLine.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Patient.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Product.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/ProductCategory.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Region.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Role.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Shipper.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Supplier.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Territory.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Timesheet.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/User.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/UserComponent.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/UserDto.cs
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Animal.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/AnotherEntity.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Customer.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Employee.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Order.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/OrderLine.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Patient.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Product.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/ProductCategory.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Region.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Role.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Shipper.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Supplier.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Territory.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/TimeSheet.hbm.xml
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/User.hbm.xml
trunk/nhibernate/src/NHibernate.Test/Linq/BinaryBooleanExpressionTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/BooleanMethodExtensionExample.cs
trunk/nhibernate/src/NHibernate.Test/Linq/DynamicQueryTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/EnumTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/LinqQuerySamples.cs
trunk/nhibernate/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs
trunk/nhibernate/src/NHibernate.Test/Linq/LinqTestCase.cs
trunk/nhibernate/src/NHibernate.Test/Linq/MiscellaneousTextFixture.cs
trunk/nhibernate/src/NHibernate.Test/Linq/NorthwindDbCreator.cs
trunk/nhibernate/src/NHibernate.Test/Linq/NullComparisonTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/ParameterisedQueries.cs
trunk/nhibernate/src/NHibernate.Test/Linq/PatientTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/QueryReuseTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/RegresstionTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/SelectionTests.cs
trunk/nhibernate/src/NHibernate.Test/Linq/WhereTests.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/
trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/Linq/Entities/
trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/
Modified: trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj 2010-12-05 08:35:46 UTC (rev 5294)
@@ -137,6 +137,27 @@
<Compile Include="NHSpecific\SimpleComponent.cs" />
<Compile Include="NHSpecific\Team.cs" />
<Compile Include="NHSpecific\UnsavedType.cs" />
+ <Compile Include="Northwind\Entities\Address.cs" />
+ <Compile Include="Northwind\Entities\Animal.cs" />
+ <Compile Include="Northwind\Entities\AnotherEntity.cs" />
+ <Compile Include="Northwind\Entities\Customer.cs" />
+ <Compile Include="Northwind\Entities\Employee.cs" />
+ <Compile Include="Northwind\Entities\Entity.cs" />
+ <Compile Include="Northwind\Entities\Northwind.cs" />
+ <Compile Include="Northwind\Entities\Order.cs" />
+ <Compile Include="Northwind\Entities\OrderLine.cs" />
+ <Compile Include="Northwind\Entities\Patient.cs" />
+ <Compile Include="Northwind\Entities\Product.cs" />
+ <Compile Include="Northwind\Entities\ProductCategory.cs" />
+ <Compile Include="Northwind\Entities\Region.cs" />
+ <Compile Include="Northwind\Entities\Role.cs" />
+ <Compile Include="Northwind\Entities\Shipper.cs" />
+ <Compile Include="Northwind\Entities\Supplier.cs" />
+ <Compile Include="Northwind\Entities\Territory.cs" />
+ <Compile Include="Northwind\Entities\Timesheet.cs" />
+ <Compile Include="Northwind\Entities\User.cs" />
+ <Compile Include="Northwind\Entities\UserComponent.cs" />
+ <Compile Include="Northwind\Entities\UserDto.cs" />
<Compile Include="NotMono.cs" />
<Compile Include="One.cs" />
<Compile Include="Outer.cs" />
@@ -223,6 +244,22 @@
</ItemGroup>
<ItemGroup>
<None Include="NHibernate.DomainModel.build" />
+ <EmbeddedResource Include="Northwind\Mappings\Animal.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\AnotherEntity.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Customer.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Employee.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Order.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\OrderLine.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Patient.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Product.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\ProductCategory.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Region.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Role.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Shipper.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Supplier.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\Territory.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\TimeSheet.hbm.xml" />
+ <EmbeddedResource Include="Northwind\Mappings\User.hbm.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NHibernate\NHibernate.csproj">
@@ -241,6 +278,9 @@
<Service Include="..\..\..\..\trunk\nhibernate\src\NHibernate.DomainModel\{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
</ItemGroup>
<ItemGroup>
+ <Folder Include="Northwind" />
+ <Folder Include="Northwind\Entities" />
+ <Folder Include="Northwind\Mappings" />
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Property changes on: trunk/nhibernate/src/NHibernate.DomainModel/Northwind
___________________________________________________________________
Added: bugtraq:url
+ http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
+ NH-\d+
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Address.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Address.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Address.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,4 +1,4 @@
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Address
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Animal.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Animal.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Animal.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Animal
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/AnotherEntity.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/AnotherEntity.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/AnotherEntity.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,4 +1,4 @@
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class AnotherEntity
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Customer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Customer.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Customer.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Collections.ObjectModel;
using Iesi.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Customer
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Employee.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Employee.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Employee.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -3,7 +3,7 @@
using System.Collections.ObjectModel;
using Iesi.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Employee
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Entity.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Entity.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Entity.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,4 +1,4 @@
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public abstract class Entity<T>
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Northwind.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Northwind.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Northwind.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -3,7 +3,7 @@
using System.Linq;
using NHibernate.Linq;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Northwind
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Order.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Order.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Order.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -3,7 +3,7 @@
using System.Collections.ObjectModel;
using Iesi.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Order
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/OrderLine.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/OrderLine.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/OrderLine.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,4 +1,4 @@
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class OrderLine : Entity<OrderLine>
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Patient.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Patient.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Patient.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Patient
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Product.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Product.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Product.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Thing
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/ProductCategory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/ProductCategory.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/ProductCategory.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Collections.ObjectModel;
using Iesi.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class ProductCategory
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Region.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Region.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Region.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Collections.ObjectModel;
using Iesi.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Region : Entity<Region>
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Role.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Role.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Role.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Role
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Shipper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Shipper.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Shipper.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Shipper
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Supplier.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Supplier.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Supplier.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Collections.ObjectModel;
using Iesi.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Supplier
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Territory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Territory.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Territory.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Collections.ObjectModel;
using Iesi.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Territory : Entity<Territory>
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Timesheet.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/Timesheet.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/Timesheet.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Timesheet
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/User.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/User.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/User.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Data;
using NHibernate.Type;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
[Flags]
public enum FeatureSet
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/UserComponent.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/UserComponent.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/UserComponent.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,4 +1,4 @@
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class UserComponent
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/UserDto.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Entities/UserDto.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Entities/UserDto.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
using System;
-namespace NHibernate.Test.Linq.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class UserDto
{
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Animal.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Animal.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Animal.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Animal">
<id name="Id">
<generator class="native"/>
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/AnotherEntity.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/AnotherEntity.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/AnotherEntity.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="AnotherEntity" table="AnotherEntity">
<id name="Id">
<generator class="native" />
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Customer.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Customer.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Customer.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Customer" table="Customers">
<id name="CustomerId" column="CustomerId" type="string" unsaved-value="-1"
@@ -17,7 +17,7 @@
<property name="ContactTitle" column="ContactTitle" type="string" length="30"
access="field.camelcase-underscore"/>
- <component name="Address" class="NHibernate.Test.Linq.Entities.Address, NHibernate.Test"
+ <component name="Address" class="NHibernate.DomainModel.Northwind.Entities.Address, NHibernate.DomainModel"
access="field.camelcase-underscore" insert="true" update="true">
<property name="Street" column="Address" type="string" length="60"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Employee.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Employee.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Employee.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Employee" table="Employees">
<id name="EmployeeId" column="EmployeeId" type="int" unsaved-value="-1"
@@ -26,7 +26,7 @@
<property name="HireDate" column="HireDate" type="DateTime"
access="field.camelcase-underscore"/>
- <component name="Address" class="NHibernate.Test.Linq.Entities.Address, NHibernate.Test"
+ <component name="Address" class="NHibernate.DomainModel.Northwind.Entities.Address, NHibernate.DomainModel"
access="field.camelcase-underscore" insert="true" update="true">
<property name="Street" column="Address" type="string" length="60"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Order.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Order.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Order.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Order" table="Orders">
<id name="OrderId" column="OrderId" type="int" unsaved-value="-1"
@@ -32,7 +32,7 @@
<property name="ShippedTo" column="ShipName" type="string" length="40"
access="field.camelcase-underscore"/>
- <component name="ShippingAddress" class="NHibernate.Test.Linq.Entities.Address, NHibernate.Test"
+ <component name="ShippingAddress" class="NHibernate.DomainModel.Northwind.Entities.Address, NHibernate.DomainModel"
access="field.camelcase-underscore" insert="true" update="true">
<property name="Street" column="ShipAddress" type="string" length="60"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/OrderLine.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/OrderLine.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/OrderLine.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="OrderLine" table="OrderLines">
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Patient.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Patient.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Patient.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Patient" table="Patients">
<id name="Id" column="PatientId" type="Int64">
<generator class="native" />
@@ -23,7 +23,7 @@
<id name="Id" column="PatientRecordId" type="System.Int64">
<generator class="native" />
</id>
- <property type="NHibernate.Test.Linq.Entities.Gender, NHibernate.Test" not-null="true" name="Gender" column="`Gender`" />
+ <property type="NHibernate.DomainModel.Northwind.Entities.Gender, NHibernate.DomainModel" not-null="true" name="Gender" column="`Gender`" />
<property type="System.DateTime" not-null="true" name="BirthDate" column="`BirthDate`" />
<component name="Name" class="PatientName">
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Product.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Product.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Product.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
- <import class="NHibernate.Test.Linq.Entities.Thing, NHibernate.Test"/>
+ <import class="NHibernate.DomainModel.Northwind.Entities.Thing, NHibernate.DomainModel"/>
<class name="Product" table="Products">
<id name="ProductId" column="ProductId" type="int" unsaved-value="-1"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/ProductCategory.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/ProductCategory.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/ProductCategory.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="ProductCategory" table="Categories">
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Region.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Region.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Region.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Region" table="Region">
<id name="Id" column="RegionId" type="long" unsaved-value="-1"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Role.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Role.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Role.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Role" table="Roles">
<id name="Id">
<generator class="native" />
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Shipper.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Shipper.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Shipper.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Shipper" table="Shippers">
<id name="ShipperId" column="ShipperId" type="int" unsaved-value="-1"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Supplier.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Supplier.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Supplier.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Supplier" table="Suppliers">
<id name="SupplierId" column="SupplierId" type="int" unsaved-value="-1"
@@ -20,7 +20,7 @@
<property name="HomePage" column="HomePage" type="string"
access="field.camelcase-underscore"/>
- <component name="Address" class="NHibernate.Test.Linq.Entities.Address, NHibernate.Test"
+ <component name="Address" class="NHibernate.DomainModel.Northwind.Entities.Address, NHibernate.DomainModel"
access="field.camelcase-underscore" insert="true" update="true">
<property name="Street" column="Address" type="string" length="60"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Territory.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/Territory.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/Territory.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+ namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Territory" table="Territories">
<id name="Id" column="TerritoryId" type="long" unsaved-value="-1"
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/TimeSheet.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/TimeSheet.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/TimeSheet.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="Timesheet" table="Timesheets">
<id name="Id" column="TimesheetId">
<generator class="native" />
@@ -10,12 +10,12 @@
<bag name="Entries" cascade="all-delete-orphan">
<key column="TimesheetID" />
- <one-to-many class="NHibernate.Test.Linq.Entities.TimesheetEntry" />
+ <one-to-many class="NHibernate.DomainModel.Northwind.Entities.TimesheetEntry" />
</bag>
<bag name="Users" cascade="all-delete-orphan" access="field.camelcase" table="TimeSheetUsers">
<key column="TimesheetID" />
- <many-to-many class="NHibernate.Test.Linq.Entities.User" column="UserId" />
+ <many-to-many class="NHibernate.DomainModel.Northwind.Entities.User" column="UserId" />
</bag>
</class>
Modified: trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/User.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/Mappings/User.hbm.xml 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.DomainModel/Northwind/Mappings/User.hbm.xml 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.Test.Linq.Entities" assembly="NHibernate.Test">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
<class name="User" table="Users"
proxy="IUser"
>
@@ -12,7 +12,7 @@
<property name="RegisteredAt" type="DateTime" />
<property name="LastLoginDate" type="DateTime" />
- <property name="Enum1" type="NHibernate.Test.Linq.Entities.EnumStoredAsStringType, NHibernate.Test">
+ <property name="Enum1" type="NHibernate.DomainModel.Northwind.Entities.EnumStoredAsStringType, NHibernate.DomainModel">
<column name="Enum1" length="12" />
</property>
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/BinaryBooleanExpressionTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/BinaryBooleanExpressionTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/BinaryBooleanExpressionTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using System.Linq.Expressions;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/BooleanMethodExtensionExample.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/BooleanMethodExtensionExample.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/BooleanMethodExtensionExample.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -10,7 +10,7 @@
using NHibernate.Linq;
using NHibernate.Linq.Functions;
using NHibernate.Linq.Visitors;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
using SharpTestsEx;
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/DynamicQueryTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/DynamicQueryTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/DynamicQueryTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System;
using System.Linq;
//using System.Linq.Dynamic;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/EagerLoadTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
using System.Linq;
using NHibernate.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
using SharpTestsEx;
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/EnumTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/EnumTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/EnumTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
using System.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/LinqQuerySamples.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/LinqQuerySamples.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/LinqQuerySamples.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -14,29 +14,37 @@
[SetUpFixture]
public class LinqReadonlyTestsContext
{
+ /// <summary>
+ /// Assembly to load mapping files from
+ /// </summary>
+ protected virtual string MappingsAssembly
+ {
+ get { return "NHibernate.DomainModel"; }
+ }
+
private IEnumerable<string> Mappings
{
get
{
return new[]
- {
- "Linq.Mappings.Customer.hbm.xml",
- "Linq.Mappings.Employee.hbm.xml",
- "Linq.Mappings.Order.hbm.xml",
- "Linq.Mappings.OrderLine.hbm.xml",
- "Linq.Mappings.Product.hbm.xml",
- "Linq.Mappings.ProductCategory.hbm.xml",
- "Linq.Mappings.Region.hbm.xml",
- "Linq.Mappings.Shipper.hbm.xml",
- "Linq.Mappings.Supplier.hbm.xml",
- "Linq.Mappings.Territory.hbm.xml",
- "Linq.Mappings.AnotherEntity.hbm.xml",
- "Linq.Mappings.Role.hbm.xml",
- "Linq.Mappings.User.hbm.xml",
- "Linq.Mappings.TimeSheet.hbm.xml",
- "Linq.Mappings.Animal.hbm.xml",
- "Linq.Mappings.Patient.hbm.xml"
- };
+ {
+ "Northwind.Mappings.Customer.hbm.xml",
+ "Northwind.Mappings.Employee.hbm.xml",
+ "Northwind.Mappings.Order.hbm.xml",
+ "Northwind.Mappings.OrderLine.hbm.xml",
+ "Northwind.Mappings.Product.hbm.xml",
+ "Northwind.Mappings.ProductCategory.hbm.xml",
+ "Northwind.Mappings.Region.hbm.xml",
+ "Northwind.Mappings.Shipper.hbm.xml",
+ "Northwind.Mappings.Supplier.hbm.xml",
+ "Northwind.Mappings.Territory.hbm.xml",
+ "Northwind.Mappings.AnotherEntity.hbm.xml",
+ "Northwind.Mappings.Role.hbm.xml",
+ "Northwind.Mappings.User.hbm.xml",
+ "Northwind.Mappings.TimeSheet.hbm.xml",
+ "Northwind.Mappings.Animal.hbm.xml",
+ "Northwind.Mappings.Patient.hbm.xml"
+ };
}
}
@@ -106,10 +114,9 @@
configuration.SetProperty(Environment.ConnectionProvider, typeof (DriverConnectionProvider).AssemblyQualifiedName);
- string assemblyName = "NHibernate.Test";
- Assembly assembly = Assembly.Load(assemblyName);
+ Assembly assembly = Assembly.Load(MappingsAssembly);
- foreach (string file in Mappings.Select(mf => assemblyName + "." + mf))
+ foreach (string file in Mappings.Select(mf => MappingsAssembly + "." + mf))
{
configuration.AddResource(file, assembly);
}
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/LinqTestCase.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/LinqTestCase.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/LinqTestCase.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,7 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
@@ -11,34 +11,29 @@
private Northwind _northwind;
private ISession _session;
- protected override string MappingsAssembly
- {
- get { return "NHibernate.Test"; }
- }
-
protected override IList Mappings
{
get
{
return new[]
- {
- "Linq.Mappings.Customer.hbm.xml",
- "Linq.Mappings.Employee.hbm.xml",
- "Linq.Mappings.Order.hbm.xml",
- "Linq.Mappings.OrderLine.hbm.xml",
- "Linq.Mappings.Product.hbm.xml",
- "Linq.Mappings.ProductCategory.hbm.xml",
- "Linq.Mappings.Region.hbm.xml",
- "Linq.Mappings.Shipper.hbm.xml",
- "Linq.Mappings.Supplier.hbm.xml",
- "Linq.Mappings.Territory.hbm.xml",
- "Linq.Mappings.AnotherEntity.hbm.xml",
- "Linq.Mappings.Role.hbm.xml",
- "Linq.Mappings.User.hbm.xml",
- "Linq.Mappings.TimeSheet.hbm.xml",
- "Linq.Mappings.Animal.hbm.xml",
- "Linq.Mappings.Patient.hbm.xml"
- };
+ {
+ "Northwind.Mappings.Customer.hbm.xml",
+ "Northwind.Mappings.Employee.hbm.xml",
+ "Northwind.Mappings.Order.hbm.xml",
+ "Northwind.Mappings.OrderLine.hbm.xml",
+ "Northwind.Mappings.Product.hbm.xml",
+ "Northwind.Mappings.ProductCategory.hbm.xml",
+ "Northwind.Mappings.Region.hbm.xml",
+ "Northwind.Mappings.Shipper.hbm.xml",
+ "Northwind.Mappings.Supplier.hbm.xml",
+ "Northwind.Mappings.Territory.hbm.xml",
+ "Northwind.Mappings.AnotherEntity.hbm.xml",
+ "Northwind.Mappings.Role.hbm.xml",
+ "Northwind.Mappings.User.hbm.xml",
+ "Northwind.Mappings.TimeSheet.hbm.xml",
+ "Northwind.Mappings.Animal.hbm.xml",
+ "Northwind.Mappings.Patient.hbm.xml"
+ };
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/MiscellaneousTextFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/MiscellaneousTextFixture.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/MiscellaneousTextFixture.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Linq;
using System.Linq.Expressions;
using NHibernate.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/NorthwindDbCreator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/NorthwindDbCreator.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/NorthwindDbCreator.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -2,7 +2,7 @@
using System.Linq;
using System.Collections;
using System.Collections.Generic;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
namespace NHibernate.Test.Linq
{
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/NullComparisonTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/NullComparisonTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/NullComparisonTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -3,7 +3,7 @@
using System.Linq;
using System.Text;
using NHibernate.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/ParameterisedQueries.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/ParameterisedQueries.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/ParameterisedQueries.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -4,7 +4,7 @@
using System.Linq;
using System.Linq.Expressions;
using NHibernate.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/PatientTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/PatientTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/PatientTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,5 +1,5 @@
using System.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/QueryReuseTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/QueryReuseTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/QueryReuseTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/RegresstionTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/RegresstionTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/RegresstionTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
using System.Linq;
using NUnit.Framework;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
namespace NHibernate.Test.Linq
{
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/SelectionTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/SelectionTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/SelectionTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -1,6 +1,6 @@
using System;
using System.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
namespace NHibernate.Test.Linq
Modified: trunk/nhibernate/src/NHibernate.Test/Linq/WhereTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Linq/WhereTests.cs 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/Linq/WhereTests.cs 2010-12-05 08:35:46 UTC (rev 5294)
@@ -3,7 +3,7 @@
using System.Linq;
using System.Linq.Expressions;
using NHibernate.Linq;
-using NHibernate.Test.Linq.Entities;
+using NHibernate.DomainModel.Northwind.Entities;
using NUnit.Framework;
using SharpTestsEx;
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2010-12-05 01:54:39 UTC (rev 5293)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2010-12-05 08:35:46 UTC (rev 5294)
@@ -417,27 +417,6 @@
<Compile Include="Linq\DateTimeTests.cs" />
<Compile Include="Linq\DynamicQueryTests.cs" />
<Compile Include="Linq\EagerLoadTests.cs" />
- <Compile Include="Linq\Entities\Address.cs" />
- <Compile Include="Linq\Entities\Animal.cs" />
- <Compile Include="Linq\Entities\AnotherEntity.cs" />
- <Compile Include="Linq\Entities\Customer.cs" />
- <Compile Include="Linq\Entities\Employee.cs" />
- <Compile Include="Linq\Entities\Entity.cs" />
- <Compile Include="Linq\Entities\Northwind.cs" />
- <Compile Include="Linq\Entities\Order.cs" />
- <Compile Include="Linq\Entities\OrderLine.cs" />
- <Compile Include="Linq\Entities\Patient.cs" />
- <Compile Include="Linq\Entities\Product.cs" />
- <Compile Include="Linq\Entities\ProductCategory.cs" />
- <Compile Include="Linq\Entities\Region.cs" />
- <Compile Include="Linq\Entities\Role.cs" />
- <Compile Include="Linq\Entities\Shipper.cs" />
- <Compile Include="Linq\Entities\Supplier.cs" />
- <Compile Include="Linq\Entities\Territory.cs" />
- <Compile Include="Linq\Entities\Timesheet.cs" />
- <Compile Include="Linq\Entities\User.cs" />
- <Compile Include="Linq\Entities\UserComponent.cs" />
- <Compile Include="Linq\Entities\UserDto.cs" />
<Compile Include="Linq\EnumTests.cs" />
<Compile Include="Linq\ExtensionMethods.cs" />
<Compile Include="Linq\FunctionTests.cs" />
@@ -2430,15 +2409,9 @@
<EmbeddedResource Include="NHSpecificTest\NH1978\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2044\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2030\Mappings.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Patient.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2055\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2057\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2011\Mappings.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Animal.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\AnotherEntity.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Role.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\TimeSheet.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\User.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\ManyToOneFilters20Behaviour\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2000\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2003\Mappings.hbm.xml" />
@@ -2465,16 +2438,6 @@
<EmbeddedResource Include="NHSpecificTest\NH1939\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1911\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1920\Mappings.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Customer.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Employee.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Order.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\OrderLine.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Product.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\ProductCategory.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Region.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Shipper.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Supplier.hbm.xml" />
- <EmbeddedResource Include="Linq\Mappings\Territory.hbm.xml" />
<EmbeddedResource Include="IdTest\AssignedClass.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1927\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1928\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
