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 2005/05/05 11:55:45 UTC
svn commit: r168310 - /incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper
/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug
/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands
/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration
/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope
/incubator/ibatis/trunk/cs/mapper/IBatisNet.Schemas
Author: gbayon
Date: Thu May 5 02:55:44 2005
New Revision: 168310
URL: http://svn.apache.org/viewcvs?rev=168310&view=rev
Log:
- cleaning
Removed:
incubator/ibatis/trunk/cs/mapper/IBatisNet.Schemas/DaoConfig.xsx
incubator/ibatis/trunk/cs/mapper/IBatisNet.Schemas/SqlMap.xsd
incubator/ibatis/trunk/cs/mapper/IBatisNet.Schemas/SqlMap.xsx
incubator/ibatis/trunk/cs/mapper/IBatisNet.Schemas/SqlMapConfig.xsd
incubator/ibatis/trunk/cs/mapper/IBatisNet.Schemas/SqlMapConfig.xsx
Modified:
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/PreparedCommandFactory.cs
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/ConfigurationScope.cs
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapConfig.xsd
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config?rev=168310&r1=168309&r2=168310&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config Thu May 5 02:55:44 2005
@@ -4,7 +4,6 @@
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
- <setting useEmbedStatementParams="false"/>
<setting validateSqlMap="false"/>
</settings>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config?rev=168310&r1=168309&r2=168310&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config Thu May 5 02:55:44 2005
@@ -5,7 +5,6 @@
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
- <setting useEmbedStatementParams="false"/>
<setting validateSqlMap="false"/>
</settings>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config?rev=168310&r1=168309&r2=168310&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config Thu May 5 02:55:44 2005
@@ -5,7 +5,6 @@
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
- <setting useEmbedStatementParams="false"/>
<setting validateSqlMap="false"/>
</settings>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/PreparedCommandFactory.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/PreparedCommandFactory.cs?rev=168310&r1=168309&r2=168310&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/PreparedCommandFactory.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/PreparedCommandFactory.cs Thu May 5 02:55:44 2005
@@ -25,7 +25,8 @@
#region Using
-using log4net;
+
+
#endregion
namespace IBatisNet.DataMapper.Commands
@@ -43,16 +44,14 @@
{
IPreparedCommand preparedCommand = null;
- if (isEmbedStatementParams)
- {
- preparedCommand = new EmbedParamsPreparedCommand();
- }
- else
- {
+// if (isEmbedStatementParams)
+// {
+// preparedCommand = new EmbedParamsPreparedCommand();
+// }
+// else
+// {
preparedCommand = new DefaultPreparedCommand();
- }
-
- //return (IPreparedCommand)IPreparedCommandProxy.NewInstance(preparedCommand);
+// }
return preparedCommand;
}
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs?rev=168310&r1=168309&r2=168310&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs Thu May 5 02:55:44 2005
@@ -25,24 +25,18 @@
#endregion
#region Using
+
using System;
using System.Collections;
-using System.Collections.Specialized;
+using System.IO;
using System.Reflection;
using System.Text;
-using System.IO;
using System.Xml;
-using System.Xml.Serialization;
using System.Xml.Schema;
-
+using System.Xml.Serialization;
using IBatisNet.Common;
using IBatisNet.Common.Exceptions;
using IBatisNet.Common.Utilities;
-
-using IBatisNet.Common.Utilities.Objects;
-using IBatisNet.DataMapper;
-
-using IBatisNet.DataMapper.Scope;
using IBatisNet.DataMapper.Configuration.Alias;
using IBatisNet.DataMapper.Configuration.Cache;
using IBatisNet.DataMapper.Configuration.ParameterMapping;
@@ -53,8 +47,9 @@
using IBatisNet.DataMapper.Configuration.Sql.SimpleDynamic;
using IBatisNet.DataMapper.Configuration.Sql.Static;
using IBatisNet.DataMapper.Configuration.Statements;
-using IBatisNet.DataMapper.TypesHandler;
using IBatisNet.DataMapper.MappedStatements;
+using IBatisNet.DataMapper.Scope;
+
#endregion
namespace IBatisNet.DataMapper.Configuration
@@ -137,7 +132,7 @@
/// <param name="isCallFromDao"></param>
/// <returns>return an a SqlMapper instance</returns>
private SqlMapper Build(XmlDocument document,
- DataSource dataSource,
+ DataSource dataSource,
bool useConfigFileWatcher, bool isCallFromDao)
{
_configScope = new ConfigurationScope();
@@ -260,20 +255,20 @@
{
if (setting.Attributes[ATR_USE_STATEMENT_NAMESPACES] != null )
{
- _configScope.UseStatementNamespaces = System.Convert.ToBoolean(setting.Attributes[ATR_USE_STATEMENT_NAMESPACES].Value);
+ _configScope.UseStatementNamespaces = Convert.ToBoolean(setting.Attributes[ATR_USE_STATEMENT_NAMESPACES].Value);
}
if (setting.Attributes[ATR_CACHE_MODELS_ENABLED] != null )
{
- _configScope.IsCacheModelsEnabled = System.Convert.ToBoolean(setting.Attributes[ATR_CACHE_MODELS_ENABLED].Value);
+ _configScope.IsCacheModelsEnabled = Convert.ToBoolean(setting.Attributes[ATR_CACHE_MODELS_ENABLED].Value);
}
if (setting.Attributes[ATR_EMBED_STATEMENT_PARAMS] != null )
{
- _configScope.UseEmbedStatementParams = System.Convert.ToBoolean(setting.Attributes[ATR_EMBED_STATEMENT_PARAMS].Value);
+ _configScope.UseEmbedStatementParams = Convert.ToBoolean(setting.Attributes[ATR_EMBED_STATEMENT_PARAMS].Value);
}
if (setting.Attributes[ATR_VALIDATE_SQLMAP] != null )
{
- _configScope.ValidateSqlMap = System.Convert.ToBoolean(setting.Attributes[ATR_VALIDATE_SQLMAP].Value);
+ _configScope.ValidateSqlMap = Convert.ToBoolean(setting.Attributes[ATR_VALIDATE_SQLMAP].Value);
}
}
}
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/ConfigurationScope.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/ConfigurationScope.cs?rev=168310&r1=168309&r2=168310&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/ConfigurationScope.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/ConfigurationScope.cs Thu May 5 02:55:44 2005
@@ -25,13 +25,9 @@
#endregion
#region Using
-using System;
-using System.Data;
-using System.Collections;
+
using System.Collections.Specialized;
using System.Xml;
-
-using IBatisNet.DataMapper;
using IBatisNet.Common;
#endregion
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapConfig.xsd
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapConfig.xsd?rev=168310&r1=168309&r2=168310&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapConfig.xsd (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMapConfig.xsd Thu May 5 02:55:44 2005
@@ -38,7 +38,7 @@
<xs:attribute name="useStatementNamespaces" type="xs:boolean"/>
<xs:attribute name="cacheModelsEnabled" type="xs:boolean"/>
<xs:attribute name="validateSqlMap" default="false" type="xs:boolean"/>
- <xs:attribute name="useEmbedStatementParams" type="xs:boolean"/>
+ <xs:attribute name="useEmbedStatementParams" type="xs:boolean" default="false"/>
</xs:complexType>
</xs:element>
<xs:element name="settings">