Author: rgrabowski
Date: Sun Aug 28 13:26:18 2005
New Revision: 263913
URL: http://svn.apache.org/viewcvs?rev=263913&view=rev
Log:
Moved properties node above settings node to comply with SqlMapConfig.xsd file.
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config?rev=263913&r1=263912&r2=263913&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Access_OleDb.config
Sun Aug 28 13:26:18 2005
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns="http://ibatis.apache.org/dataMapper";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <properties resource="../../Database.config"/>
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
- <properties resource="../../Database.config"/>
-
<!-- ==== OleDb configuration ========= -->
<database>
<provider name="OleDb1.1"/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config?rev=263913&r1=263912&r2=263913&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
Sun Aug 28 13:26:18 2005
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns="http://ibatis.apache.org/dataMapper";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <properties resource="../../database.config"/>
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
- <properties resource="../../database.config"/>
-
<!-- ==== Odbc configuration ========= -->
<database>
<provider name="Odbc1.1"/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config?rev=263913&r1=263912&r2=263913&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
Sun Aug 28 13:26:18 2005
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns="http://ibatis.apache.org/dataMapper";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
+
+ <properties resource="../../database.config"/>
+
<settings>
<setting useStatementNamespaces="false"/>
<setting cacheModelsEnabled="true"/>
</settings>
- <properties resource="../../database.config"/>
-
<!-- ==== OleDb configuration ========= -->
<database>
<provider name="OleDb1.1"/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config?rev=263913&r1=263912&r2=263913&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
Sun Aug 28 13:26:18 2005
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns="http://ibatis.apache.org/dataMapper";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <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.Test"/> -->
+
+ <settings>
+ <setting useStatementNamespaces="false"/>
+ <setting cacheModelsEnabled="true"/>
+ </settings>
<!-- ==== SqlClient configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be
ignored -->
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config?rev=263913&r1=263912&r2=263913&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_ODP.config
Sun Aug 28 13:26:18 2005
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns="http://ibatis.apache.org/dataMapper";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <!-- Rem : If used via a DataAccess context, properties tag will be
ignored -->
+ <properties resource="../../Database.config"/>
+ <!-- <properties embedded="database.config, IBatisNet.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.Test"/> -->
<!-- ==== ODP configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be
ignored -->
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config?rev=263913&r1=263912&r2=263913&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
Sun Aug 28 13:26:18 2005
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<sqlMapConfig xmlns="http://ibatis.apache.org/dataMapper";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <!-- Rem : If used via a DataAccess context, properties tag will be
ignored -->
+ <properties resource="../../Database.config"/>
+ <!-- <properties embedded="database.config, IBatisNet.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.Test"/> -->
<!-- ==== OracleClient configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be
ignored -->
