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/29 15:58:58 UTC
svn commit: r178950 - in
/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess: ./ Configuration/
Test/Maps/MySql/ByteFx/ Test/Maps/Oracle/ODP/
Test/Maps/Oracle/OracleClient/ Test/bin/Debug/
Author: gbayon
Date: Sun May 29 06:58:57 2005
New Revision: 178950
URL: http://svn.apache.org/viewcvs?rev=178950&view=rev
Log:
- Report fix for JIRA-75/63
Modified:
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/Complex.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/DynamicAccount.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/Complex.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/DynamicAccount.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/Complex.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Access_OleDb.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MySql_ByteFx.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_ODP.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/Complex.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/Complex.xml?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/Complex.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/Complex.xml Sun May 29 06:58:57 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<sqlMap namespace="Complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMap.xsd">
<statements>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/DynamicAccount.xml?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/DynamicAccount.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/MySql/ByteFx/DynamicAccount.xml Sun May 29 06:58:57 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMap.xsd">
<alias>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/Complex.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/Complex.xml?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/Complex.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/Complex.xml Sun May 29 06:58:57 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<sqlMap namespace="Complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMap.xsd">
<statements>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/DynamicAccount.xml?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/DynamicAccount.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/ODP/DynamicAccount.xml Sun May 29 06:58:57 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMap.xsd">
<alias>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/Complex.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/Complex.xml?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/Complex.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/Complex.xml Sun May 29 06:58:57 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<sqlMap namespace="Complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMap.xsd">
<statements>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/DynamicAccount.xml?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/DynamicAccount.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/Maps/Oracle/OracleClient/DynamicAccount.xml Sun May 29 06:58:57 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMap.xsd">
<alias>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Access_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Access_OleDb.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Access_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Access_OleDb.config Sun May 29 06:58:57 2005
@@ -2,13 +2,13 @@
<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+ <properties resource="../../Database.config"/>
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
- <properties resource="../../Database.config"/>
-
<!-- ==== OleDb configuration ========= -->
<database>
<provider name="OleDb1.1"/>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_Odbc.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_Odbc.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_Odbc.config Sun May 29 06:58:57 2005
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+
+ <properties resource="../../database.config"/>
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
- <properties resource="../../database.config"/>
<!-- ==== Odbc configuration ========= -->
<database>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_OleDb.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_OleDb.config Sun May 29 06:58:57 2005
@@ -2,12 +2,12 @@
<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+ <properties resource="../../database.config"/>
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
-
- <properties resource="../../database.config"/>
<!-- ==== OleDb configuration ========= -->
<database>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config Sun May 29 06:58:57 2005
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+ <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
+ <properties resource="../../database.config"/>
+ <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
-
- <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
- <properties resource="../../database.config"/>
- <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
<!-- ==== SqlClient configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be ignored -->
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MySql_ByteFx.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MySql_ByteFx.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MySql_ByteFx.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MySql_ByteFx.config Sun May 29 06:58:57 2005
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+ <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
+ <properties resource="../../Database.config"/>
+ <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
-
- <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
- <properties resource="../../Database.config"/>
- <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
<!-- ==== OracleClient configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be ignored -->
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_ODP.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_ODP.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_ODP.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_ODP.config Sun May 29 06:58:57 2005
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+ <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
+ <properties resource="../../Database.config"/>
+ <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
-
- <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
- <properties resource="../../Database.config"/>
- <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
<!-- ==== ODP configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be ignored -->
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_OracleClient.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_OracleClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_Oracle_OracleClient.config Sun May 29 06:58:57 2005
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+ <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
+ <properties resource="../../Database.config"/>
+ <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
-
- <!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
- <properties resource="../../Database.config"/>
- <!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
<!-- ==== OracleClient configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be ignored -->
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config Sun May 29 06:58:57 2005
@@ -49,8 +49,8 @@
<property name="hibernate.connection.provider" value="NHibernate.Connection.DriverConnectionProvider"/>
<!-- NHibernate 0.4.0 works with ByteFX through the ByteFXDataDriver -->
<!-- NHibernate 0.5.0 works with MySql.Data through the MySqlDataDriver -->
- <property name="hibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver"/>
- <!-- <property name="hibernate.connection.driver_class" value="NHibernate.Driver.ByteFXDataDriver"/> -->
+ <!-- <property name="hibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver"/> -->
+ <property name="hibernate.connection.driver_class" value="NHibernate.Driver.ByteFXDataDriver"/>
<property name="mapping" value="IBatisNet.DataAccess.Test"/>
<property name="show_sql" value="false"/>
<property name="use_outer_join" value="true"/>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config Sun May 29 06:58:57 2005
@@ -126,7 +126,7 @@
<provider
name="ByteFx"
description="MySQL, ByteFx provider V0.7.6.15073"
- enabled="false"
+ enabled="true"
assemblyName="ByteFX.MySqlClient, Version=0.7.6.15073, Culture=neutral, PublicKeyToken=f2fef6fed1732fc1"
connectionClass="ByteFX.Data.MySqlClient.MySqlConnection"
commandClass="ByteFX.Data.MySqlClient.MySqlCommand"
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/ChangeLog.txt Sun May 29 06:58:57 2005
@@ -3,13 +3,18 @@
------------------------------
1.5.1 - 01-June-2005
------------------------------
-
+- Improvement JIRA-75/63
+ <properties>
+ <propertie resource="sqlmap-config.xml"/>
+ <propertie resource="${root}Resources/Query/database.xml"/>
+ <propertie key="Hello" value="World" /> ( To resolve IBATISNET-63 )
+ <properties>
- Added new API to DomDaoManagerBuilder.Configure(...)[old API DaoManager.Configure(...) are marked as obsolete]
- Added New syntax to configure daoSessionHandler (old is too supported)
-<daoSessionHandler id="SqlMap">
- <property name="resource" value="SqlMap_MSSQL_SqlClient.config"/>
- <property name="url" value="E:\Projet\iBatis\trunk\cs\mapper\IBatisNet.DataAccess.Test\bin\Debug\SqlMap_MSSQL_SqlClient.config"/>
- <property name="embedded" value="bin.Debug.SqlMap_MSSQL_SqlClient.config, IBatisNet.DataAccess.Test"/>
-</daoSessionHandler>
-
+ <daoSessionHandler id="SqlMap">
+ <property name="resource" value="SqlMap_MSSQL_SqlClient.config"/>
+ <property name="url" value="E:\Projet\iBatis\trunk\cs\mapper\IBatisNet.DataAccess.Test\bin\Debug\SqlMap_MSSQL_SqlClient.config"/>
+ <property name="embedded" value="bin.Debug.SqlMap_MSSQL_SqlClient.config, IBatisNet.DataAccess.Test"/>
+ </daoSessionHandler>
+- Re-Add providers tag (optional) in Dao.Config
- Fixed JIRA-69 Added support for global setting in ressource and url attribute (JIRA-69)
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs?rev=178950&r1=178949&r2=178950&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs Sun May 29 06:58:57 2005
@@ -37,6 +37,7 @@
using IBatisNet.Common.Utilities;
using IBatisNet.DataAccess.Interfaces;
using IBatisNet.DataAccess.Scope;
+using log4net;
#endregion
@@ -48,6 +49,11 @@
public class DomDaoManagerBuilder
{
#region Constants
+
+
+ private const string PROPERTY_ELEMENT_KEY_ATTRIB = "key";
+ private const string PROPERTY_ELEMENT_VALUE_ATTRIB = "value";
+
/// <summary>
/// Key for default config name
/// </summary>
@@ -72,6 +78,12 @@
private const string PROVIDERS_FILE_NAME = "providers.config";
#endregion
+ #region Fields
+
+ private static readonly ILog _logger = LogManager.GetLogger( System.Reflection.MethodBase.GetCurrentMethod().DeclaringType );
+
+ #endregion
+
#region Constructor (s) / Destructor
/// <summary>
@@ -517,13 +529,55 @@
if (nodeProperties != null)
{
- // Load the file defined by the resource attribut
- XmlDocument propertiesConfig = Resources.GetAsXmlDocument(nodeProperties, configurationScope.Properties);
+ if (nodeProperties.HasChildNodes)
+ {
+ foreach (XmlNode propertyNode in nodeProperties.SelectNodes("propertie"))
+ {
+ XmlAttribute keyAttrib = propertyNode.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB];
+ XmlAttribute valueAttrib = propertyNode.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB];
- foreach (XmlNode node in propertiesConfig.SelectNodes("/settings/add"))
+ if ( keyAttrib != null && valueAttrib!=null)
+ {
+ configurationScope.Properties.Add( keyAttrib.Value, valueAttrib.Value);
+ _logger.Info( string.Format("Add propertie \"{0}\" value \"{1}\"",keyAttrib.Value,valueAttrib.Value) );
+ }
+ else
+ {
+ // Load the file defined by the attribute
+ XmlDocument propertiesConfig = Resources.GetAsXmlDocument(propertyNode, configurationScope.Properties);
+
+ foreach (XmlNode node in propertiesConfig.SelectNodes("/settings/add"))
+ {
+ configurationScope.Properties[node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value] = node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value;
+ _logger.Info( string.Format("Add propertie \"{0}\" value \"{1}\"",node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value,node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value) );
+ }
+ }
+ }
+ }
+ else
{
- configurationScope.Properties[node.Attributes["key"].Value] = node.Attributes["value"].Value;
+ // JIRA-38 Fix
+ // <properties> element's InnerXml is currently an empty string anyway
+ // since <settings> are in properties file
+
+ configurationScope.ErrorContext.Resource = nodeProperties.OuterXml.ToString();
+
+ // Load the file defined by the attribute
+ XmlDocument propertiesConfig = Resources.GetAsXmlDocument(nodeProperties, configurationScope.Properties);
+
+ foreach (XmlNode node in propertiesConfig.SelectNodes("/settings/add"))
+ {
+ configurationScope.Properties[node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value] = node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value;
+ _logger.Info( string.Format("Add propertie \"{0}\" value \"{1}\"",node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value,node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value) );
+ }
}
+// // Load the file defined by the resource attribut
+// XmlDocument propertiesConfig = Resources.GetAsXmlDocument(nodeProperties, configurationScope.Properties);
+//
+// foreach (XmlNode node in propertiesConfig.SelectNodes("/settings/add"))
+// {
+// configurationScope.Properties[node.Attributes["key"].Value] = node.Attributes["value"].Value;
+// }
}
configurationScope.ErrorContext.Resource = string.Empty;