You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by gb...@apache.org on 2006/05/08 15:22:15 UTC

svn commit: r405046 [4/7] - in /ibatis/trunk/cs/mapper: IBatisNet.Common.Test/Domain/ IBatisNet.Common.Test/NUnit/CommonTests/Utilities/ IBatisNet.Common/ IBatisNet.Common/Utilities/Objects/ IBatisNet.Common/Utilities/Objects/Members/ IBatisNet.DataAcc...

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsLessThanDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsLessThanDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsLessThanDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsLessThanDeSerializer.cs Mon May  8 06:21:44 2006
@@ -61,7 +61,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsLessThan isLessThan = new IsLessThan(_configScope.MemberAccessorFactory);
+			IsLessThan isLessThan = new IsLessThan(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isLessThan.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEmptyDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEmptyDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEmptyDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEmptyDeSerializer.cs Mon May  8 06:21:44 2006
@@ -60,7 +60,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsNotEmpty isNotEmpty = new IsNotEmpty(_configScope.MemberAccessorFactory);
+			IsNotEmpty isNotEmpty = new IsNotEmpty(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isNotEmpty.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEqualDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEqualDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEqualDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotEqualDeSerializer.cs Mon May  8 06:21:44 2006
@@ -62,7 +62,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsNotEqual isNotEqual = new IsNotEqual(_configScope.MemberAccessorFactory);
+			IsNotEqual isNotEqual = new IsNotEqual(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isNotEqual.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotNullDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotNullDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotNullDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotNullDeSerializer.cs Mon May  8 06:21:44 2006
@@ -60,7 +60,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsNotNull isNotNull = new IsNotNull(_configScope.MemberAccessorFactory);
+			IsNotNull isNotNull = new IsNotNull(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isNotNull.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotParameterPresentDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotParameterPresentDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotParameterPresentDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotParameterPresentDeSerializer.cs Mon May  8 06:21:44 2006
@@ -61,7 +61,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsNotParameterPresent isNotParameterPresent = new IsNotParameterPresent(_configScope.MemberAccessorFactory);
+			IsNotParameterPresent isNotParameterPresent = new IsNotParameterPresent(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isNotParameterPresent.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotPropertyAvailableDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotPropertyAvailableDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotPropertyAvailableDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNotPropertyAvailableDeSerializer.cs Mon May  8 06:21:44 2006
@@ -60,7 +60,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsNotPropertyAvailable isNotPropertyAvailable = new IsNotPropertyAvailable(_configScope.MemberAccessorFactory);
+			IsNotPropertyAvailable isNotPropertyAvailable = new IsNotPropertyAvailable(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isNotPropertyAvailable.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNullDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNullDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNullDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsNullDeSerializer.cs Mon May  8 06:21:44 2006
@@ -60,7 +60,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsNull isNull = new IsNull(_configScope.MemberAccessorFactory);
+			IsNull isNull = new IsNull(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isNull.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsParameterPresentDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsParameterPresentDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsParameterPresentDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsParameterPresentDeSerializer.cs Mon May  8 06:21:44 2006
@@ -60,7 +60,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsParameterPresent isParameterPresent = new IsParameterPresent(_configScope.MemberAccessorFactory);
+			IsParameterPresent isParameterPresent = new IsParameterPresent(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isParameterPresent.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsPropertyAvailableDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsPropertyAvailableDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsPropertyAvailableDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IsPropertyAvailableDeSerializer.cs Mon May  8 06:21:44 2006
@@ -61,7 +61,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			IsPropertyAvailable isPropertyAvailable = new IsPropertyAvailable(_configScope.MemberAccessorFactory);
+			IsPropertyAvailable isPropertyAvailable = new IsPropertyAvailable(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			isPropertyAvailable.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IterateSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IterateSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IterateSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/IterateSerializer.cs Mon May  8 06:21:44 2006
@@ -61,7 +61,7 @@
 		/// <returns></returns>
 		public SqlTag Deserialize(XmlNode node)
 		{
-			Iterate iterate = new Iterate(_configScope.MemberAccessorFactory);
+			Iterate iterate = new Iterate(_configScope.DataExchangeFactory.AccessorFactory);
 
 			NameValueCollection prop = NodeUtils.ParseAttributes(node, _configScope.Properties);
 			iterate.Prepend = NodeUtils.GetStringAttribute(prop, "prepend");

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/TypeHandlerDeSerializer.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/TypeHandlerDeSerializer.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/TypeHandlerDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Serializers/TypeHandlerDeSerializer.cs Mon May  8 06:21:44 2006
@@ -1,7 +1,7 @@
 #region Apache Notice
 /*****************************************************************************
  * $Header: $
- * $Revision: $
+ * $Revision$
  * $Date$
  * 
  * iBATIS.NET Data Mapper
@@ -82,11 +82,11 @@
 			configScope.ErrorContext.MoreInfo = "Check the type attribute '" + handler.ClassName + "' (must be a class name) or the dbType '" + handler.DbType + "' (must be a DbType type name).";
 			if (handler.DbType!= null && handler.DbType.Length > 0) 
 			{
-				configScope.TypeHandlerFactory.Register(Resources.TypeForName(handler.ClassName), handler.DbType, typeHandler);
+				configScope.DataExchangeFactory.TypeHandlerFactory.Register(Resources.TypeForName(handler.ClassName), handler.DbType, typeHandler);
 			} 
 			else 
 			{
-				configScope.TypeHandlerFactory.Register(Resources.TypeForName(handler.ClassName), typeHandler);
+				configScope.DataExchangeFactory.TypeHandlerFactory.Register(Resources.TypeForName(handler.ClassName), typeHandler);
 			}
 		}
 	}

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/DynamicSql.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/DynamicSql.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/DynamicSql.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/DynamicSql.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,7 @@
 #region Imports
 
 using System.Collections;
+using System.Data;
 using System.Text;
 using IBatisNet.Common;
 using IBatisNet.Common.Utilities.Objects;
@@ -37,6 +38,7 @@
 using IBatisNet.DataMapper.Configuration.Sql.SimpleDynamic;
 using IBatisNet.DataMapper.Configuration.Statements;
 using IBatisNet.DataMapper.DataExchange;
+using IBatisNet.DataMapper.MappedStatements;
 using IBatisNet.DataMapper.Scope;
 using IBatisNet.DataMapper.TypeHandlers;
 
@@ -59,10 +61,7 @@
 		private IStatement _statement = null ;
 		private bool _usePositionalParameters = false;
 		private InlineParameterMapParser _paramParser = null;
-		private TypeHandlerFactory _typeHandlerFactory = null;
-		private IMemberAccessorFactory _memberAccessorFactory = null;
 		private DataExchangeFactory _dataExchangeFactory = null;
-		private IObjectFactory _objectFactory = null;
 
 		#endregion
 
@@ -78,11 +77,8 @@
 		{
 			_statement = statement;
 
-			_typeHandlerFactory = configScope.TypeHandlerFactory;
-			_memberAccessorFactory = configScope.MemberAccessorFactory;
 			_usePositionalParameters = configScope.DataSource.DbProvider.UsePositionalParameters;
 			_dataExchangeFactory = configScope.DataExchangeFactory;
-			_objectFactory = configScope.ObjectFactory;
 		}
 		#endregion
 
@@ -103,23 +99,25 @@
 
 		#region ISql Members
 
+
 		/// <summary>
-		/// 
+		/// Builds a new <see cref="RequestScope"/> and the <see cref="IDbCommand"/> text to execute.
 		/// </summary>
-		/// <param name="parameterObject"></param>
-		/// <param name="session"></param>
-		/// <returns></returns>
-		public RequestScope GetRequestScope(object parameterObject, IDalSession session)
+		/// <param name="parameterObject">The parameter object (used in DynamicSql)</param>
+		/// <param name="session">The current session</param>
+		/// <param name="mappedStatement">The <see cref="IMappedStatement"/>.</param>
+		/// <returns>A new <see cref="RequestScope"/>.</returns>
+		public RequestScope GetRequestScope(IMappedStatement mappedStatement, 
+			object parameterObject, IDalSession session)
 		{ 
-			RequestScope request = new RequestScope(_typeHandlerFactory, _memberAccessorFactory,
-                _objectFactory, _dataExchangeFactory, session);
+			RequestScope request = new RequestScope( _dataExchangeFactory, session, _statement);
 
 			_paramParser = new InlineParameterMapParser();
-			request.ResultMap = _statement.ResultMap;
 
 			string sqlStatement = Process(request, parameterObject);
 			request.PreparedStatement = BuildPreparedStatement(session, request, sqlStatement);
-			
+			request.MappedStatement = mappedStatement;
+
 			return request;
 		}
 	

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Dynamic.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Dynamic.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Dynamic.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Dynamic.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,6 @@
 using IBatisNet.DataMapper.Configuration.Sql.Dynamic.Handlers;
 #endregion
 
-
 namespace IBatisNet.DataMapper.Configuration.Sql.Dynamic.Elements
 {
 	/// <summary>
@@ -41,12 +40,14 @@
 	[XmlRoot("dynamic", Namespace="http://ibatis.apache.org/mapping")]
 	public class Dynamic : SqlTag
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public Dynamic(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:Dynamic"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public Dynamic(AccessorFactory accessorFactory)
 		{
-			this.Handler = new DynamicTagHandler(memberAccessorFactory);
+            this.Handler = new DynamicTagHandler(accessorFactory);
 		}
 
 	}

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEmpty.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEmpty.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEmpty.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEmpty.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,12 +40,14 @@
 	public class IsEmpty : BaseTag
 	{
 
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsEmpty(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsEmpty"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsEmpty(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsEmptyTagHandler(memberAccessorFactory);
+            this.Handler = new IsEmptyTagHandler(accessorFactory);
 		}
 
 	}

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEqual.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEqual.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEqual.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsEqual.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,13 +39,13 @@
 	[XmlRoot("isEqual", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsEqual : Conditional
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsEqual(IMemberAccessorFactory memberAccessorFactory)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsEqual"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsEqual(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsEqualTagHandler(memberAccessorFactory);
+            this.Handler = new IsEqualTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterEqual.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterEqual.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterEqual.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterEqual.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isGreaterEqual", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsGreaterEqual : Conditional
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsGreaterEqual(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsGreaterEqual"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsGreaterEqual(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsGreaterEqualTagHandler(memberAccessorFactory);
+            this.Handler = new IsGreaterEqualTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterThan.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterThan.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterThan.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsGreaterThan.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isGreaterThan", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsGreaterThan : Conditional
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsGreaterThan(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsGreaterThan"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsGreaterThan(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsGreaterThanTagHandler(memberAccessorFactory);
+            this.Handler = new IsGreaterThanTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessEqual.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessEqual.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessEqual.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessEqual.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isLessEqual", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsLessEqual : Conditional
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsLessEqual(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsLessEqual"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsLessEqual(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsLessEqualTagHandler(memberAccessorFactory);
+            this.Handler = new IsLessEqualTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessThan.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessThan.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessThan.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsLessThan.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isLessThan", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsLessThan : Conditional
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsLessThan(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsLessThan"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsLessThan(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsLessThanTagHandler(memberAccessorFactory);
+            this.Handler = new IsLessThanTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEmpty.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEmpty.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEmpty.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEmpty.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,14 +40,13 @@
 	[XmlRoot("isNotEmpty", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsNotEmpty : BaseTag
 	{
-		#region  Constructor (s) / Destructor
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsNotEmpty(IMemberAccessorFactory memberAccessorFactory)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotEmpty"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotEmpty(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsNotEmptyTagHandler(memberAccessorFactory);
+            this.Handler = new IsNotEmptyTagHandler(accessorFactory);
 		}
-		#endregion
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEqual.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEqual.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEqual.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotEqual.cs Mon May  8 06:21:44 2006
@@ -1,11 +1,11 @@
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,13 +39,14 @@
 	[XmlRoot("isNotEqual", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsNotEqual: Conditional
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNotEqual(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotEqual"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotEqual(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsNotEqualTagHandler(memberAccessorFactory);
+            this.Handler = new IsNotEqualTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotNull.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotNull.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotNull.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotNull.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,13 +38,14 @@
 	[XmlRoot("isNotNull", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsNotNull : BaseTag
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNotNull(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotNull"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotNull(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsNotNullTagHandler(memberAccessorFactory);
+            this.Handler = new IsNotNullTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotParameterPresent.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotParameterPresent.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotParameterPresent.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotParameterPresent.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isNotParameterPresent", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsNotParameterPresent : SqlTag
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsNotParameterPresent(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotParameterPresent"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotParameterPresent(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsNotParameterPresentTagHandler(memberAccessorFactory);
+            this.Handler = new IsNotParameterPresentTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotPropertyAvailable.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotPropertyAvailable.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotPropertyAvailable.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNotPropertyAvailable.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isNotPropertyAvailable", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsNotPropertyAvailable : BaseTag
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsNotPropertyAvailable(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotPropertyAvailable"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotPropertyAvailable(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsNotPropertyAvailableTagHandler(memberAccessorFactory);
+            this.Handler = new IsNotPropertyAvailableTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNull.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNull.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNull.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsNull.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,9 +41,9 @@
 		/// <summary>
 		/// 
 		/// </summary>
-		public IsNull(IMemberAccessorFactory memberAccessorFactory)
+        public IsNull(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsNullTagHandler(memberAccessorFactory);
+            this.Handler = new IsNullTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsParameterPresent.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsParameterPresent.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsParameterPresent.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsParameterPresent.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isParameterPresent", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsParameterPresent : SqlTag
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsParameterPresent(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsParameterPresent"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsParameterPresent(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsParameterPresentTagHandler(memberAccessorFactory);
+            this.Handler = new IsParameterPresentTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsPropertyAvailable.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsPropertyAvailable.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsPropertyAvailable.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/IsPropertyAvailable.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,12 +38,14 @@
 	[XmlRoot("isPropertyAvailable", Namespace="http://ibatis.apache.org/mapping")]
 	public class IsPropertyAvailable : BaseTag
 	{
-		/// <summary>
-		/// 
-		/// </summary>
-		public IsPropertyAvailable(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsPropertyAvailable"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsPropertyAvailable(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IsPropertyAvailableTagHandler(memberAccessorFactory);
+            this.Handler = new IsPropertyAvailableTagHandler(accessorFactory);
 		}
 	}
 }

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Iterate.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Iterate.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Iterate.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Elements/Iterate.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -102,12 +102,14 @@
 		}
 
 
-		/// <summary>
-		/// 
-		/// </summary>
-		public Iterate(IMemberAccessorFactory memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Iterate"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public Iterate(AccessorFactory accessorFactory)
 		{
-			this.Handler = new IterateTagHandler(memberAccessorFactory);
+            this.Handler = new IterateTagHandler(accessorFactory);
 		}
 
 	}

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/BaseTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/BaseTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/BaseTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/BaseTagHandler.cs Mon May  8 06:21:44 2006
@@ -53,23 +53,23 @@
 		public const int REPEAT_BODY = 2;
 		#endregion
 
-		private IMemberAccessorFactory _memberAccessorFactory = null;
+        private AccessorFactory _accessorFactory = null;
 
 		/// <summary>
-		/// The factory which build IMemberAccessor
+        /// The factory which build <see cref="IAccessor"/>
 		/// </summary>
-		public IMemberAccessorFactory MemberAccessorFactory
+        public AccessorFactory AccessorFactory
 		{
-			get { return _memberAccessorFactory; }
+            get { return _accessorFactory; }
 		}
 
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public BaseTagHandler(IMemberAccessorFactory memberAccessorFactory)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public BaseTagHandler(AccessorFactory accessorFactory)
 		{
-			_memberAccessorFactory = memberAccessorFactory;
+            _accessorFactory = accessorFactory;
 		}
 
 		#region Methods

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/ConditionalTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/ConditionalTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/ConditionalTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/ConditionalTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,11 +49,13 @@
 		public const long NOT_COMPARABLE = long.MinValue;
 		#endregion
 
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public ConditionalTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConditionalTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public ConditionalTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 
@@ -117,7 +119,7 @@
 			Type type = null;
 			if (propertyName != null && propertyName.Length > 0) 
 			{
-				value1 = ObjectProbe.GetMemberValue(parameterObject, propertyName, MemberAccessorFactory);
+				value1 = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.AccessorFactory);
 				type = value1.GetType();
 			} 
 			else 
@@ -134,7 +136,7 @@
 			}
 			if (comparePropertyName != null && comparePropertyName.Length > 0) 
 			{
-				object value2 = ObjectProbe.GetMemberValue(parameterObject, comparePropertyName, MemberAccessorFactory);
+                object value2 = ObjectProbe.GetMemberValue(parameterObject, comparePropertyName, this.AccessorFactory);
 				return CompareValues(type, value1, value2);
 			} 
 			else if (compareValue != null && compareValue != "") 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/DynamicTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/DynamicTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/DynamicTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/DynamicTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,11 +37,13 @@
 	/// </summary>
 	public class DynamicTagHandler : BaseTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public DynamicTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public DynamicTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,11 +41,13 @@
 	/// </summary>
 	public class IsEmptyTagHandler : ConditionalTagHandler 
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsEmptyTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsEmptyTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsEmptyTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 
@@ -69,7 +71,7 @@
 				object value = null;
 				if (propertyName != null && propertyName.Length>0) 
 				{
-					value = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.MemberAccessorFactory);
+					value = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.AccessorFactory);
 				} 
 				else 
 				{

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEqualTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEqualTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsEqualTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,11 +38,13 @@
 	/// </summary>
 	public class IsEqualTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsEqualTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsEqualTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsEqualTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,11 +39,13 @@
 	/// </summary>
 	public class IsGreaterEqualTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsGreaterEqualTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsGreaterEqualTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsGreaterEqualTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,11 +35,13 @@
 	/// </summary>
 	public class IsGreaterThanTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsGreaterThanTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:IsGreaterThanTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsGreaterThanTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,11 +36,13 @@
 	/// </summary>
 	public class IsLessEqualTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsLessEqualTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsLessEqualTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsLessEqualTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,11 +36,13 @@
 	/// </summary>
 	public class IsLessThanTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsLessThanTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsLessThanTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsLessThanTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,11 +35,13 @@
 	/// </summary>
 	public class IsNotEmptyTagHandler : IsEmptyTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNotEmptyTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotEmptyTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotEmptyTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,11 +35,13 @@
 	/// </summary>
 	public class IsNotEqualTagHandler : IsEqualTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNotEqualTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotEqualTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotEqualTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,11 +36,13 @@
 	public class IsNotNullTagHandler : IsNullTagHandler
 	{
 
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNotNullTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotNullTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotNullTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,11 +36,13 @@
 	/// </summary>
 	public class IsNotParameterPresentTagHandler : IsParameterPresentTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNotParameterPresentTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotParameterPresentTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotParameterPresentTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,11 +36,13 @@
 	/// </summary>
 	public class IsNotPropertyAvailableTagHandler : IsPropertyAvailableTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNotPropertyAvailableTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNotPropertyAvailableTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNotPropertyAvailableTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNullTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNullTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNullTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsNullTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,11 +35,13 @@
 	/// </summary>
 	public class IsNullTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsNullTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsNullTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsNullTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 
@@ -62,7 +64,7 @@
 				object value;
 				if (propertyName != null && propertyName.Length>0 ) 
 				{
-					value = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.MemberAccessorFactory);
+					value = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.AccessorFactory);
 				} 
 				else 
 				{

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,11 +36,13 @@
 	/// </summary>
 	public class IsParameterPresentTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsParameterPresentTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsParameterPresentTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsParameterPresentTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsPropertyAvailableTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsPropertyAvailableTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsPropertyAvailableTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IsPropertyAvailableTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,6 @@
 using IBatisNet.Common.Utilities.Objects;
 #endregion
 
-
 namespace IBatisNet.DataMapper.Configuration.Sql.Dynamic.Handlers
 {
 	/// <summary>
@@ -39,21 +38,23 @@
 	/// </summary>
 	public class IsPropertyAvailableTagHandler : ConditionalTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IsPropertyAvailableTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsPropertyAvailableTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IsPropertyAvailableTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="ctx"></param>
-		/// <param name="tag"></param>
-		/// <param name="parameterObject"></param>
-		/// <returns></returns>
+
+        /// <summary>
+        /// </summary>
+        /// <param name="ctx"></param>
+        /// <param name="tag"></param>
+        /// <param name="parameterObject"></param>
+        /// <returns></returns>
 		public override bool IsCondition(SqlTagContext ctx, SqlTag tag, object parameterObject)
 		{
 			if (parameterObject == null) 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IterateTagHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IterateTagHandler.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IterateTagHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Dynamic/Handlers/IterateTagHandler.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,11 +40,13 @@
 	/// </summary>
 	public class IterateTagHandler : BaseTagHandler
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="memberAccessorFactory"></param>
-		public IterateTagHandler(IMemberAccessorFactory memberAccessorFactory):base(memberAccessorFactory)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IterateTagHandler"/> class.
+        /// </summary>
+        /// <param name="accessorFactory">The accessor factory.</param>
+        public IterateTagHandler(AccessorFactory accessorFactory)
+            : base(accessorFactory)
 		{
 		}
 
@@ -64,7 +66,7 @@
 				object collection;
 				if (propertyName != null && propertyName.Length>0) 
 				{
-					collection = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.MemberAccessorFactory);
+					collection = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.AccessorFactory);
 				} 
 				else 
 				{

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/ISql.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/ISql.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/ISql.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/ISql.cs Mon May  8 06:21:44 2006
@@ -2,7 +2,7 @@
 #region Apache Notice
 /*****************************************************************************
  * $Header: $
- * $Revision: $
+ * $Revision$
  * $Date$
  * 
  * iBATIS.NET Data Mapper
@@ -24,9 +24,9 @@
  ********************************************************************************/
 #endregion
 
-using System;
-
+using System.Data;
 using IBatisNet.Common;
+using IBatisNet.DataMapper.MappedStatements;
 using IBatisNet.DataMapper.Scope;
 
 namespace IBatisNet.DataMapper.Configuration.Sql
@@ -39,15 +39,16 @@
 
 		#region Methods
 		/// <summary>
-		/// Get the RequestScope for this request.
+		/// Builds a new <see cref="RequestScope"/> and the <see cref="IDbCommand"/> text to execute.
 		/// </summary>
 		/// <param name="parameterObject">
 		/// The parameter object (used by DynamicSql/SimpleDynamicSql).
 		/// Use to complete the sql statement.
 		/// </param>
-		/// <param name="session"></param>
-		/// <returns>The RequestScope.</returns>
-		RequestScope GetRequestScope(object parameterObject, IDalSession session);
+		/// <param name="session">The current session</param>
+		/// <param name="mappedStatement">The <see cref="IMappedStatement"/>.</param>
+		/// <returns>A new <see cref="RequestScope"/>.</returns>
+		RequestScope GetRequestScope(IMappedStatement mappedStatement, object parameterObject, IDalSession session);
 		#endregion
 
 	}

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/SimpleDynamic/SimpleDynamicSql.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/SimpleDynamic/SimpleDynamicSql.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/SimpleDynamic/SimpleDynamicSql.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/SimpleDynamic/SimpleDynamicSql.cs Mon May  8 06:21:44 2006
@@ -1,12 +1,12 @@
 
 #region Apache Notice
 /*****************************************************************************
- * $Header: $
  * $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
  * 
  * iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
  *  
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,6 +34,7 @@
 using IBatisNet.DataMapper.Configuration.Sql;
 using IBatisNet.DataMapper.Configuration.Statements;
 using IBatisNet.DataMapper.DataExchange;
+using IBatisNet.DataMapper.MappedStatements;
 using IBatisNet.DataMapper.Scope;
 using IBatisNet.DataMapper.Exceptions;
 using IBatisNet.DataMapper.TypeHandlers;
@@ -56,20 +57,18 @@
 
 		private string _simpleSqlStatement = string.Empty;
 		private IStatement _statement = null ;
-		private TypeHandlerFactory _typeHandlerFactory = null;
-		private IMemberAccessorFactory _memberAccessorFactory = null;
 		private DataExchangeFactory _dataExchangeFactory = null;
-		private IObjectFactory _objectFactory = null;
 
 		#endregion
 
 		#region Constructor (s) / Destructor
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="sqlStatement">The sql statement.</param>
-		/// <param name="statement"></param>
-		/// <param name="scope"></param>
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleDynamicSql"/> class.
+        /// </summary>
+        /// <param name="scope">The scope.</param>
+        /// <param name="sqlStatement">The SQL statement.</param>
+        /// <param name="statement">The statement.</param>
 		internal SimpleDynamicSql(IScope scope,
 			string sqlStatement, 
 			IStatement statement)
@@ -77,10 +76,7 @@
 			_simpleSqlStatement = sqlStatement;
 			_statement = statement;
 
-			_typeHandlerFactory = scope.TypeHandlerFactory;
-			_memberAccessorFactory = scope.MemberAccessorFactory;
 			_dataExchangeFactory = scope.DataExchangeFactory;
-			_objectFactory = scope.ObjectFactory;
 		}
 		#endregion
 		
@@ -139,13 +135,13 @@
 						object value = null;
 						if (parameterObject != null) 
 						{
-							if ( _typeHandlerFactory.IsSimpleType( parameterObject.GetType() ) == true) 
+							if ( _dataExchangeFactory.TypeHandlerFactory.IsSimpleType( parameterObject.GetType() ) == true) 
 							{
 								value = parameterObject;
 							} 
 							else 
 							{
-								value = ObjectProbe.GetMemberValue(parameterObject, token, _memberAccessorFactory);
+                                value = ObjectProbe.GetMemberValue(parameterObject, token, _dataExchangeFactory.AccessorFactory);
 							}
 						}
 						if (value != null) 
@@ -181,22 +177,22 @@
 		#region ISql Members
 
 		/// <summary>
-		/// 
+		/// Builds a new <see cref="RequestScope"/> and the sql command text to execute.
 		/// </summary>
-		/// <param name="parameterObject"></param>
-		/// <param name="session"></param>
-		/// <returns></returns>
-		public RequestScope GetRequestScope(object parameterObject, IDalSession session)
+		/// <param name="parameterObject">The parameter object (used in DynamicSql)</param>
+		/// <param name="session">The current session</param>
+		/// <param name="mappedStatement">The <see cref="IMappedStatement"/>.</param>
+		/// <returns>A new <see cref="RequestScope"/>.</returns>
+		public RequestScope GetRequestScope(IMappedStatement mappedStatement, 
+			object parameterObject, IDalSession session)
 		{
 			string sqlStatement = ProcessDynamicElements(parameterObject);
 			
-			RequestScope request = new RequestScope(_typeHandlerFactory, _memberAccessorFactory,
-                _objectFactory, _dataExchangeFactory, session);
+			RequestScope request = new RequestScope( _dataExchangeFactory, session, _statement);
 
-			request.ParameterMap = _statement.ParameterMap;
-			request.ResultMap = _statement.ResultMap;
 			request.PreparedStatement = BuildPreparedStatement(session, request, sqlStatement);
-			
+			request.MappedStatement = mappedStatement;
+
 			return request;
 		}
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Static/ProcedureSql.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Static/ProcedureSql.cs?rev=405046&r1=405045&r2=405046&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Static/ProcedureSql.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Sql/Static/ProcedureSql.cs Mon May  8 06:21:44 2006
@@ -31,6 +31,7 @@
 using IBatisNet.Common.Utilities.Objects.Members;
 using IBatisNet.DataMapper.Configuration.Statements;
 using IBatisNet.DataMapper.DataExchange;
+using IBatisNet.DataMapper.MappedStatements;
 using IBatisNet.DataMapper.Scope;
 using IBatisNet.DataMapper.TypeHandlers;
 
@@ -49,10 +50,7 @@
 		private PreparedStatement _preparedStatement = null ;
 		private string _sqlStatement = string.Empty;
 		private object _synRoot = new Object();
-		private TypeHandlerFactory _typeHandlerFactory = null;
-		private IMemberAccessorFactory _memberAccessorFactory = null;
 		private DataExchangeFactory _dataExchangeFactory = null;
-		private IObjectFactory _objectFactory = null;
 
 		#endregion
 
@@ -68,29 +66,26 @@
 			_sqlStatement = sqlStatement;
 			_statement = statement;
 
-			_typeHandlerFactory = scope.TypeHandlerFactory;
-			_memberAccessorFactory = scope.MemberAccessorFactory;
 			_dataExchangeFactory = scope.DataExchangeFactory;
-			_objectFactory = scope.ObjectFactory;
 		}
 		#endregion
 
 		#region ISql Members
 
 		/// <summary>
-		/// 
+		/// Builds a new <see cref="RequestScope"/> and the sql command text to execute.
 		/// </summary>
-		/// <param name="parameterObject"></param>
-		/// <param name="session"></param>
-		/// <returns></returns>
-		public RequestScope GetRequestScope(object parameterObject, IDalSession session)
+		/// <param name="parameterObject">The parameter object (used in DynamicSql)</param>
+		/// <param name="session">The current session</param>
+		/// <param name="mappedStatement">The <see cref="IMappedStatement"/>.</param>
+		/// <returns>A new <see cref="RequestScope"/>.</returns>
+		public RequestScope GetRequestScope(IMappedStatement mappedStatement, 
+			object parameterObject, IDalSession session)
 		{
-			RequestScope request = new RequestScope(_typeHandlerFactory, _memberAccessorFactory,
-                _objectFactory, _dataExchangeFactory, session);
+			RequestScope request = new RequestScope(_dataExchangeFactory, session, _statement);
 
-			request.ParameterMap = _statement.ParameterMap;
-			request.ResultMap = _statement.ResultMap;
 			request.PreparedStatement = BuildPreparedStatement(session, request, _sqlStatement);
+			request.MappedStatement = mappedStatement;
 
 			return request;
 		}