User: mzywitza
Date: 2010/01/27 10:09 PM
Added:
/ActiveRecord/branches/2.x/lib/net-3.5/
Castle.Components.Validator.pdb
Modified:
/ActiveRecord/branches/2.x/
default.build
/ActiveRecord/branches/2.x/lib/
Iesi.Collections.dll, NHibernate.dll, NHibernate.xml
/ActiveRecord/branches/2.x/src/
Castle.ActiveRecord-vs2008.sln, Changes.txt, License.txt, Readme.txt, Running
the test cases.txt, TODO.txt, activerecord.build
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Framework.Internal.Tests/
Castle.ActiveRecord.Framework.Internal.Tests.build, default.build
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq.Tests/
Castle.ActiveRecord.Linq.Tests.build, default.build
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq/
Castle.ActiveRecord.Linq.build, default.build
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests.Model/
Castle.ActiveRecord.Tests.Model.build, default.build
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/
Castle.ActiveRecord.Tests.build, default.build
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord/
Castle.ActiveRecord.build, default.build
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Scopes/
TransactionScope.cs
Log:
Merge and other changes for AR 2.1.2
Directory Changes:
Directory: /ActiveRecord/branches/2.x/
======================================
Property changes on: ActiveRecord/branches/2.x
___________________________________________________________________
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord/
==============================================================
Property changes on: ActiveRecord/branches/2.x/src/Castle.ActiveRecord
___________________________________________________________________
Directory:
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Framework.Internal.Tests/
=======================================================================================
Property changes on:
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Framework.Internal.Tests
___________________________________________________________________
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq/
===================================================================
Property changes on: ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq
___________________________________________________________________
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq.Tests/
=========================================================================
Property changes on:
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq.Tests
___________________________________________________________________
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/
====================================================================
Property changes on: ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests
___________________________________________________________________
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests.Model/
==========================================================================
Property changes on:
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests.Model
___________________________________________________________________
Directory: /svn:mergeinfo/
==========================
- /ActiveRecord/trunk/src/activerecord.build:6576,6591-6620
/branches/ActiveRecord/trunk/ActiveRecord/activerecord.build:5876
+ /ActiveRecord/trunk/src/activerecord.build:6576,6591-6620,6673,6720
/branches/ActiveRecord/trunk/ActiveRecord/activerecord.build:5876
File Changes:
Directory: /ActiveRecord/branches/2.x/
======================================
File [modified]: default.build
Delta lines: +7 -14
===================================================================
--- ActiveRecord/branches/2.x/lib/NHibernate.xml 2010-01-27 18:39:30 UTC
(rev 6725)
+++ ActiveRecord/branches/2.x/lib/NHibernate.xml 2010-01-28 05:09:28 UTC
(rev 6726)
@@ -11831,14 +11831,6 @@
Comes into play whenever the user specifies the "identity"
generator.
</remarks>
</member>
- <member name="P:NHibernate.Dialect.Dialect.SupportsSqlBatches">
- <summary>
- Supports splitting batches using GO T-SQL command
- </summary>
- <remarks>
- Batches http://msdn.microsoft.com/en-us/library/ms175502.aspx
- </remarks>
- </member>
<member
name="T:NHibernate.Exceptions.IViolatedConstraintNameExtracter">
<summary>
Defines a contract for implementations that can extract the name
of a violated
@@ -24764,6 +24756,13 @@
</summary>
<returns>The clone of the root criteria.</returns>
</member>
+ <member
name="P:NHibernate.Impl.CurrentSessionIdLoggingContext.SessionId">
+ <summary>
+ Error handling in this case will only kick in if we cannot set
values on the TLS
+ this is usally the case if we are called from the finalizer, since
this is something
+ that we do only for logging, we ignore the error.
+ </summary>
+ </member>
<member name="T:NHibernate.Impl.DbCommandSet`2">
<summary>
Expose the batch functionality in ADO.Net 2.0
@@ -33949,12 +33948,6 @@
<member name="M:NHibernate.Tool.hbm2ddl.SchemaValidator.Validate">
Perform the validations.
</member>
- <member name="M:NHibernate.Tool.hbm2ddl.ScriptReader.ReadNextSection">
- <summary>
- This acts as a template method. Specific Reader instances
- override the component methods.
- </summary>
- </member>
<member name="T:NHibernate.Tool.hbm2ddl.SuppliedConnectionHelper">
<summary>
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord/
==============================================================
File [modified]: Castle.ActiveRecord.build
Delta lines: +17 -0
===================================================================
---
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Scopes/TransactionScope.cs
2010-01-27 18:39:30 UTC (rev 6725)
+++
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Scopes/TransactionScope.cs
2010-01-28 05:09:28 UTC (rev 6726)
@@ -204,6 +204,23 @@
}
/// <summary>
+ /// If the <see cref="AbstractScope.WantsToCreateTheSession"/>
returned
+ /// <c>true</c> then this method is invoked to allow
+ /// the scope to create a properly configured session
+ /// </summary>
+ /// <param name="sessionFactory">From where to open the
session</param>
+ /// <param name="interceptor">the NHibernate interceptor</param>
+ /// <returns>the newly created session</returns>
+ public override ISession OpenSession(ISessionFactory
sessionFactory, IInterceptor interceptor)
+ {
+ ISession session =
sessionFactory.OpenSession(interceptor);
+ SetFlushMode(session);
+ session.BeginTransaction(isolationLevel);
+
+ return session;
+ }
+
+ /// <summary>
/// This method is invoked when the
/// <see
cref="Castle.ActiveRecord.Framework.ISessionFactoryHolder"/>
File [modified]: default.build
Delta lines: +0 -0
===================================================================
Directory:
/ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Framework.Internal.Tests/
=======================================================================================
File [modified]: Castle.ActiveRecord.Framework.Internal.Tests.build
Delta lines: +1 -1
===================================================================
---
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Framework.Internal.Tests/default.build
2010-01-27 18:39:30 UTC (rev 6725)
+++
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Framework.Internal.Tests/default.build
2010-01-28 05:09:28 UTC (rev 6726)
@@ -9,7 +9,7 @@
<include buildfile="${common.scripts.dir}/common-project.xml" />
<target name="init" depends="common.init">
- <property name="assembly.version" value="2.1.0.0" />
+ <property name="assembly.version" value="2.1.2.0" />
<property name="assembly.sign" value="false" />
File [modified]: default.build
Delta lines: +0 -0
===================================================================
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq/
===================================================================
File [modified]: Castle.ActiveRecord.Linq.build
Delta lines: +1 -1
===================================================================
--- ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq/default.build
2010-01-27 18:39:30 UTC (rev 6725)
+++ ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq/default.build
2010-01-28 05:09:28 UTC (rev 6726)
@@ -10,7 +10,7 @@
<target name="init" depends="common.init">
<property name="build.warnmissingdocs" value="true" />
- <property name="assembly.version" value="2.1.0.0" />
+ <property name="assembly.version" value="2.1.2.0" />
<property name="assembly.description" value="An implementation
of the ActiveRecord pattern for .NET" />
<assemblyfileset id="project.references" basedir="${build.dir}">
File [modified]: default.build
Delta lines: +0 -0
===================================================================
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq.Tests/
=========================================================================
File [modified]: Castle.ActiveRecord.Linq.Tests.build
Delta lines: +1 -1
===================================================================
--- ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq.Tests/default.build
2010-01-27 18:39:30 UTC (rev 6725)
+++ ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Linq.Tests/default.build
2010-01-28 05:09:28 UTC (rev 6726)
@@ -9,7 +9,7 @@
<include buildfile="${common.scripts.dir}/common-project.xml" />
<target name="init" depends="common.init">
- <property name="assembly.version" value="2.1.0.0" />
+ <property name="assembly.version" value="2.1.2.0" />
<property name="assembly.sign" value="false" />
<property name="assembly.is-cls-compliant" value="false" />
File [modified]: default.build
Delta lines: +0 -0
===================================================================
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/
====================================================================
File [modified]: Castle.ActiveRecord.Tests.build
Delta lines: +1 -1
===================================================================
--- ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/default.build
2010-01-27 18:39:30 UTC (rev 6725)
+++ ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/default.build
2010-01-28 05:09:28 UTC (rev 6726)
@@ -9,7 +9,7 @@
<include buildfile="${common.scripts.dir}/common-project.xml" />
<target name="init" depends="common.init">
- <property name="assembly.version" value="2.1.0.0" />
+ <property name="assembly.version" value="2.1.2.0" />
<property name="assembly.sign" value="false" />
<property name="assembly.is-cls-compliant" value="false" />
File [modified]: default.build
Delta lines: +0 -0
===================================================================
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests.Model/
==========================================================================
File [modified]: Castle.ActiveRecord.Tests.Model.build
Delta lines: +1 -1
===================================================================
--- ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests.Model/default.build
2010-01-27 18:39:30 UTC (rev 6725)
+++ ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests.Model/default.build
2010-01-28 05:09:28 UTC (rev 6726)
@@ -10,7 +10,7 @@
<target name="init" depends="common.init">
<property name="build.warnmissingdocs" value="false" />
- <property name="assembly.version" value="2.1.0.0" />
+ <property name="assembly.version" value="2.1.2.0" />
<property name="assembly.description" value="An implementation
of the ActiveRecord pattern for .NET" />
<assemblyfileset id="project.references" basedir="${build.dir}">
File [modified]: default.build
Delta lines: +12 -1
===================================================================
--- ActiveRecord/branches/2.x/src/Changes.txt 2010-01-27 18:39:30 UTC (rev
6725)
+++ ActiveRecord/branches/2.x/src/Changes.txt 2010-01-28 05:09:28 UTC (rev
6726)
@@ -1,4 +1,15 @@
-2.1 Alpha1
+2.1.2
+=====
+- Official NHibernate 2.1.2.4000 used.
+- Bugs fixed:
+ AR-ISSUE-280
+
+
+2.1.1
+=====
+- Updated Castle Validator to 1.1.1
+
+2.1
===
- Updated NHibernate to to 2.1.4
Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Scopes/
===============================================================================
File [modified]: TransactionScope.cs
Delta lines: +1 -1
===================================================================
--- ActiveRecord/branches/2.x/src/Castle.ActiveRecord/default.build
2010-01-27 18:39:30 UTC (rev 6725)
+++ ActiveRecord/branches/2.x/src/Castle.ActiveRecord/default.build
2010-01-28 05:09:28 UTC (rev 6726)
@@ -10,7 +10,7 @@
<target name="init" depends="common.init">
<property name="build.warnmissingdocs" value="true" />
- <property name="assembly.version" value="2.1.0.0" />
+ <property name="assembly.version" value="2.1.2.0" />
<property name="assembly.description" value="An implementation
of the ActiveRecord pattern for .NET" />
<assemblyfileset id="project.references" basedir="${build.dir}">
Directory: /ActiveRecord/branches/2.x/lib/
==========================================
File [modified]: Iesi.Collections.dll
Delta lines: None
None
File [modified]: NHibernate.dll
Delta lines: None
None
File [modified]: NHibernate.xml
Delta lines: +0 -0
===================================================================
Directory: /ActiveRecord/branches/2.x/lib/net-3.5/
==================================================
File [added]: Castle.Components.Validator.pdb
Delta lines: None
None
Directory: /ActiveRecord/branches/2.x/src/
==========================================
File [modified]: Castle.ActiveRecord-vs2008.sln
Delta lines: +0 -0
===================================================================
Property changes on:
ActiveRecord/branches/2.x/src/Castle.ActiveRecord-vs2008.sln
___________________________________________________________________
File [modified]: Changes.txt
Delta lines: +0 -0
===================================================================
Property changes on: ActiveRecord/branches/2.x/src/Changes.txt
___________________________________________________________________
File [modified]: License.txt
Delta lines: +0 -0
===================================================================
Property changes on: ActiveRecord/branches/2.x/src/License.txt
___________________________________________________________________
File [modified]: Readme.txt
Delta lines: +0 -0
===================================================================
Property changes on: ActiveRecord/branches/2.x/src/Readme.txt
___________________________________________________________________
File [modified]: Running the test cases.txt
Delta lines: +0 -0
===================================================================
Property changes on: ActiveRecord/branches/2.x/src/Running the test cases.txt
___________________________________________________________________
File [modified]: TODO.txt
Delta lines: +0 -0
===================================================================
Property changes on: ActiveRecord/branches/2.x/src/TODO.txt
___________________________________________________________________
File [modified]: activerecord.build
Delta lines: +0 -0
===================================================================
Property changes on: ActiveRecord/branches/2.x/src/activerecord.build
___________________________________________________________________
--
You received this message because you are subscribed to the Google Groups
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/castle-project-commits?hl=en.
