Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3893] trunk/nhibernate
|
From: <fab...@us...> - 2008-11-07 21:44:04
|
Revision: 3893
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3893&view=rev
Author: fabiomaulo
Date: 2008-11-07 21:41:22 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/nhibernate/default.build
trunk/nhibernate/releasenotes.txt
trunk/nhibernate/src/NHibernate.Config.Templates/FireBird.cfg.xml.tmpl
trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml.tmpl
trunk/nhibernate/src/NHibernate.Config.Templates/MySql.cfg.xml.tmpl
trunk/nhibernate/src/NHibernate.Config.Templates/Oracle.cfg.xml.tmpl
trunk/nhibernate/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml.tmpl
trunk/nhibernate/src/NHibernate.Config.Templates/SQLite.cfg.xml.tmpl
trunk/nhibernate/src/NHibernate.Everything.sln
trunk/nhibernate/src/NHibernate.Example.Web/Web.Config
trunk/nhibernate/src/NHibernate.Test/App.config
trunk/nhibernate/src/NHibernate.Test/DynamicEntity/DataProxyHandler.cs
trunk/nhibernate/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
trunk/nhibernate/src/NHibernate.sln
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy/
trunk/nhibernate/src/NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/
trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/
trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/
Modified: trunk/nhibernate/default.build
===================================================================
--- trunk/nhibernate/default.build 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/default.build 2008-11-07 21:41:22 UTC (rev 3893)
@@ -26,10 +26,10 @@
<include name="Iesi.Collections/Iesi.Collections.build" />
<include name="Iesi.Collections.Test/Iesi.Collections.Test.build" />
<include name="NHibernate/NHibernate.build" />
- <include name="NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyGenerators.build" />
- <include name="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build" />
- <include name="NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyGenerators.build" />
- <include name="NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyGenerators.Test.build" />
+ <include name="NHibernate.ByteCode.LinFu/ByteCode.build" />
+ <include name="NHibernate.ByteCode.LinFu.Tests/ByteCode.Test.build" />
+ <include name="NHibernate.ByteCode.Castle/ByteCode.build" />
+ <include name="NHibernate.ByteCode.Castle.Tests/ByteCode.Test.build" />
<include name="NHibernate.DomainModel/NHibernate.DomainModel.build" />
<include name="NHibernate.Test/NHibernate.Test.build" />
<include name="NHibernate.Test.Performance/NHibernate.Test.Performance.build" />
@@ -39,8 +39,8 @@
<fileset id="buildfiles.tests" basedir="src">
<include name="Iesi.Collections.Test/Iesi.Collections.Test.build" />
- <include name="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build" />
- <include name="NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyGenerators.Test.build" />
+ <include name="NHibernate.ByteCode.LinFu.Tests/ByteCode.Test.build" />
+ <include name="NHibernate.ByteCode.Castle.Tests/ByteCode.Test.build" />
<include name="NHibernate.Test/NHibernate.Test.build" />
<include name="NHibernate.Test.Performance/NHibernate.Test.Performance.build"
if="${run.performance.tests}" />
@@ -89,10 +89,10 @@
-->
<exclude name="Iesi.Collections.dll" />
<exclude name="Iesi.Collections.xml" />
- <exclude name="NHibernate.ProxyGenerators.LinFuDynamicProxy.dll" />
- <exclude name="NHibernate.ProxyGenerators.LinFuDynamicProxy.xml" />
- <exclude name="NHibernate.ProxyGenerators.CastleDynamicProxy.dll" />
- <exclude name="NHibernate.ProxyGenerators.CastleDynamicProxy.xml" />
+ <exclude name="NHibernate.ByteCode.LinFuDynamicProxy.dll" />
+ <exclude name="NHibernate.ByteCode.LinFuDynamicProxy.xml" />
+ <exclude name="NHibernate.ByteCode.CastleDynamicProxy.dll" />
+ <exclude name="NHibernate.ByteCode.CastleDynamicProxy.xml" />
<include name="*.dll" />
<include name="*.xml" />
<include name="*.license.txt" />
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/releasenotes.txt 2008-11-07 21:41:22 UTC (rev 3893)
@@ -2,15 +2,17 @@
========================
** BREAKING CHANGES from NH2.0.xGA to NH2.1.0
##### Run time #####
- * If you want work using lazy loading with Castle.DynamicProxy2 now you must deploy NHibernate.ProxyGenerators.CastleDynamicProxy.dll
+ * If you want work using lazy loading with LinFu.DynamicProxy now you must deploy NHibernate.ByteCode.LinFu.dll
+ * If you want work using lazy loading with Castle.DynamicProxy2 now you must deploy NHibernate.ByteCode.Castle.dll
##### Possible Breaking Changes for external frameworks #####
* ISession interface have additional methods
- * DefaultProxyFactoryFactory moved to NHibernate.Bytecode.Castle.ProxyFactoryFactory
+ * DefaultProxyFactoryFactory removed
* IProxyFactoryFactory now provide the IProxyValidator implementation
##### Initialization time #####
* The ProxyValidator check for "internal virtual" (to be intercepted by proxy need "protected internal virtual")
+ * The session-factory configuration property "proxyfactory.factory_class" is mandatory; You must choose one of the availables NHibernate.ByteCode
Build 2.0.1.GA
Modified: trunk/nhibernate/src/NHibernate.Config.Templates/FireBird.cfg.xml.tmpl
===================================================================
--- trunk/nhibernate/src/NHibernate.Config.Templates/FireBird.cfg.xml.tmpl 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Config.Templates/FireBird.cfg.xml.tmpl 2008-11-07 21:41:22 UTC (rev 3893)
@@ -24,7 +24,8 @@
</property>
<property name="show_sql">false</property>
<property name="dialect">NHibernate.Dialect.FirebirdDialect</property>
- <property name="command_timeout">444</property>
+ <property name="command_timeout">60</property>
<property name="query.substitutions">true 1, false 0, yes 1, no 0</property>
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
Modified: trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml.tmpl
===================================================================
--- trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml.tmpl 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Config.Templates/MSSQL.cfg.xml.tmpl 2008-11-07 21:41:22 UTC (rev 3893)
@@ -15,7 +15,8 @@
<property name="show_sql">false</property>
<property name="dialect">NHibernate.Dialect.MsSql2000Dialect</property>
<property name="use_outer_join">true</property>
- <property name="command_timeout">444</property>
+ <property name="command_timeout">60</property>
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Config.Templates/MySql.cfg.xml.tmpl
===================================================================
--- trunk/nhibernate/src/NHibernate.Config.Templates/MySql.cfg.xml.tmpl 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Config.Templates/MySql.cfg.xml.tmpl 2008-11-07 21:41:22 UTC (rev 3893)
@@ -12,5 +12,6 @@
Database=test;Data Source=someip;User Id=blah;Password=blah
</property>
<property name="dialect">NHibernate.Dialect.MySQLDialect</property>
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Config.Templates/Oracle.cfg.xml.tmpl
===================================================================
--- trunk/nhibernate/src/NHibernate.Config.Templates/Oracle.cfg.xml.tmpl 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Config.Templates/Oracle.cfg.xml.tmpl 2008-11-07 21:41:22 UTC (rev 3893)
@@ -14,5 +14,6 @@
<property name="show_sql">false</property>
<property name="dialect">NHibernate.Dialect.OracleDialect</property>
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml.tmpl
===================================================================
--- trunk/nhibernate/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml.tmpl 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Config.Templates/PostgreSQL.cfg.xml.tmpl 2008-11-07 21:41:22 UTC (rev 3893)
@@ -11,5 +11,6 @@
Server=localhost;initial catalog=nhibernate;User ID=nhibernate;Password=nhibernate;
</property>
<property name="dialect">NHibernate.Dialect.PostgreSQLDialect</property>
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Config.Templates/SQLite.cfg.xml.tmpl
===================================================================
--- trunk/nhibernate/src/NHibernate.Config.Templates/SQLite.cfg.xml.tmpl 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Config.Templates/SQLite.cfg.xml.tmpl 2008-11-07 21:41:22 UTC (rev 3893)
@@ -12,5 +12,6 @@
</property>
<property name="dialect">NHibernate.Dialect.SQLiteDialect</property>
<property name="query.substitutions">true=1;false=0</property>
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Everything.sln
===================================================================
--- trunk/nhibernate/src/NHibernate.Everything.sln 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Everything.sln 2008-11-07 21:41:22 UTC (rev 3893)
@@ -99,12 +99,16 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Tool.HbmXsd", "NHibernate.Tool.HbmXsd\NHibernate.Tool.HbmXsd.csproj", "{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Default proxy generator", "Default proxy generator", "{D2E4E87F-2531-4C7A-BBE9-FE8BFEDECECE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ByteCode providers", "ByteCode providers", "{D2E4E87F-2531-4C7A-BBE9-FE8BFEDECECE}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.CastleDynamicProxy", "NHibernate.ProxyGenerators.CastleDynamicProxy\NHibernate.ProxyGenerators.CastleDynamicProxy.csproj", "{31C3F0EA-0FED-4A2F-B68D-96CE29844487}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.Castle", "NHibernate.ByteCode.Castle\NHibernate.ByteCode.Castle.csproj", "{31C3F0EA-0FED-4A2F-B68D-96CE29844487}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.CastleDynamicProxy.Tests", "NHibernate.ProxyGenerators.CastleDynamicProxy.Tests\NHibernate.ProxyGenerators.CastleDynamicProxy.Tests.csproj", "{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.Castle.Tests", "NHibernate.ByteCode.Castle.Tests\NHibernate.ByteCode.Castle.Tests.csproj", "{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.LinFu", "NHibernate.ByteCode.LinFu\NHibernate.ByteCode.LinFu.csproj", "{8289D6AD-9714-42D3-A94D-D4D9814D1281}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.LinFu.Tests", "NHibernate.ByteCode.LinFu.Tests\NHibernate.ByteCode.LinFu.Tests.csproj", "{94FDD99B-8275-4E51-8F43-958B2C632120}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -226,6 +230,26 @@
{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Any CPU.Build.0 = Release|Any CPU
{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|.NET.ActiveCfg = Release|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Release|.NET.ActiveCfg = Release|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Release|Any CPU.Build.0 = Release|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {94FDD99B-8275-4E51-8F43-958B2C632120}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -246,8 +270,10 @@
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D} = {92509065-DAEA-4457-8300-C7B64CD0E9F4}
{4C251E3E-6EA1-4A51-BBCB-F9C42AE55344} = {C91E7018-3C67-4830-963A-C388C75E1BD5}
{58CE4584-31B9-4E74-A7FB-5D40BFAD0876} = {C91E7018-3C67-4830-963A-C388C75E1BD5}
+ {4972EE96-2417-4D47-9FF1-3B1D6B1D3191} = {D2E4E87F-2531-4C7A-BBE9-FE8BFEDECECE}
+ {8289D6AD-9714-42D3-A94D-D4D9814D1281} = {D2E4E87F-2531-4C7A-BBE9-FE8BFEDECECE}
+ {94FDD99B-8275-4E51-8F43-958B2C632120} = {D2E4E87F-2531-4C7A-BBE9-FE8BFEDECECE}
{31C3F0EA-0FED-4A2F-B68D-96CE29844487} = {D2E4E87F-2531-4C7A-BBE9-FE8BFEDECECE}
- {4972EE96-2417-4D47-9FF1-3B1D6B1D3191} = {D2E4E87F-2531-4C7A-BBE9-FE8BFEDECECE}
EndGlobalSection
GlobalSection(TextTemplating) = postSolution
TextTemplating = 1
Modified: trunk/nhibernate/src/NHibernate.Example.Web/Web.Config
===================================================================
--- trunk/nhibernate/src/NHibernate.Example.Web/Web.Config 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Example.Web/Web.Config 2008-11-07 21:41:22 UTC (rev 3893)
@@ -61,6 +61,7 @@
</property>
<property name="dialect">NHibernate.Dialect.MsSql2000Dialect</property>
<property name="current_session_context_class">managed_web</property>
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
Modified: trunk/nhibernate/src/NHibernate.Test/App.config
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/App.config 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Test/App.config 2008-11-07 21:41:22 UTC (rev 3893)
@@ -66,6 +66,8 @@
<property name="command_timeout">444</property>
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
<property name="adonet.wrap_result_sets">false</property>
+
+ <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
</session-factory>
</hibernate-configuration>
Modified: trunk/nhibernate/src/NHibernate.Test/DynamicEntity/DataProxyHandler.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DynamicEntity/DataProxyHandler.cs 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Test/DynamicEntity/DataProxyHandler.cs 2008-11-07 21:41:22 UTC (rev 3893)
@@ -1,9 +1,9 @@
using System.Collections;
-using Castle.Core.Interceptor;
+using LinFu.DynamicProxy;
namespace NHibernate.Test.DynamicEntity
{
- public sealed class DataProxyHandler : Castle.Core.Interceptor.IInterceptor
+ public sealed class DataProxyHandler : LinFu.DynamicProxy.IInterceptor
{
private readonly Hashtable data = new Hashtable();
private readonly string entityName;
@@ -26,32 +26,32 @@
#region IInterceptor Members
- public void Intercept(IInvocation invocation)
+ public object Intercept(InvocationInfo info)
{
- invocation.ReturnValue = null;
- string methodName = invocation.Method.Name;
+ string methodName = info.TargetMethod.Name;
if ("get_DataHandler".Equals(methodName))
{
- invocation.ReturnValue = this;
+ return this;
}
else if (methodName.StartsWith("set_"))
{
string propertyName = methodName.Substring(4);
- data[propertyName] = invocation.Arguments[0];
+ data[propertyName] = info.Arguments[0];
}
else if (methodName.StartsWith("get_"))
{
string propertyName = methodName.Substring(4);
- invocation.ReturnValue = data[propertyName];
+ return data[propertyName];
}
else if ("ToString".Equals(methodName))
{
- invocation.ReturnValue = entityName + "#" + data["Id"];
+ return entityName + "#" + data["Id"];
}
else if ("GetHashCode".Equals(methodName))
{
- invocation.ReturnValue = GetHashCode();
+ return GetHashCode();
}
+ return null;
}
#endregion
Modified: trunk/nhibernate/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Test/DynamicEntity/ProxyHelper.cs 2008-11-07 21:41:22 UTC (rev 3893)
@@ -1,65 +1,56 @@
-using Castle.DynamicProxy;
+using LinFu.DynamicProxy;
namespace NHibernate.Test.DynamicEntity
{
public class ProxyHelper
{
- private static readonly ProxyGenerator proxyGenerator = new ProxyGenerator();
+ private static readonly ProxyFactory proxyGenerator = new ProxyFactory();
+ private static T NewProxy<T>(object id)
+ {
+ return proxyGenerator.CreateProxy<T>(new DataProxyHandler(typeof (T).FullName, id),
+ new[] {typeof (IProxyMarker), typeof (T)});
+
+ }
+
public static Person NewPersonProxy()
{
- return NewPersonProxy(0L);
+ return NewProxy<Person>(0L);
}
public static Person NewPersonProxy(object id)
{
- return
- (Person)
- proxyGenerator.CreateInterfaceProxyWithoutTarget(typeof (Person),
- new System.Type[] {typeof (IProxyMarker), typeof (Person)},
- new DataProxyHandler(typeof (Person).FullName, id));
+ return NewProxy<Person>(id);
}
public static Customer NewCustomerProxy()
{
- return NewCustomerProxy(0L);
+ return NewProxy<Customer>(0L);
}
public static Customer NewCustomerProxy(object id)
{
- return
- (Customer)
- proxyGenerator.CreateInterfaceProxyWithoutTarget(typeof (Customer),
- new System.Type[] {typeof (IProxyMarker), typeof (Customer)},
- new DataProxyHandler(typeof (Customer).FullName, id));
+ return NewProxy<Customer>(id);
}
public static Company NewCompanyProxy()
{
- return NewCompanyProxy(0L);
+ return NewProxy<Company>(0L);
}
public static Company NewCompanyProxy(object id)
{
- return
- (Company)
- proxyGenerator.CreateInterfaceProxyWithoutTarget(typeof (Company),
- new System.Type[] {typeof (IProxyMarker), typeof (Company)},
- new DataProxyHandler(typeof (Company).FullName, id));
+ return NewProxy<Company>(id);
}
public static Address NewAddressProxy()
{
- return NewAddressProxy(0L);
+ return NewProxy<Address>(0L);
}
public static Address NewAddressProxy(object id)
{
- return
- (Address)
- proxyGenerator.CreateInterfaceProxyWithoutTarget(typeof (Address),
- new System.Type[] {typeof (IProxyMarker), typeof (Address)},
- new DataProxyHandler(typeof (Address).FullName, id));
+ return NewProxy<Address>(id);
}
public static string ExtractEntityName(object obj)
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build 2008-11-07 21:41:22 UTC (rev 3893)
@@ -11,14 +11,13 @@
<include name="System.dll" />
<include name="System.Transactions.dll" />
<include name="System.Configuration.dll" />
- <include name="System.XML.dll" />
+ <include name="System.Xml.dll" />
<include name="System.Data.dll" />
<include name="Iesi.Collections.dll" />
<include name="log4net.dll" />
<include name="NHibernate.DomainModel.dll" />
<include name="NHibernate.dll" />
- <include name="Castle.DynamicProxy2.dll" />
- <include name="Castle.Core.dll" />
+ <include name="LinFu.DynamicProxy.dll" />
<include name="nunit.framework.dll" />
</assemblyfileset>
<resourcefileset id="project.resources" prefix="NHibernate.Test" dynamicprefix="true">
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2008-11-07 21:41:22 UTC (rev 3893)
@@ -39,18 +39,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Castle.Core, Version=1.0.3.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.3.0, 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="LinFu.DynamicProxy, Version=1.0.3233.760, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\lib\net\2.0\LinFu.DynamicProxy.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>
@@ -1026,14 +1022,14 @@
<None Include="NHibernate.Test.nunit" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\NHibernate.ByteCode.LinFu\NHibernate.ByteCode.LinFu.csproj">
+ <Project>{8289D6AD-9714-42D3-A94D-D4D9814D1281}</Project>
+ <Name>NHibernate.ByteCode.LinFu</Name>
+ </ProjectReference>
<ProjectReference Include="..\NHibernate.DomainModel\NHibernate.DomainModel.csproj">
<Project>{5C649B55-1B3F-4C38-9998-1B043E94A244}</Project>
<Name>NHibernate.DomainModel</Name>
</ProjectReference>
- <ProjectReference Include="..\NHibernate.ProxyGenerators.CastleDynamicProxy\NHibernate.ProxyGenerators.CastleDynamicProxy.csproj">
- <Project>{31C3F0EA-0FED-4A2F-B68D-96CE29844487}</Project>
- <Name>NHibernate.ProxyGenerators.CastleDynamicProxy</Name>
- </ProjectReference>
<ProjectReference Include="..\NHibernate\NHibernate.csproj">
<Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project>
<Name>NHibernate</Name>
Modified: trunk/nhibernate/src/NHibernate.sln
===================================================================
--- trunk/nhibernate/src/NHibernate.sln 2008-11-07 07:37:36 UTC (rev 3892)
+++ trunk/nhibernate/src/NHibernate.sln 2008-11-07 21:41:22 UTC (rev 3893)
@@ -12,14 +12,10 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Test", "NHibernate.Test\NHibernate.Test.csproj", "{7AEE5B37-C552-4E59-9B6F-88755BCB5070}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.CastleDynamicProxy", "NHibernate.ProxyGenerators.CastleDynamicProxy\NHibernate.ProxyGenerators.CastleDynamicProxy.csproj", "{31C3F0EA-0FED-4A2F-B68D-96CE29844487}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.LinFu", "NHibernate.ByteCode.LinFu\NHibernate.ByteCode.LinFu.csproj", "{8289D6AD-9714-42D3-A94D-D4D9814D1281}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.CastleDynamicProxy.Tests", "NHibernate.ProxyGenerators.CastleDynamicProxy.Tests\NHibernate.ProxyGenerators.CastleDynamicProxy.Tests.csproj", "{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.LinFu.Tests", "NHibernate.ByteCode.LinFu.Tests\NHibernate.ByteCode.LinFu.Tests.csproj", "{94FDD99B-8275-4E51-8F43-958B2C632120}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.LinFuDynamicProxy", "NHibernate.ProxyGenerators.LinFuDynamicProxy\NHibernate.ProxyGenerators.LinFuDynamicProxy.csproj", "{8289D6AD-9714-42D3-A94D-D4D9814D1281}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests", "NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests\NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.csproj", "{94FDD99B-8275-4E51-8F43-958B2C632120}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -38,14 +34,6 @@
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Any CPU.Build.0 = Release|Any CPU
- {31C3F0EA-0FED-4A2F-B68D-96CE29844487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {31C3F0EA-0FED-4A2F-B68D-96CE29844487}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {31C3F0EA-0FED-4A2F-B68D-96CE29844487}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {31C3F0EA-0FED-4A2F-B68D-96CE29844487}.Release|Any CPU.Build.0 = Release|Any CPU
- {4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Any CPU.Build.0 = Release|Any CPU
{8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|Any CPU.ActiveCfg = Release|Any CPU
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
